<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[153472] trunk/dports/databases</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/153472">153472</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2016-10-01 20:35:31 -0700 (Sat, 01 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>postgresql96: whitespace only</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasespostgresql96Portfile">trunk/dports/databases/postgresql96/Portfile</a></li>
<li><a href="#trunkdportsdatabasespostgresql96docPortfile">trunk/dports/databases/postgresql96-doc/Portfile</a></li>
<li><a href="#trunkdportsdatabasespostgresql96serverPortfile">trunk/dports/databases/postgresql96-server/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasespostgresql96Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/postgresql96/Portfile (153471 => 153472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/postgresql96/Portfile 2016-10-01 23:44:23 UTC (rev 153471)
+++ trunk/dports/databases/postgresql96/Portfile 2016-10-02 03:35:31 UTC (rev 153472)
</span><span class="lines">@@ -6,64 +6,64 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> #remember to update the -doc and -server as well
</span><del>-name postgresql96
-version 9.6.0
</del><ins>+name postgresql96
+version 9.6.0
</ins><span class="cx">
</span><del>-categories databases
-platforms darwin
-maintainers mww jwa
-license Permissive
-description The most advanced open-source database available anywhere.
-long_description PostgreSQL is Object-Relational Database Management System. \
- It supports almost all SQL constructs, including transactions, \
- subselects, and user-defined types and functions. Write-ahead \
- logging means increased performance while retaining data \
- integrity.
</del><ins>+categories databases
+platforms darwin
+maintainers mww jwa
+license Permissive
+description The most advanced open-source database available anywhere.
+long_description PostgreSQL is Object-Relational Database Management System.\
+ It supports almost all SQL constructs, including transactions, \
+ subselects, and user-defined types and functions. Write-ahead \
+ logging means increased performance while retaining data \
+ integrity.
</ins><span class="cx">
</span><del>-homepage http://www.postgresql.org/
-master_sites http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/source/v${version}/ \
- postgresql:source/v${version}/
-distname postgresql-${version}
</del><ins>+homepage http://www.postgresql.org/
+master_sites http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/source/v${version}/ \
+ postgresql:source/v${version}/
+distname postgresql-${version}
</ins><span class="cx">
</span><span class="cx"> checksums rmd160 039c0881ed97a383944f07b143a5e28c90338032 \
</span><span class="cx"> sha256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce
</span><span class="cx">
</span><del>-use_bzip2 yes
</del><ins>+use_bzip2 yes
</ins><span class="cx">
</span><del>-depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt
-depends_build port:bison
-depends_run port:postgresql_select
</del><ins>+depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt
+depends_build port:bison
+depends_run port:postgresql_select
</ins><span class="cx">
</span><del>-worksrcdir postgresql-${version}
</del><ins>+worksrcdir postgresql-${version}
</ins><span class="cx">
</span><del>-set libdir ${prefix}/lib/${name}
-configure.args --sysconfdir=${prefix}/etc/${name} \
- --bindir=${libdir}/bin \
- --libdir=${libdir} \
- --includedir=${prefix}/include/${name} \
- --datadir=${prefix}/share/${name} \
- --mandir=${prefix}/share/man \
- --with-includes=${prefix}/include \
- --with-libraries=${prefix}/lib \
- --with-openssl \
- --with-bonjour \
- --with-readline \
- --with-zlib \
- --with-libxml \
- --with-libxslt \
- --with-gssapi \
- --enable-thread-safety \
- --with-uuid=e2fs
</del><ins>+set libdir ${prefix}/lib/${name}
+configure.args --sysconfdir=${prefix}/etc/${name} \
+ --bindir=${libdir}/bin \
+ --libdir=${libdir} \
+ --includedir=${prefix}/include/${name} \
+ --datadir=${prefix}/share/${name} \
+ --mandir=${prefix}/share/man \
+ --with-includes=${prefix}/include \
+ --with-libraries=${prefix}/lib \
+ --with-openssl \
+ --with-bonjour \
+ --with-readline \
+ --with-zlib \
+ --with-libxml \
+ --with-libxslt \
+ --with-gssapi \
+ --enable-thread-safety \
+ --with-uuid=e2fs
</ins><span class="cx">
</span><span class="cx"> configure.ldflags-append -headerpad_max_install_names
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx">
</span><span class="cx"> # building psql with clang from XCode prior to 4.4 causes segfault on query; see #31717
</span><del>-compiler.blacklist-append {clang < 421}
</del><ins>+compiler.blacklist-append {clang < 421}
</ins><span class="cx"> notes "To use the postgresql server, install the ${name}-server port"
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><del>- configure.cflags-append -DAC_APPLE_UNIVERSAL_BUILD
</del><ins>+ configure.cflags-append -DAC_APPLE_UNIVERSAL_BUILD
</ins><span class="cx"> post-configure {
</span><span class="cx"> system "cd ${worksrcpath}/src/include \
</span><span class="cx"> && ed - pg_config.h < ${filespath}/pg95_config.h.ed \
</span><span class="lines">@@ -74,17 +74,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.type gnu
</del><ins>+build.type gnu
</ins><span class="cx"> build.target
</span><span class="cx">
</span><del>-test.run yes
-test.target check
</del><ins>+test.run yes
+test.target check
</ins><span class="cx">
</span><span class="cx"> # remember to change livecheck with first proper release
</span><del>-livecheck.type regex
-livecheck.regex (9\\.6\[.0-9\]*\[a-z\]+\[0-9\])
-#livecheck.regex (9\\.6\\.\[.0-9\]+)
-livecheck.url ${homepage}/ftp/source/
</del><ins>+livecheck.type regex
+livecheck.regex (9\\.6\[.0-9\]*\[a-z\]+\[0-9\])
+#livecheck.regex (9\\.6\\.\[.0-9\]+)
+livecheck.url ${homepage}/ftp/source/
</ins><span class="cx">
</span><span class="cx"> # prepare the contrib modules
</span><span class="cx"> set contribs {}
</span><span class="lines">@@ -107,56 +107,56 @@
</span><span class="cx"> lappend contribs [file tail $d]
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- foreach contrib ${contribs} {
- system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}"
- }
</del><ins>+ foreach contrib ${contribs} {
+ system "cd ${worksrcpath}/contrib/${contrib}/ && ${build.cmd}"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- foreach contrib ${contribs} {
- system "echo contrib: \"${contrib}\""
- system "cd ${worksrcpath}/contrib/${contrib}/ && \
- ${destroot.cmd} install ${destroot.destdir} && touch DONE"
- }
- system "cd ${destroot}${prefix}/bin && ln -sf ${libdir}/bin/psql psql96"
- file delete -force ${destroot}${prefix}/share/doc/postgresql \
- ${destroot}${prefix}/share/man
-
- reinplace -E "s#-arch\[\[:space:\]\]+\[\[:alnum:\]_\]+##g" \
- ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
-
- reinplace -E "s#^CFLAGS =#CFLAGS +=#g" \
- ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
-
- reinplace -E "s#^(\[\[:space:\]\]+)LDFLAGS =#\\1LDFLAGS +=#g" \
- ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
</del><ins>+ foreach contrib ${contribs} {
+ system "echo contrib: \"${contrib}\""
+ system "cd ${worksrcpath}/contrib/${contrib}/ && \
+ ${destroot.cmd} install ${destroot.destdir} && touch DONE"
+ }
+ system "cd ${destroot}${prefix}/bin && ln -sf ${libdir}/bin/psql psql96"
+ file delete -force ${destroot}${prefix}/share/doc/postgresql \
+ ${destroot}${prefix}/share/man
+
+ reinplace -E "s#-arch\[\[:space:\]\]+\[\[:alnum:\]_\]+##g" \
+ ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
+
+ reinplace -E "s#^CFLAGS =#CFLAGS +=#g" \
+ ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
+
+ reinplace -E "s#^(\[\[:space:\]\]+)LDFLAGS =#\\1LDFLAGS +=#g" \
+ ${destroot}${prefix}/lib/${name}/pgxs/src/Makefile.global
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-select.group postgresql
-select.file ${filespath}/${name}
</del><ins>+select.group postgresql
+select.file ${filespath}/${name}
</ins><span class="cx">
</span><span class="cx"> variant python requires python27 description {add support for python} {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python27 conflicts python3 description {add support for python 2.7} {
</span><del>- depends_lib-append port:python27
- configure.args-append --with-python
- configure.python ${prefix}/bin/python2.7
</del><ins>+ depends_lib-append port:python27
+ configure.args-append --with-python
+ configure.python ${prefix}/bin/python2.7
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python3 conflicts python27 description {add support for python 3.x} {
</span><del>- depends_lib-append port:python35
- configure.args-append --with-python
- configure.python ${prefix}/bin/python3.5
</del><ins>+ depends_lib-append port:python35
+ configure.args-append --with-python
+ configure.python ${prefix}/bin/python3.5
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant perl description {add Perl support} {
</span><del>- depends_lib-append bin:perl:perl5
- configure.args-append --with-perl
</del><ins>+ depends_lib-append bin:perl:perl5
+ configure.args-append --with-perl
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant tcl description {add Tcl support} {
</span><del>- depends_lib-append port:tcl
- configure.args-append --with-tcl --with-tclconfig=${prefix}/lib
- configure.env-append TCLSH=${prefix}/bin/tclsh
</del><ins>+ depends_lib-append port:tcl
+ configure.args-append --with-tcl --with-tclconfig=${prefix}/lib
+ configure.env-append TCLSH=${prefix}/bin/tclsh
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdatabasespostgresql96docPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/postgresql96-doc/Portfile (153471 => 153472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/postgresql96-doc/Portfile 2016-10-01 23:44:23 UTC (rev 153471)
+++ trunk/dports/databases/postgresql96-doc/Portfile 2016-10-02 03:35:31 UTC (rev 153472)
</span><span class="lines">@@ -3,47 +3,47 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name postgresql96-doc
-conflicts postgresql90-doc postgresql91-doc postgresql92-doc \
</del><ins>+name postgresql96-doc
+conflicts postgresql90-doc postgresql91-doc postgresql92-doc \
</ins><span class="cx"> postgresql93-doc postgresql94-doc postgresql95-doc
</span><del>-version 9.6.0
-categories databases
-platforms darwin
-maintainers mww jwa
-license Permissive
-description Documentation for the postgresql database BETA release.
-long_description PostgreSQL is Object-Relational Database Management System. \
- It supports almost all SQL constructs, including transactions, \
- subselects, and user-defined types and functions. Write-ahead \
- logging means increased performance while retaining data \
- integrity. This is the documentation.
</del><ins>+version 9.6.0
+categories databases
+platforms darwin
+maintainers mww jwa
+license Permissive
+description Documentation for the postgresql database BETA release.
+long_description PostgreSQL is Object-Relational Database Management System.\
+ It supports almost all SQL constructs, including transactions, \
+ subselects, and user-defined types and functions. Write-ahead \
+ logging means increased performance while retaining data \
+ integrity. This is the documentation.
</ins><span class="cx">
</span><del>-homepage http://www.postgresql.org/
-master_sites postgresql:source/v${version}
-distname postgresql-${version}
-set rname postgresql96
</del><ins>+homepage http://www.postgresql.org/
+master_sites postgresql:source/v${version}
+distname postgresql-${version}
+set rname postgresql96
</ins><span class="cx">
</span><span class="cx"> checksums rmd160 039c0881ed97a383944f07b143a5e28c90338032 \
</span><span class="cx"> sha256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce
</span><span class="cx">
</span><del>-use_bzip2 yes
-dist_subdir ${rname}
</del><ins>+use_bzip2 yes
+dist_subdir ${rname}
</ins><span class="cx">
</span><del>-set libdir ${prefix}/lib/${rname}
-configure.args --mandir=${prefix}/share/man \
- --without-openssl \
- --without-readline \
- --without-zlib
</del><ins>+set libdir ${prefix}/lib/${rname}
+configure.args --mandir=${prefix}/share/man \
+ --without-openssl \
+ --without-readline \
+ --without-zlib
</ins><span class="cx">
</span><del>-build.dir ${worksrcpath}/doc
-build.type gnu
</del><ins>+build.dir ${worksrcpath}/doc
+build.type gnu
</ins><span class="cx"> build.target
</span><span class="cx">
</span><del>-destroot.dir ${build.dir}
</del><ins>+destroot.dir ${build.dir}
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- file rename ${destroot}${prefix}/share/doc/postgresql \
- ${destroot}${prefix}/share/doc/${rname}
</del><ins>+ file rename ${destroot}${prefix}/share/doc/postgresql \
+ ${destroot}${prefix}/share/doc/${rname}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type none
</del><ins>+livecheck.type none
</ins></span></pre></div>
<a id="trunkdportsdatabasespostgresql96serverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/postgresql96-server/Portfile (153471 => 153472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/postgresql96-server/Portfile 2016-10-01 23:44:23 UTC (rev 153471)
+++ trunk/dports/databases/postgresql96-server/Portfile 2016-10-02 03:35:31 UTC (rev 153472)
</span><span class="lines">@@ -3,55 +3,55 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name postgresql96-server
-version 9.6.0
-categories databases
-platforms darwin
-maintainers mww jwa
-license Permissive
</del><ins>+name postgresql96-server
+version 9.6.0
+categories databases
+platforms darwin
+maintainers mww jwa
+license Permissive
</ins><span class="cx">
</span><del>-set rname postgresql96
-description run ${rname} as server
-long_description ${description}
</del><ins>+set rname postgresql96
+description run ${rname} as server
+long_description ${description}
</ins><span class="cx"> distfiles
</span><span class="cx">
</span><del>-homepage http://www.postgresql.org/
-master_sites postgresql
</del><ins>+homepage http://www.postgresql.org/
+master_sites postgresql
</ins><span class="cx">
</span><del>-depends_run port:${rname}
</del><ins>+depends_run port:${rname}
</ins><span class="cx">
</span><del>-supported_archs noarch
</del><ins>+supported_archs noarch
</ins><span class="cx">
</span><del>-use_configure no
-build {}
</del><ins>+use_configure no
+build {}
</ins><span class="cx">
</span><del>-set libdir ${prefix}/lib/${rname}
-set dbdir ${prefix}/var/db/${rname}/defaultdb
-set logdir ${prefix}/var/log/${rname}
-set dbuser postgres
-set dbgrp postgres
</del><ins>+set libdir ${prefix}/lib/${rname}
+set dbdir ${prefix}/var/db/${rname}/defaultdb
+set logdir ${prefix}/var/log/${rname}
+set dbuser postgres
+set dbgrp postgres
</ins><span class="cx">
</span><span class="cx"> add_users ${dbuser} shell=/bin/sh group=${dbgrp} \
</span><span class="cx"> home=${prefix}/var/db/${rname} \
</span><span class="cx"> realname=PostgreSQL-96\ Server
</span><span class="cx">
</span><del>-startupitem.create yes
-startupitem.init \
- "PGCTL=${libdir}/bin/pg_ctl"
-startupitem.start \
- "su ${dbuser} -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} start -l ${logdir}/postgres.log\""
-startupitem.stop \
</del><ins>+startupitem.create yes
+startupitem.init \
+ "PGCTL=${libdir}/bin/pg_ctl"
+startupitem.start \
+ "su ${dbuser} -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} start -l ${logdir}/postgres.log\""
+startupitem.stop \
</ins><span class="cx"> "su ${dbuser} -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} stop -s -m fast\""
</span><span class="cx">
</span><span class="cx"> destroot {
</span><del>- xinstall -m 755 -d ${destroot}${logdir}
- system "touch ${destroot}${logdir}/postgres.log"
- system "chown ${dbuser}:${dbgrp} ${destroot}${logdir}/postgres.log"
</del><ins>+ xinstall -m 755 -d ${destroot}${logdir}
+ system "touch ${destroot}${logdir}/postgres.log"
+ system "chown ${dbuser}:${dbgrp} ${destroot}${logdir}/postgres.log"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notes "\nTo create a database instance, after install do\n\
</span><del>- sudo mkdir -p ${dbdir}\n\
- sudo chown ${dbuser}:${dbgrp} ${dbdir}\n\
- sudo su ${dbuser} -c \'${libdir}/bin/initdb -D ${dbdir}\' "
</del><ins>+ sudo mkdir -p ${dbdir}\n\
+ sudo chown ${dbuser}:${dbgrp} ${dbdir}\n\
+ sudo su ${dbuser} -c \'${libdir}/bin/initdb -D ${dbdir}\' "
</ins><span class="cx">
</span><del>-livecheck.type none
</del><ins>+livecheck.type none
</ins></span></pre>
</div>
</div>
</body>
</html>