Index: branches/2015Q2/databases/postgresql84-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql84-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql84-server/Makefile (revision 390595) @@ -1,310 +1,311 @@ # Created by: Marc G. Fournier # $FreeBSD$ PORTNAME?= postgresql DISTVERSION?= 8.4.22 PORTREVISION?= 1 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \ ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \ ${PORTNAME}8[^${PORTVERSION:R:E}]-client* \ ${PORTNAME}${COMPONENT}-8.[^${PORTVERSION:R:E}].* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql # EOL was reached in July 2014 # http://www.postgresql.org/support/versioning/ DEPRECATED= "EOL was reached in July 2014" EXPIRATION_DATE=2015-05-10 -ICU_PATCHFILE?= pg-8421-icu-2014-06-09.diff.gz +ICU_PATCHFILE?= pg-8421-icu-2015-04-18.diff.gz UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USES+= tar:bzip2 .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes .endif PG_USER= pgsql PG_GROUP= pgsql PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="-lpthread" \ LDFLAGS_SL="${LDFLAGS_SL}" LDFLAGS+= -lpthread PLIST= ${PKGDIR}/pkg-plist${COMPONENT} BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes +PORTREVISION= 2 COMPONENT= -server USE_RC_SUBR= postgresql USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS NLS_DESC= Use internationalized messages OPTIONS_DEFAULT+= NLS .endif .if !defined(CLIENT_ONLY) MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if !defined(SLAVE_ONLY) . if ${DISTVERSION:R} == 8.4 OPTIONS_DEFINE+= DTRACE GSSAPI DTRACE_DESC= Build with DTrace probes (server only) GSSAPI_DESC= Build with GSSAPI support OPTIONS_DEFAULT+= INTDATE .endif . if ${DISTVERSION:R} == 8.4 || ${DISTVERSION:R} == 8.3 OPTIONS_DEFINE+= XML TZDATA XML_DESC= Build with XML data type (server) TZDATA_DESC= Use internal timezone database (server) OPTIONS_DEFAULT+= XML TZDATA . endif . if !empty(ICU_PATCHFILE) # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS_DEFINE+= ICU .endif OPTIONS_DEFINE+= PAM LDAP OPTIMIZED_CFLAGS DEBUG KRB5 OPTIONS_SINGLE= KRB5 OPTIONS_SINGLE_KRB5= MIT_KRB5 HEIMDAL_KRB5 KRB5_DESC= Build with kerberos provider support # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS_DEFINE+= INTDATE SSL OPTIONS_DEFAULT+= SSL .endif # !SLAVE_ONLY ICU_DESC= Use ICU for unicode collation (server) PAM_DESC= Build with PAM support (server only) LDAP_DESC= Build with LDAP authentication support MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) DEBUG_DESC= Builds with debugging symbols INTDATE_DESC= Builds with 64-bit date/time type (server) SSL_DESC= Build with OpenSSL support .include .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl .endif .if !defined(SLAVE_ONLY) . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu . endif .endif # !SLAVE_ONLY .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 . if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+= -lelf . if ${OSVERSION} < 900021 IGNORE= need userland DTrace support found in FreeBSD 9.0 . endif . endif . if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+=--with-pam . endif . if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+=--with-ldap USE_OPENLDAP= yes . endif . if ${PORT_OPTIONS:MXML} CONFIGURE_ARGS+=--with-libxml LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 . endif . if ${PORT_OPTIONS:MTZDATA} PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo PLIST_SUB+= TZDATA="@comment " . endif . if ${PORT_OPTIONS:MINTDATE} CONFIGURE_ARGS+=--enable-integer-datetimes . else CONFIGURE_ARGS+=--disable-integer-datetimes . endif . if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= GETTEXT="" USES+= gettext . else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= GETTEXT="@comment " . endif . if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -funroll-loops . endif . if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug INSTALL_TARGET= install . else INSTALL_TARGET= install-strip . endif .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-gssapi .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .else CONFIGURE_ARGS+=--without-gssapi .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) IGNORE= requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . endif # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) CONFIGURE_ARGS+=--with-krb5 . else LIB_DEPENDS+= libkrb5.so.3:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+=--with-krb5 . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} # Allow defining a home built Heimdal Kerberos by setting HEIMDAL_HOME . if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) && exists(${HEIMDAL_HOME}/bin/krb5-config) CONFIGURE_ARGS+=--with-krb5 . else # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html LIB_DEPENDS+= libkrb5.so.26:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif .endif # !SLAVE_ONLY PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} # For testing files in FILESDIR .include .if !defined(NO_BUILD) .if !target(pre-build) pre-build: . if defined(SERVER_ONLY) @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL . endif @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks .endif do-build: @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif .endif .if !defined(NO_BUILD) post-patch: . if ${PORT_OPTIONS:MICU} @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ ${WRKSRC}/configure.in . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include Index: branches/2015Q2/databases/postgresql84-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql84-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql84-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ SHA256 (postgresql/postgresql-8.4.22.tar.bz2) = 5c1d56ce77448706d9dd03b2896af19d9ab1b9b8dcdb96c39707c74675ca3826 SIZE (postgresql/postgresql-8.4.22.tar.bz2) = 14651732 -SHA256 (postgresql/pg-8421-icu-2014-06-09.diff.gz) = 39b88088adbe4cbfa207db0dd0ed0411a34af762ac9fa967e84eef6bcf8821ad -SIZE (postgresql/pg-8421-icu-2014-06-09.diff.gz) = 4380 +SHA256 (postgresql/pg-8421-icu-2015-04-18.diff.gz) = 440fc4ab7995435304f85a583051a28d8c80908e2cdc84f687a42db329c8faac +SIZE (postgresql/pg-8421-icu-2015-04-18.diff.gz) = 4398 Index: branches/2015Q2/databases/postgresql90-client/Makefile =================================================================== --- branches/2015Q2/databases/postgresql90-client/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql90-client/Makefile (revision 390595) @@ -1,18 +1,18 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql COMMENT= PostgreSQL database (client) -PORTREVISION= 1 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../postgresql90-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/databases/postgresql90-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql90-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql90-server/Makefile (revision 390595) @@ -1,20 +1,18 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.0.19 +DISTVERSION?= 9.0.22 PORTREVISION?= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org -USES+= cpe - -ICU_PATCHFILE?= pg-9017-icu-2014-06-09.diff.gz +ICU_PATCHFILE?= pg-9019-icu-2015-04-18.diff.gz BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} COMPONENT?= -server .include "${.CURDIR}/../postgresql91-server/Makefile" Index: branches/2015Q2/databases/postgresql90-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql90-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql90-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.0.19.tar.bz2) = 53ad12bca99ba8ff0e002e39e50634c4dba1035232be1475cb77b3f6579385c0 -SIZE (postgresql/postgresql-9.0.19.tar.bz2) = 15019406 -SHA256 (postgresql/pg-9017-icu-2014-06-09.diff.gz) = a28988885b532e73c2d6e67c6d2d9593f34d4360f2b4c9f6c419a373e16f149f -SIZE (postgresql/pg-9017-icu-2014-06-09.diff.gz) = 4395 +SHA256 (postgresql/postgresql-9.0.22.tar.bz2) = 94d4b20d854cd7fa4c9c322c0b602751edbc5ca0d4f29fe92f996e28bb32f8a5 +SIZE (postgresql/postgresql-9.0.22.tar.bz2) = 15046629 +SHA256 (postgresql/pg-9019-icu-2015-04-18.diff.gz) = 44436558d3414b964e6acda18148188be88446b3773d133a4b3b0d63d17bd807 +SIZE (postgresql/pg-9019-icu-2015-04-18.diff.gz) = 4412 Index: branches/2015Q2/databases/postgresql91-client/Makefile =================================================================== --- branches/2015Q2/databases/postgresql91-client/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql91-client/Makefile (revision 390595) @@ -1,19 +1,19 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql COMMENT= PostgreSQL database (client) -PORTREVISION= 1 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../postgresql91-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/databases/postgresql91-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql91-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql91-server/Makefile (revision 390595) @@ -1,311 +1,308 @@ # Created by: Marc G. Fournier # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.1.15 +DISTVERSION?= 9.1.18 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere -USES+= cpe - #CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \ # ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \ # ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \ # ${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-928-icu-2014-06-09.diff.gz +ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} .else # Contrib has different options from -client/-server UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX} .endif PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 +USES+= tar:bzip2 cpe .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes .endif PG_USER= pgsql PG_GROUP= pgsql PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="-lpthread" \ LDFLAGS_SL="${LDFLAGS_SL}" LDFLAGS+= -lpthread PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup BUILD_DIRS?= src/port ${INSTALL_DIRS} +INSTALL_TARGET?=install-strip .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) COMPONENT= -server SERVER_ONLY= yes USE_RC_SUBR= postgresql USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif .if defined(CLIENT_ONLY) OPTIONS_DEFINE+=LIBEDIT LIBEDIT_DESC= Use non-GPL libedit instead of readline .else MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS DTRACE PAM LDAP GSSAPI OPTIMIZED_CFLAGS XML TZDATA DEBUG OPTIONS_RADIO= KRB5 OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages DTRACE_DESC= Build with DTrace probes (server only) PAM_DESC= Build with PAM Support LDAP_DESC= Build with LDAP authentication support (server only) MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos GSSAPI_DESC= Build with GSSAPI support OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) XML_DESC= Build with XML data type (server) TZDATA_DESC= Use internal timezone database (server) DEBUG_DESC= Builds with debugging symbols OSSP_UUID_DESC= Enable / disable ossp-uuid support # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS_DEFINE+= ICU ICU_DESC= Use ICU for unicode collation (server) # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS_DEFINE+= INTDATE INTDATE_DESC= Builds with 64-bit date/time type (server) OPTIONS_DEFINE+= SSL SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT= NLS XML TZDATA INTDATE SSL .endif # !SLAVE_ONLY .include .if defined(CLIENT_ONLY) . if ${PORT_OPTIONS:MLIBEDIT} CONFIGURE_ARGS+=--with-libedit-preferred LIB_DEPENDS= libedit.so.0:${PORTSDIR}/devel/libedit . else USES+= readline . endif .endif # CLIENT_ONLY .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl .endif .if !defined(SLAVE_ONLY) . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu . endif .endif # !SLAVE_ONLY .if ${PORT_OPTIONS:MOSSP_UUID} BUILD_DEPENDS+= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid CONFIGURE_ARGS+=--with-ossp-uuid PLIST_SUB+= OSSP="" .else PLIST_SUB+= OSSP="@comment " .endif .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 . if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf . if ${OSVERSION} < 900021 IGNORE= need userland DTrace support found in FreeBSD 9.0 . endif . endif . if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+=--with-pam . endif . if ${PORT_OPTIONS:MLDAP} . if defined (SERVER_ONLY) CONFIGURE_ARGS+=--with-ldap USE_OPENLDAP= yes . endif . endif . if ${PORT_OPTIONS:MXML} CONFIGURE_ARGS+=--with-libxml LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 . endif . if ${PORT_OPTIONS:MTZDATA} PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo PLIST_SUB+= TZDATA="@comment " . endif . if empty(PORT_OPTIONS:MINTDATE) CONFIGURE_ARGS+=--disable-integer-datetimes . endif . if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= GETTEXT="" USES+= gettext . else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= GETTEXT="@comment " . endif . if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -funroll-loops . endif . if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug INSTALL_TARGET= install -. else -INSTALL_TARGET= install-strip . endif .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-gssapi .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .else CONFIGURE_ARGS+=--without-gssapi .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) IGNORE= requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . else CONFIGURE_ARGS+=--with-krb5 # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 . endif . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} CONFIGURE_ARGS+=--with-krb5 . endif .endif # !SLAVE_ONLY PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} # For testing files in FILESDIR .include .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif post-patch: . if ${PORT_OPTIONS:MICU} @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ ${WRKSRC}/configure.in . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include Index: branches/2015Q2/databases/postgresql91-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql91-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql91-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.1.15.tar.bz2) = 67d6deaf15cdc35fcdff2c319234d0577a86bce6f363e4f0e4e987e419e0de5f -SIZE (postgresql/postgresql-9.1.15.tar.bz2) = 15768092 -SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c -SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449 +SHA256 (postgresql/postgresql-9.1.18.tar.bz2) = 2726d526666904b454f87fe2ae54357c2ab9eb8aba299a4c904829b7598584a8 +SIZE (postgresql/postgresql-9.1.18.tar.bz2) = 15822081 +SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab +SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 Index: branches/2015Q2/databases/postgresql91-server/pkg-plist-contrib =================================================================== --- branches/2015Q2/databases/postgresql91-server/pkg-plist-contrib (revision 390594) +++ branches/2015Q2/databases/postgresql91-server/pkg-plist-contrib (revision 390595) @@ -1,180 +1,183 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_upgrade bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so lib/postgresql/auto_explain.so lib/postgresql/autoinc.so lib/postgresql/btree_gin.so lib/postgresql/btree_gist.so lib/postgresql/chkpass.so lib/postgresql/citext.so lib/postgresql/cube.so lib/postgresql/dblink.so lib/postgresql/dict_int.so lib/postgresql/dict_xsyn.so lib/postgresql/earthdistance.so lib/postgresql/fuzzystrmatch.so lib/postgresql/hstore.so lib/postgresql/insert_username.so lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/moddatetime.so lib/postgresql/pageinspect.so lib/postgresql/passwordcheck.so lib/postgresql/pg_buffercache.so lib/postgresql/pg_freespacemap.so lib/postgresql/pg_stat_statements.so lib/postgresql/pg_trgm.so lib/postgresql/pg_upgrade_support.so lib/postgresql/pgcrypto.so lib/postgresql/pgrowlocks.so lib/postgresql/pgstattuple.so lib/postgresql/pgxml.so lib/postgresql/refint.so lib/postgresql/seg.so lib/postgresql/sslinfo.so lib/postgresql/tablefunc.so lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync lib/postgresql/auth_delay.so lib/postgresql/dummy_seclabel.so lib/postgresql/file_fdw.so share/doc/postgresql/extension/autoinc.example share/doc/postgresql/extension/insert_username.example share/doc/postgresql/extension/moddatetime.example share/doc/postgresql/extension/refint.example share/doc/postgresql/extension/timetravel.example %%DATADIR%%/extension/adminpack--1.0.sql %%DATADIR%%/extension/adminpack.control %%DATADIR%%/extension/autoinc--1.0.sql %%DATADIR%%/extension/autoinc--unpackaged--1.0.sql %%DATADIR%%/extension/autoinc.control %%DATADIR%%/extension/btree_gin--1.0.sql %%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gin.control %%DATADIR%%/extension/btree_gist--1.0.sql %%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gist.control %%DATADIR%%/extension/chkpass--1.0.sql %%DATADIR%%/extension/chkpass--unpackaged--1.0.sql %%DATADIR%%/extension/chkpass.control +%%DATADIR%%/extension/citext--1.0--1.1.sql %%DATADIR%%/extension/citext--1.0.sql +%%DATADIR%%/extension/citext--1.1--1.0.sql +%%DATADIR%%/extension/citext--1.1.sql %%DATADIR%%/extension/citext--unpackaged--1.0.sql %%DATADIR%%/extension/citext.control %%DATADIR%%/extension/cube--1.0.sql %%DATADIR%%/extension/cube--unpackaged--1.0.sql %%DATADIR%%/extension/cube.control %%DATADIR%%/extension/dblink--1.0.sql %%DATADIR%%/extension/dblink--unpackaged--1.0.sql %%DATADIR%%/extension/dblink.control %%DATADIR%%/extension/dict_int--1.0.sql %%DATADIR%%/extension/dict_int--unpackaged--1.0.sql %%DATADIR%%/extension/dict_int.control %%DATADIR%%/extension/dict_xsyn--1.0.sql %%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql %%DATADIR%%/extension/dict_xsyn.control %%DATADIR%%/extension/earthdistance--1.0.sql %%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql %%DATADIR%%/extension/earthdistance.control %%DATADIR%%/extension/file_fdw--1.0.sql %%DATADIR%%/extension/file_fdw.control %%DATADIR%%/extension/fuzzystrmatch--1.0.sql %%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql %%DATADIR%%/extension/fuzzystrmatch.control %%DATADIR%%/extension/hstore--1.0.sql %%DATADIR%%/extension/hstore--unpackaged--1.0.sql %%DATADIR%%/extension/hstore.control %%DATADIR%%/extension/insert_username--1.0.sql %%DATADIR%%/extension/insert_username--unpackaged--1.0.sql %%DATADIR%%/extension/insert_username.control %%DATADIR%%/extension/intagg--1.0.sql %%DATADIR%%/extension/intagg--unpackaged--1.0.sql %%DATADIR%%/extension/intagg.control %%DATADIR%%/extension/intarray--1.0.sql %%DATADIR%%/extension/intarray--unpackaged--1.0.sql %%DATADIR%%/extension/intarray.control %%DATADIR%%/extension/isn--1.0.sql %%DATADIR%%/extension/isn--unpackaged--1.0.sql %%DATADIR%%/extension/isn.control %%DATADIR%%/extension/lo--1.0.sql %%DATADIR%%/extension/lo--unpackaged--1.0.sql %%DATADIR%%/extension/lo.control %%DATADIR%%/extension/ltree--1.0.sql %%DATADIR%%/extension/ltree--unpackaged--1.0.sql %%DATADIR%%/extension/ltree.control %%DATADIR%%/extension/moddatetime--1.0.sql %%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql %%DATADIR%%/extension/moddatetime.control %%DATADIR%%/extension/pageinspect--1.0.sql %%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql %%DATADIR%%/extension/pageinspect.control %%DATADIR%%/extension/pg_buffercache--1.0.sql %%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql %%DATADIR%%/extension/pg_buffercache.control %%DATADIR%%/extension/pg_freespacemap--1.0.sql %%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql %%DATADIR%%/extension/pg_freespacemap.control %%DATADIR%%/extension/pg_stat_statements--1.0.sql %%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql %%DATADIR%%/extension/pg_stat_statements.control %%DATADIR%%/extension/pg_trgm--1.0.sql %%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql %%DATADIR%%/extension/pg_trgm.control %%DATADIR%%/extension/pgcrypto--1.0.sql %%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql %%DATADIR%%/extension/pgcrypto.control %%DATADIR%%/extension/pgrowlocks--1.0.sql %%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql %%DATADIR%%/extension/pgrowlocks.control %%DATADIR%%/extension/pgstattuple--1.0.sql %%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql %%DATADIR%%/extension/pgstattuple.control %%DATADIR%%/extension/refint--1.0.sql %%DATADIR%%/extension/refint--unpackaged--1.0.sql %%DATADIR%%/extension/refint.control %%DATADIR%%/extension/seg--1.0.sql %%DATADIR%%/extension/seg--unpackaged--1.0.sql %%DATADIR%%/extension/seg.control %%DATADIR%%/extension/sslinfo--1.0.sql %%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql %%DATADIR%%/extension/sslinfo.control %%DATADIR%%/extension/tablefunc--1.0.sql %%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql %%DATADIR%%/extension/tablefunc.control %%DATADIR%%/extension/test_parser--1.0.sql %%DATADIR%%/extension/test_parser--unpackaged--1.0.sql %%DATADIR%%/extension/test_parser.control %%DATADIR%%/extension/timetravel--1.0.sql %%DATADIR%%/extension/timetravel--unpackaged--1.0.sql %%DATADIR%%/extension/timetravel.control %%DATADIR%%/extension/tsearch2--1.0.sql %%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql %%DATADIR%%/extension/tsearch2.control %%DATADIR%%/extension/unaccent--1.0.sql %%DATADIR%%/extension/unaccent--unpackaged--1.0.sql %%DATADIR%%/extension/unaccent.control %%DATADIR%%/extension/uuid-ossp--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/xml2--1.0.sql %%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%DATADIR%%/extension/xml2.control %%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules @dir %%DATADIR%%/tsearch_data @dir %%DATADIR%%/extension @dir %%DATADIR%% @dir %%DOCSDIR%%/extension @dir %%DOCSDIR%% @dir lib/postgresql Index: branches/2015Q2/databases/postgresql92-client/Makefile =================================================================== --- branches/2015Q2/databases/postgresql92-client/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql92-client/Makefile (revision 390595) @@ -1,19 +1,19 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql COMMENT= PostgreSQL database (client) -PORTREVISION= 1 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../postgresql92-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/databases/postgresql92-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql92-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql92-server/Makefile (revision 390595) @@ -1,310 +1,307 @@ # Created by: Marc G. Fournier # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.2.10 +DISTVERSION?= 9.2.13 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL MASTER_SITE_SUBDIR= source/v${DISTVERSION} PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere -USES+= cpe - CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \ ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \ ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \ ${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-928-icu-2014-06-09.diff.gz +ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} .else # Contrib has different options from -client/-server UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX} .endif PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 +USES+= tar:bzip2 cpe .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes .endif PG_USER= pgsql PG_GROUP= pgsql PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="-lpthread" \ LDFLAGS_SL="${LDFLAGS_SL}" LDFLAGS+= -lpthread PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup BUILD_DIRS?= src/port ${INSTALL_DIRS} +INSTALL_TARGET?=install-strip .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif .if defined(CLIENT_ONLY) OPTIONS_DEFINE+=LIBEDIT LIBEDIT_DESC= Use non-GPL libedit instead of readline .else MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS DTRACE PAM LDAP GSSAPI OPTIMIZED_CFLAGS XML TZDATA DEBUG OPTIONS_RADIO= KRB5 OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages DTRACE_DESC= Build with DTrace probes (server only) PAM_DESC= Build with PAM Support LDAP_DESC= Build with LDAP authentication support (server only) MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos GSSAPI_DESC= Build with GSSAPI support OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) XML_DESC= Build with XML data type (server) TZDATA_DESC= Use internal timezone database (server) DEBUG_DESC= Builds with debugging symbols # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS_DEFINE+= ICU ICU_DESC= Use ICU for unicode collation (server) # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS_DEFINE+= INTDATE INTDATE_DESC= Builds with 64-bit date/time type (server) OPTIONS_DEFINE+= SSL SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT= NLS XML TZDATA INTDATE SSL .endif # !SLAVE_ONLY .include .if defined(CLIENT_ONLY) . if ${PORT_OPTIONS:MLIBEDIT} CONFIGURE_ARGS+=--with-libedit-preferred LIB_DEPENDS= libedit.so.0:${PORTSDIR}/devel/libedit . else USES+= readline . endif .endif # CLIENT_ONLY .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl .endif .if !defined(SLAVE_ONLY) . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu . endif .endif # !SLAVE_ONLY .if ${PORT_OPTIONS:MOSSP_UUID} BUILD_DEPENDS+= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid CONFIGURE_ARGS+=--with-ossp-uuid PLIST_SUB+= OSSP="" .else PLIST_SUB+= OSSP="@comment " .endif .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 . if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf . if ${OSVERSION} < 900021 IGNORE= need userland DTrace support found in FreeBSD 9.0 . endif . endif . if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+=--with-pam . endif . if ${PORT_OPTIONS:MLDAP} . if defined (SERVER_ONLY) CONFIGURE_ARGS+=--with-ldap USE_OPENLDAP= yes . endif . endif . if ${PORT_OPTIONS:MXML} CONFIGURE_ARGS+=--with-libxml LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 . endif . if ${PORT_OPTIONS:MTZDATA} PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo PLIST_SUB+= TZDATA="@comment " . endif . if empty(PORT_OPTIONS:MINTDATE) CONFIGURE_ARGS+=--disable-integer-datetimes . endif . if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= GETTEXT="" USES+= gettext . else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= GETTEXT="@comment " . endif . if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -funroll-loops . endif . if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug INSTALL_TARGET= install -. else -INSTALL_TARGET= install-strip . endif .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-gssapi .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .else CONFIGURE_ARGS+=--without-gssapi .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) IGNORE= requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . else CONFIGURE_ARGS+=--with-krb5 # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libkrb5.so.3:${PORTSDIR}/security/krb5 . endif . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} CONFIGURE_ARGS+=--with-krb5 . endif .endif # !SLAVE_ONLY PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} # For testing files in FILESDIR .include .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} PLIST_SUB+= PG_USER=${PG_USER} . endif post-patch: . if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ ${WRKSRC}/configure.in . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include Index: branches/2015Q2/databases/postgresql92-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql92-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql92-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.2.10.tar.bz2) = 35545bbfead46f70936a7f3f39ccef13e02cdb79c2b3ef3688888df5b18d73ad -SIZE (postgresql/postgresql-9.2.10.tar.bz2) = 16353487 -SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c -SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449 +SHA256 (postgresql/postgresql-9.2.13.tar.bz2) = 5dcbd6209a8c0f508504fa433486583a42caaa240c823e1b3576db8a72db6a44 +SIZE (postgresql/postgresql-9.2.13.tar.bz2) = 16401289 +SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab +SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 Index: branches/2015Q2/databases/postgresql92-server/pkg-plist-contrib =================================================================== --- branches/2015Q2/databases/postgresql92-server/pkg-plist-contrib (revision 390594) +++ branches/2015Q2/databases/postgresql92-server/pkg-plist-contrib (revision 390595) @@ -1,186 +1,189 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_test_timing bin/pg_upgrade bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so lib/postgresql/auto_explain.so lib/postgresql/autoinc.so lib/postgresql/btree_gin.so lib/postgresql/btree_gist.so lib/postgresql/chkpass.so lib/postgresql/citext.so lib/postgresql/cube.so lib/postgresql/dblink.so lib/postgresql/dict_int.so lib/postgresql/dict_xsyn.so lib/postgresql/earthdistance.so lib/postgresql/fuzzystrmatch.so lib/postgresql/hstore.so lib/postgresql/insert_username.so lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/moddatetime.so lib/postgresql/pageinspect.so lib/postgresql/passwordcheck.so lib/postgresql/pg_buffercache.so lib/postgresql/pg_freespacemap.so lib/postgresql/pg_stat_statements.so lib/postgresql/pg_trgm.so lib/postgresql/pg_upgrade_support.so lib/postgresql/pgcrypto.so lib/postgresql/pgrowlocks.so lib/postgresql/pgstattuple.so lib/postgresql/pgxml.so lib/postgresql/refint.so lib/postgresql/seg.so lib/postgresql/sslinfo.so lib/postgresql/tablefunc.so lib/postgresql/tcn.so lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync lib/postgresql/auth_delay.so lib/postgresql/dummy_seclabel.so lib/postgresql/file_fdw.so share/doc/postgresql/extension/autoinc.example share/doc/postgresql/extension/insert_username.example share/doc/postgresql/extension/moddatetime.example share/doc/postgresql/extension/refint.example share/doc/postgresql/extension/timetravel.example %%DATADIR%%/extension/adminpack--1.0.sql %%DATADIR%%/extension/adminpack.control %%DATADIR%%/extension/autoinc--1.0.sql %%DATADIR%%/extension/autoinc--unpackaged--1.0.sql %%DATADIR%%/extension/autoinc.control %%DATADIR%%/extension/btree_gin--1.0.sql %%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gin.control %%DATADIR%%/extension/btree_gist--1.0.sql %%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gist.control %%DATADIR%%/extension/chkpass--1.0.sql %%DATADIR%%/extension/chkpass--unpackaged--1.0.sql %%DATADIR%%/extension/chkpass.control +%%DATADIR%%/extension/citext--1.0--1.1.sql %%DATADIR%%/extension/citext--1.0.sql +%%DATADIR%%/extension/citext--1.1--1.0.sql +%%DATADIR%%/extension/citext--1.1.sql %%DATADIR%%/extension/citext--unpackaged--1.0.sql %%DATADIR%%/extension/citext.control %%DATADIR%%/extension/cube--1.0.sql %%DATADIR%%/extension/cube--unpackaged--1.0.sql %%DATADIR%%/extension/cube.control %%DATADIR%%/extension/dblink--1.0.sql %%DATADIR%%/extension/dblink--unpackaged--1.0.sql %%DATADIR%%/extension/dblink.control %%DATADIR%%/extension/dict_int--1.0.sql %%DATADIR%%/extension/dict_int--unpackaged--1.0.sql %%DATADIR%%/extension/dict_int.control %%DATADIR%%/extension/dict_xsyn--1.0.sql %%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql %%DATADIR%%/extension/dict_xsyn.control %%DATADIR%%/extension/earthdistance--1.0.sql %%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql %%DATADIR%%/extension/earthdistance.control %%DATADIR%%/extension/file_fdw--1.0.sql %%DATADIR%%/extension/file_fdw.control %%DATADIR%%/extension/fuzzystrmatch--1.0.sql %%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql %%DATADIR%%/extension/fuzzystrmatch.control %%DATADIR%%/extension/hstore--1.0--1.1.sql %%DATADIR%%/extension/hstore--1.1.sql %%DATADIR%%/extension/hstore--unpackaged--1.0.sql %%DATADIR%%/extension/hstore.control %%DATADIR%%/extension/insert_username--1.0.sql %%DATADIR%%/extension/insert_username--unpackaged--1.0.sql %%DATADIR%%/extension/insert_username.control %%DATADIR%%/extension/intagg--1.0.sql %%DATADIR%%/extension/intagg--unpackaged--1.0.sql %%DATADIR%%/extension/intagg.control %%DATADIR%%/extension/intarray--1.0.sql %%DATADIR%%/extension/intarray--unpackaged--1.0.sql %%DATADIR%%/extension/intarray.control %%DATADIR%%/extension/isn--1.0.sql %%DATADIR%%/extension/isn--unpackaged--1.0.sql %%DATADIR%%/extension/isn.control %%DATADIR%%/extension/lo--1.0.sql %%DATADIR%%/extension/lo--unpackaged--1.0.sql %%DATADIR%%/extension/lo.control %%DATADIR%%/extension/ltree--1.0.sql %%DATADIR%%/extension/ltree--unpackaged--1.0.sql %%DATADIR%%/extension/ltree.control %%DATADIR%%/extension/moddatetime--1.0.sql %%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql %%DATADIR%%/extension/moddatetime.control %%DATADIR%%/extension/pageinspect--1.0.sql %%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql %%DATADIR%%/extension/pageinspect.control %%DATADIR%%/extension/pg_buffercache--1.0.sql %%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql %%DATADIR%%/extension/pg_buffercache.control %%DATADIR%%/extension/pg_freespacemap--1.0.sql %%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql %%DATADIR%%/extension/pg_freespacemap.control %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql %%DATADIR%%/extension/pg_stat_statements--1.1.sql %%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql %%DATADIR%%/extension/pg_stat_statements.control %%DATADIR%%/extension/pg_trgm--1.0.sql %%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql %%DATADIR%%/extension/pg_trgm.control %%DATADIR%%/extension/pgcrypto--1.0.sql %%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql %%DATADIR%%/extension/pgcrypto.control %%DATADIR%%/extension/pgrowlocks--1.0.sql %%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql %%DATADIR%%/extension/pgrowlocks.control %%DATADIR%%/extension/pgstattuple--1.0.sql %%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql %%DATADIR%%/extension/pgstattuple.control %%DATADIR%%/extension/refint--1.0.sql %%DATADIR%%/extension/refint--unpackaged--1.0.sql %%DATADIR%%/extension/refint.control %%DATADIR%%/extension/seg--1.0.sql %%DATADIR%%/extension/seg--unpackaged--1.0.sql %%DATADIR%%/extension/seg.control %%DATADIR%%/extension/sslinfo--1.0.sql %%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql %%DATADIR%%/extension/sslinfo.control %%DATADIR%%/extension/tablefunc--1.0.sql %%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql %%DATADIR%%/extension/tablefunc.control %%DATADIR%%/extension/tcn--1.0.sql %%DATADIR%%/extension/tcn.control %%DATADIR%%/extension/test_parser--1.0.sql %%DATADIR%%/extension/test_parser--unpackaged--1.0.sql %%DATADIR%%/extension/test_parser.control %%DATADIR%%/extension/timetravel--1.0.sql %%DATADIR%%/extension/timetravel--unpackaged--1.0.sql %%DATADIR%%/extension/timetravel.control %%DATADIR%%/extension/tsearch2--1.0.sql %%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql %%DATADIR%%/extension/tsearch2.control %%DATADIR%%/extension/unaccent--1.0.sql %%DATADIR%%/extension/unaccent--unpackaged--1.0.sql %%DATADIR%%/extension/unaccent.control %%DATADIR%%/extension/uuid-ossp--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/xml2--1.0.sql %%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%DATADIR%%/extension/xml2.control %%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules @dir %%DATADIR%%/tsearch_data @dir %%DATADIR%%/extension @dir %%DATADIR%% @dir %%DOCSDIR%%/extension @dir %%DOCSDIR%% @dir lib/postgresql Index: branches/2015Q2/databases/postgresql93-client/Makefile =================================================================== --- branches/2015Q2/databases/postgresql93-client/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql93-client/Makefile (revision 390595) @@ -1,20 +1,20 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql COMMENT= PostgreSQL database (client) -PORTREVISION= 1 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../postgresql93-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES+= pkgconfig .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/databases/postgresql93-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql93-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql93-server/Makefile (revision 390595) @@ -1,19 +1,17 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.6 +DISTVERSION?= 9.3.9 PORTREVISION?= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org - -USES+= cpe INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup .include "${.CURDIR}/../postgresql92-server/Makefile" Index: branches/2015Q2/databases/postgresql93-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql93-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql93-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.3.6.tar.bz2) = 2368cb61e68d9581da7bfdb61bdf39ffbe59d2d95609b0e93adb3b6b8fd6ca14 -SIZE (postgresql/postgresql-9.3.5.tar.bz2) = 16889913 -SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c -SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449 +SHA256 (postgresql/postgresql-9.3.9.tar.bz2) = f73bd0ec2028511732430beb22414a022d2114231366e8cbe78c149793910549 +SIZE (postgresql/postgresql-9.3.9.tar.bz2) = 16959310 +SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab +SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 Index: branches/2015Q2/databases/postgresql93-server/pkg-plist-contrib =================================================================== --- branches/2015Q2/databases/postgresql93-server/pkg-plist-contrib (revision 390594) +++ branches/2015Q2/databases/postgresql93-server/pkg-plist-contrib (revision 390595) @@ -1,197 +1,200 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_test_timing bin/pg_upgrade bin/pg_xlogdump bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so lib/postgresql/auto_explain.so lib/postgresql/autoinc.so lib/postgresql/btree_gin.so lib/postgresql/btree_gist.so lib/postgresql/chkpass.so lib/postgresql/citext.so lib/postgresql/cube.so lib/postgresql/dblink.so lib/postgresql/dict_int.so lib/postgresql/dict_xsyn.so lib/postgresql/earthdistance.so lib/postgresql/fuzzystrmatch.so lib/postgresql/hstore.so lib/postgresql/insert_username.so lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/moddatetime.so lib/postgresql/pageinspect.so lib/postgresql/passwordcheck.so lib/postgresql/pg_buffercache.so lib/postgresql/pg_freespacemap.so lib/postgresql/pg_stat_statements.so lib/postgresql/pg_trgm.so lib/postgresql/pg_upgrade_support.so lib/postgresql/pgcrypto.so lib/postgresql/pgrowlocks.so lib/postgresql/pgstattuple.so lib/postgresql/pgxml.so lib/postgresql/postgres_fdw.so lib/postgresql/refint.so lib/postgresql/seg.so lib/postgresql/sslinfo.so lib/postgresql/tablefunc.so lib/postgresql/tcn.so lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so lib/postgresql/worker_spi.so lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync lib/postgresql/auth_delay.so lib/postgresql/dummy_seclabel.so lib/postgresql/file_fdw.so share/doc/postgresql/extension/autoinc.example share/doc/postgresql/extension/insert_username.example share/doc/postgresql/extension/moddatetime.example share/doc/postgresql/extension/refint.example share/doc/postgresql/extension/timetravel.example %%DATADIR%%/extension/adminpack--1.0.sql %%DATADIR%%/extension/adminpack.control %%DATADIR%%/extension/autoinc--1.0.sql %%DATADIR%%/extension/autoinc--unpackaged--1.0.sql %%DATADIR%%/extension/autoinc.control %%DATADIR%%/extension/btree_gin--1.0.sql %%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gin.control %%DATADIR%%/extension/btree_gist--1.0.sql %%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gist.control %%DATADIR%%/extension/chkpass--1.0.sql %%DATADIR%%/extension/chkpass--unpackaged--1.0.sql %%DATADIR%%/extension/chkpass.control +%%DATADIR%%/extension/citext--1.0--1.1.sql %%DATADIR%%/extension/citext--1.0.sql +%%DATADIR%%/extension/citext--1.1--1.0.sql +%%DATADIR%%/extension/citext--1.1.sql %%DATADIR%%/extension/citext--unpackaged--1.0.sql %%DATADIR%%/extension/citext.control %%DATADIR%%/extension/cube--1.0.sql %%DATADIR%%/extension/cube--unpackaged--1.0.sql %%DATADIR%%/extension/cube.control %%DATADIR%%/extension/dblink--1.0--1.1.sql %%DATADIR%%/extension/dblink--1.1.sql %%DATADIR%%/extension/dblink--unpackaged--1.0.sql %%DATADIR%%/extension/dblink.control %%DATADIR%%/extension/dict_int--1.0.sql %%DATADIR%%/extension/dict_int--unpackaged--1.0.sql %%DATADIR%%/extension/dict_int.control %%DATADIR%%/extension/dict_xsyn--1.0.sql %%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql %%DATADIR%%/extension/dict_xsyn.control %%DATADIR%%/extension/earthdistance--1.0.sql %%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql %%DATADIR%%/extension/earthdistance.control %%DATADIR%%/extension/file_fdw--1.0.sql %%DATADIR%%/extension/file_fdw.control %%DATADIR%%/extension/fuzzystrmatch--1.0.sql %%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql %%DATADIR%%/extension/fuzzystrmatch.control %%DATADIR%%/extension/hstore--1.0--1.1.sql %%DATADIR%%/extension/hstore--1.1--1.2.sql %%DATADIR%%/extension/hstore--1.2.sql %%DATADIR%%/extension/hstore--unpackaged--1.0.sql %%DATADIR%%/extension/hstore.control %%DATADIR%%/extension/insert_username--1.0.sql %%DATADIR%%/extension/insert_username--unpackaged--1.0.sql %%DATADIR%%/extension/insert_username.control %%DATADIR%%/extension/intagg--1.0.sql %%DATADIR%%/extension/intagg--unpackaged--1.0.sql %%DATADIR%%/extension/intagg.control %%DATADIR%%/extension/intarray--1.0.sql %%DATADIR%%/extension/intarray--unpackaged--1.0.sql %%DATADIR%%/extension/intarray.control %%DATADIR%%/extension/isn--1.0.sql %%DATADIR%%/extension/isn--unpackaged--1.0.sql %%DATADIR%%/extension/isn.control %%DATADIR%%/extension/lo--1.0.sql %%DATADIR%%/extension/lo--unpackaged--1.0.sql %%DATADIR%%/extension/lo.control %%DATADIR%%/extension/ltree--1.0.sql %%DATADIR%%/extension/ltree--unpackaged--1.0.sql %%DATADIR%%/extension/ltree.control %%DATADIR%%/extension/moddatetime--1.0.sql %%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql %%DATADIR%%/extension/moddatetime.control %%DATADIR%%/extension/pageinspect--1.0--1.1.sql %%DATADIR%%/extension/pageinspect--1.1.sql %%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql %%DATADIR%%/extension/pageinspect.control %%DATADIR%%/extension/pg_buffercache--1.0.sql %%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql %%DATADIR%%/extension/pg_buffercache.control %%DATADIR%%/extension/pg_freespacemap--1.0.sql %%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql %%DATADIR%%/extension/pg_freespacemap.control %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql %%DATADIR%%/extension/pg_stat_statements--1.1.sql %%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql %%DATADIR%%/extension/pg_stat_statements.control %%DATADIR%%/extension/pg_trgm--1.0--1.1.sql %%DATADIR%%/extension/pg_trgm--1.1.sql %%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql %%DATADIR%%/extension/pg_trgm.control %%DATADIR%%/extension/pgcrypto--1.0.sql %%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql %%DATADIR%%/extension/pgcrypto.control %%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql %%DATADIR%%/extension/pgrowlocks--1.1.sql %%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql %%DATADIR%%/extension/pgrowlocks.control %%DATADIR%%/extension/pgstattuple--1.0--1.1.sql %%DATADIR%%/extension/pgstattuple--1.1.sql %%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql %%DATADIR%%/extension/pgstattuple.control %%DATADIR%%/extension/postgres_fdw--1.0.sql %%DATADIR%%/extension/postgres_fdw.control %%DATADIR%%/extension/refint--1.0.sql %%DATADIR%%/extension/refint--unpackaged--1.0.sql %%DATADIR%%/extension/refint.control %%DATADIR%%/extension/seg--1.0.sql %%DATADIR%%/extension/seg--unpackaged--1.0.sql %%DATADIR%%/extension/seg.control %%DATADIR%%/extension/sslinfo--1.0.sql %%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql %%DATADIR%%/extension/sslinfo.control %%DATADIR%%/extension/tablefunc--1.0.sql %%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql %%DATADIR%%/extension/tablefunc.control %%DATADIR%%/extension/tcn--1.0.sql %%DATADIR%%/extension/tcn.control %%DATADIR%%/extension/test_parser--1.0.sql %%DATADIR%%/extension/test_parser--unpackaged--1.0.sql %%DATADIR%%/extension/test_parser.control %%DATADIR%%/extension/timetravel--1.0.sql %%DATADIR%%/extension/timetravel--unpackaged--1.0.sql %%DATADIR%%/extension/timetravel.control %%DATADIR%%/extension/tsearch2--1.0.sql %%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql %%DATADIR%%/extension/tsearch2.control %%DATADIR%%/extension/unaccent--1.0.sql %%DATADIR%%/extension/unaccent--unpackaged--1.0.sql %%DATADIR%%/extension/unaccent.control %%DATADIR%%/extension/uuid-ossp--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/xml2--1.0.sql %%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%DATADIR%%/extension/xml2.control %%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules @dir %%DATADIR%%/tsearch_data @dir %%DATADIR%%/extension @dir %%DATADIR%% @dir %%DOCSDIR%%/extension @dir %%DOCSDIR%% @dir lib/postgresql Index: branches/2015Q2/databases/postgresql94-client/Makefile =================================================================== --- branches/2015Q2/databases/postgresql94-client/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql94-client/Makefile (revision 390595) @@ -1,20 +1,20 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql COMMENT= PostgreSQL database (client) -PORTREVISION= 1 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../postgresql94-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/databases/postgresql94-server/Makefile =================================================================== --- branches/2015Q2/databases/postgresql94-server/Makefile (revision 390594) +++ branches/2015Q2/databases/postgresql94-server/Makefile (revision 390595) @@ -1,18 +1,20 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.1 +DISTVERSION?= 9.4.4 PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org +USES+= cpe + INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -ICU_PATCHFILE= pg-940-icu-2014-06-09.diff.gz +ICU_PATCHFILE= pg-941-icu-2015-04-18.diff.gz .include "${.CURDIR}/../postgresql92-server/Makefile" Index: branches/2015Q2/databases/postgresql94-server/distinfo =================================================================== --- branches/2015Q2/databases/postgresql94-server/distinfo (revision 390594) +++ branches/2015Q2/databases/postgresql94-server/distinfo (revision 390595) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.4.1.tar.bz2) = 29ddb77c820095b8f52e5455e9c6c6c20cf979b0834ed1986a8857b84888c3a6 -SIZE (postgresql/postgresql-9.4.1.tar.bz2) = 17549976 -SHA256 (postgresql/pg-940-icu-2014-06-09.diff.gz) = 83de4b99c37aec1ad741c686cb2ea7f4bccff516c357ae71032b2d1f8da0d1c1 -SIZE (postgresql/pg-940-icu-2014-06-09.diff.gz) = 4259 +SHA256 (postgresql/postgresql-9.4.4.tar.bz2) = 538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013 +SIZE (postgresql/postgresql-9.4.4.tar.bz2) = 17616272 +SHA256 (postgresql/pg-941-icu-2015-04-18.diff.gz) = 30c1366539fd0833db37a98b32bd22e8da4538e58f8dbc2ad2f63dc54835609b +SIZE (postgresql/pg-941-icu-2015-04-18.diff.gz) = 4279 Index: branches/2015Q2/databases/postgresql94-server/pkg-plist-contrib =================================================================== --- branches/2015Q2/databases/postgresql94-server/pkg-plist-contrib (revision 390594) +++ branches/2015Q2/databases/postgresql94-server/pkg-plist-contrib (revision 390595) @@ -1,211 +1,214 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_test_timing bin/pg_upgrade bin/pg_xlogdump bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so lib/postgresql/auto_explain.so lib/postgresql/autoinc.so lib/postgresql/btree_gin.so lib/postgresql/btree_gist.so lib/postgresql/chkpass.so lib/postgresql/citext.so lib/postgresql/cube.so lib/postgresql/dblink.so lib/postgresql/dict_int.so lib/postgresql/dict_xsyn.so lib/postgresql/earthdistance.so lib/postgresql/fuzzystrmatch.so lib/postgresql/hstore.so lib/postgresql/insert_username.so lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/moddatetime.so lib/postgresql/pageinspect.so lib/postgresql/passwordcheck.so lib/postgresql/pg_buffercache.so lib/postgresql/pg_freespacemap.so lib/postgresql/pg_prewarm.so lib/postgresql/pg_stat_statements.so lib/postgresql/pg_trgm.so lib/postgresql/pg_upgrade_support.so lib/postgresql/pgcrypto.so lib/postgresql/pgrowlocks.so lib/postgresql/pgstattuple.so lib/postgresql/pgxml.so lib/postgresql/postgres_fdw.so lib/postgresql/refint.so lib/postgresql/seg.so lib/postgresql/sslinfo.so lib/postgresql/tablefunc.so lib/postgresql/tcn.so lib/postgresql/test_decoding.so lib/postgresql/test_parser.so lib/postgresql/test_shm_mq.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so lib/postgresql/uuid-ossp.so lib/postgresql/worker_spi.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync lib/postgresql/auth_delay.so lib/postgresql/dummy_seclabel.so lib/postgresql/file_fdw.so share/doc/postgresql/extension/autoinc.example share/doc/postgresql/extension/insert_username.example share/doc/postgresql/extension/moddatetime.example share/doc/postgresql/extension/refint.example share/doc/postgresql/extension/timetravel.example %%DATADIR%%/extension/adminpack--1.0.sql %%DATADIR%%/extension/adminpack.control %%DATADIR%%/extension/autoinc--1.0.sql %%DATADIR%%/extension/autoinc--unpackaged--1.0.sql %%DATADIR%%/extension/autoinc.control %%DATADIR%%/extension/btree_gin--1.0.sql %%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gin.control %%DATADIR%%/extension/btree_gist--1.0.sql %%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql %%DATADIR%%/extension/btree_gist.control %%DATADIR%%/extension/chkpass--1.0.sql %%DATADIR%%/extension/chkpass--unpackaged--1.0.sql %%DATADIR%%/extension/chkpass.control +%%DATADIR%%/extension/citext--1.0--1.1.sql %%DATADIR%%/extension/citext--1.0.sql +%%DATADIR%%/extension/citext--1.1--1.0.sql +%%DATADIR%%/extension/citext--1.1.sql %%DATADIR%%/extension/citext--unpackaged--1.0.sql %%DATADIR%%/extension/citext.control %%DATADIR%%/extension/cube--1.0.sql %%DATADIR%%/extension/pg_prewarm.control %%DATADIR%%/extension/pg_prewarm--1.0.sql %%DATADIR%%/extension/test_shm_mq.control %%DATADIR%%/extension/test_shm_mq--1.0.sql %%DATADIR%%/extension/worker_spi.control %%DATADIR%%/extension/worker_spi--1.0.sql %%DATADIR%%/extension/cube--unpackaged--1.0.sql %%DATADIR%%/extension/cube.control %%DATADIR%%/extension/dblink--1.0--1.1.sql %%DATADIR%%/extension/dblink--1.1.sql %%DATADIR%%/extension/dblink--unpackaged--1.0.sql %%DATADIR%%/extension/dblink.control %%DATADIR%%/extension/dict_int--1.0.sql %%DATADIR%%/extension/dict_int--unpackaged--1.0.sql %%DATADIR%%/extension/dict_int.control %%DATADIR%%/extension/dict_xsyn--1.0.sql %%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql %%DATADIR%%/extension/dict_xsyn.control %%DATADIR%%/extension/earthdistance--1.0.sql %%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql %%DATADIR%%/extension/earthdistance.control %%DATADIR%%/extension/file_fdw--1.0.sql %%DATADIR%%/extension/file_fdw.control %%DATADIR%%/extension/fuzzystrmatch--1.0.sql %%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql %%DATADIR%%/extension/fuzzystrmatch.control %%DATADIR%%/extension/hstore--1.0--1.1.sql %%DATADIR%%/extension/hstore--1.1--1.2.sql %%DATADIR%%/extension/hstore--1.2--1.3.sql %%DATADIR%%/extension/hstore--1.3.sql %%DATADIR%%/extension/hstore--unpackaged--1.0.sql %%DATADIR%%/extension/hstore.control %%DATADIR%%/extension/insert_username--1.0.sql %%DATADIR%%/extension/insert_username--unpackaged--1.0.sql %%DATADIR%%/extension/insert_username.control %%DATADIR%%/extension/intagg--1.0.sql %%DATADIR%%/extension/intagg--unpackaged--1.0.sql %%DATADIR%%/extension/intagg.control %%DATADIR%%/extension/intarray--1.0.sql %%DATADIR%%/extension/intarray--unpackaged--1.0.sql %%DATADIR%%/extension/intarray.control %%DATADIR%%/extension/isn--1.0.sql %%DATADIR%%/extension/isn--unpackaged--1.0.sql %%DATADIR%%/extension/isn.control %%DATADIR%%/extension/lo--1.0.sql %%DATADIR%%/extension/lo--unpackaged--1.0.sql %%DATADIR%%/extension/lo.control %%DATADIR%%/extension/ltree--1.0.sql %%DATADIR%%/extension/ltree--unpackaged--1.0.sql %%DATADIR%%/extension/ltree.control %%DATADIR%%/extension/moddatetime--1.0.sql %%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql %%DATADIR%%/extension/moddatetime.control %%DATADIR%%/extension/pageinspect--1.0--1.1.sql %%DATADIR%%/extension/pageinspect--1.1--1.2.sql %%DATADIR%%/extension/pageinspect--1.2.sql %%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql %%DATADIR%%/extension/pageinspect.control %%DATADIR%%/extension/pg_buffercache--1.0.sql %%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql %%DATADIR%%/extension/pg_buffercache.control %%DATADIR%%/extension/pg_freespacemap--1.0.sql %%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql %%DATADIR%%/extension/pg_freespacemap.control %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql %%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql %%DATADIR%%/extension/pg_stat_statements--1.2.sql %%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql %%DATADIR%%/extension/pg_stat_statements.control %%DATADIR%%/extension/pg_trgm--1.0--1.1.sql %%DATADIR%%/extension/pg_trgm--1.1.sql %%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql %%DATADIR%%/extension/pg_trgm.control %%DATADIR%%/extension/pgcrypto--1.0--1.1.sql %%DATADIR%%/extension/pgcrypto--1.1.sql %%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql %%DATADIR%%/extension/pgcrypto.control %%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql %%DATADIR%%/extension/pgrowlocks--1.1.sql %%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql %%DATADIR%%/extension/pgrowlocks.control %%DATADIR%%/extension/pgstattuple--1.0--1.1.sql %%DATADIR%%/extension/pgstattuple--1.1--1.2.sql %%DATADIR%%/extension/pgstattuple--1.2.sql %%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql %%DATADIR%%/extension/pgstattuple.control %%DATADIR%%/extension/postgres_fdw--1.0.sql %%DATADIR%%/extension/postgres_fdw.control %%DATADIR%%/extension/refint--1.0.sql %%DATADIR%%/extension/refint--unpackaged--1.0.sql %%DATADIR%%/extension/refint.control %%DATADIR%%/extension/seg--1.0.sql %%DATADIR%%/extension/seg--unpackaged--1.0.sql %%DATADIR%%/extension/seg.control %%DATADIR%%/extension/sslinfo--1.0.sql %%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql %%DATADIR%%/extension/sslinfo.control %%DATADIR%%/extension/tablefunc--1.0.sql %%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql %%DATADIR%%/extension/tablefunc.control %%DATADIR%%/extension/tcn--1.0.sql %%DATADIR%%/extension/tcn.control %%DATADIR%%/extension/test_parser--1.0.sql %%DATADIR%%/extension/test_parser--unpackaged--1.0.sql %%DATADIR%%/extension/test_parser.control %%DATADIR%%/extension/timetravel--1.0.sql %%DATADIR%%/extension/timetravel--unpackaged--1.0.sql %%DATADIR%%/extension/timetravel.control %%DATADIR%%/extension/tsearch2--1.0.sql %%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql %%DATADIR%%/extension/tsearch2.control %%DATADIR%%/extension/unaccent--1.0.sql %%DATADIR%%/extension/unaccent--unpackaged--1.0.sql %%DATADIR%%/extension/unaccent.control %%DATADIR%%/extension/uuid-ossp--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/xml2--1.0.sql %%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%DATADIR%%/extension/xml2.control %%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules @dir %%DATADIR%%/tsearch_data @dir %%DATADIR%%/extension @dir %%DATADIR%% @dir %%DOCSDIR%%/extension @dir %%DOCSDIR%% @dir lib/postgresql Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 390594) +++ branches/2015Q2 (revision 390595) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r383112,383272,384223,384279,387089,388585,389267