Index: head/databases/postgresql10-server/Makefile =================================================================== --- head/databases/postgresql10-server/Makefile (revision 450531) +++ head/databases/postgresql10-server/Makefile (revision 450532) @@ -1,29 +1,30 @@ # Created by: Marc G. Fournier # $FreeBSD$ DISTVERSION?= 10rc1 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} +PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org 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 src/bin/pg_archivecleanup \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_xlogdump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .if defined(SERVER_ONLY) CONFIGURE_ARGS+=--with-icu LIB_DEPENDS+= libicudata.so:devel/icu USES+= pkgconfig .endif .include "${.CURDIR}/../postgresql92-server/Makefile" Index: head/databases/postgresql10-server/files/postgresql.in =================================================================== --- head/databases/postgresql10-server/files/postgresql.in (revision 450531) +++ head/databases/postgresql10-server/files/postgresql.in (revision 450532) @@ -1,114 +1,114 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: postgresql # REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional -# postgresql_data="/var/db/%%PG_USER%%/data96" +# postgresql_data="/var/db/%%PG_USER%%/data10" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} -eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"} +eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data10"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Index: head/databases/postgresql95-plperl/Makefile =================================================================== --- head/databases/postgresql95-plperl/Makefile (revision 450531) +++ head/databases/postgresql95-plperl/Makefile (revision 450532) @@ -1,26 +1,26 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql -PORTREVIOSION= 0 +PORTREVISION= 0 CATEGORIES= databases perl5 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server WANT_PGSQL_VER?=9.5 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend src/pl/plperl INSTALL_DIRS= src/pl/plperl SLAVE_ONLY= yes COMPONENT= -plperl .include "${MASTERDIR}/Makefile" Index: head/databases/postgresql95-plpython/Makefile =================================================================== --- head/databases/postgresql95-plpython/Makefile (revision 450531) +++ head/databases/postgresql95-plpython/Makefile (revision 450532) @@ -1,25 +1,26 @@ # $FreeBSD$ PORTNAME= postgresql CATEGORIES= databases python +PORTREVISION= 0 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server WANT_PGSQL_VER?= 9.5 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend src/pl/plpython INSTALL_DIRS= src/pl/plpython SLAVE_ONLY= yes .include "${MASTERDIR}/Makefile" Index: head/databases/postgresql96-docs/Makefile =================================================================== --- head/databases/postgresql96-docs/Makefile (revision 450531) +++ head/databases/postgresql96-docs/Makefile (revision 450532) @@ -1,45 +1,46 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql +PORTREVISION= 0 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs -DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server WANT_PGSQL_VER?=9.6 +DISTV= ${DISTVERSION:R} + SLAVE_ONLY= YES COMPONENT= -docs PGDOCSREL?= ${DOCSDIR_REL}/release-${PGSQL_VER} PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} sgmldir= ${LOCALBASE}/share/sgml dbdir= ${sgmldir}/docbook BUILD_DEPENDS+= onsgmls:textproc/opensp \ openjade:textproc/openjade \ ${sgmldir}/iso8879/catalog:textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ docbook-sgml>0:textproc/docbook-sgml CONFIGURE_ARGS= --without-readline NO_ARCH= yes do-build: ${MAKE_CMD} -C ${WRKSRC} html do-install: @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \ ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST} - .include "${MASTERDIR}/Makefile" Index: head/databases/postgresql96-pltcl/Makefile =================================================================== --- head/databases/postgresql96-pltcl/Makefile (revision 450531) +++ head/databases/postgresql96-pltcl/Makefile (revision 450532) @@ -1,30 +1,31 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= postgresql +PORTREVISION= 0 CATEGORIES= databases tcl PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server WANT_PGSQL_VER?=9.6 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl .include "${MASTERDIR}/Makefile"