1 files changed, 107 insertions, 61 deletions

diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 1ed2acfdfc72..118195daa744 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,27 +6,32 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.2.3
+PORTVERSION?=	7.3.1
 CATEGORIES?=	databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+MASTER_SITES=	ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \
+		ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \
+		ftp://ftp10.us.postgresql.org/pub/postgresql/%SUBDIR%/ \
+		ftp://ftp13.us.postgresql.org/mirror/postresql/%SUBDIR%/ \
+		ftp://ftp8.us.postgresql.org/pub/pgsql/%SUBDIR%/ \
+		ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/%SUBDIR%/ \
 		ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
 		ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.de.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.chg.ru/pub/databases/postgresql/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \
-		ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/%SUBDIR%/ \
-		ftp://ftp.us.postgresql.org/%SUBDIR%/
+		ftp://ftp.us.postgresql.org/%SUBDIR%/ \
+		ftp://ftp.postgresql.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 DISTFILES=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
+		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} \
+		postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@pingpong.net
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
-USE_SUBMAKE=	yes
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -35,41 +40,100 @@ GNU_CONFIGURE=	YES
 MD5_FILE=	${.CURDIR}/../postgresql7/distinfo
 .else
 
+## POSTGRESQL_SUBPORTS stops here
 ## The rest of this file is for normal base installation
 INSTALLS_SHLIB=	YES
 
-CONFIGURE_ARGS=	--enable-locale --enable-syslog --with-CXX \
-		--docdir=${PREFIX}/share/doc --with-libdir=${LOCALBASE}/lib \
+CONFIGURE_ARGS=	--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include
 
 .if !defined(WITHOUT_GNUGETOPT)
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .endif
 
-# if you want localized messages, make -DWITH_GETTEXT
-# WARNING: this seems to require relinking binaries depending on
-# libpq.so, including for example mod_php and tcl.
-.if defined(WITH_GETTEXT)
+.if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-CONFIGURE_ENV+=	"LIBS=-lintl"
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 LIB_DEPENDS+=	intl.4:${PORTSDIR}/devel/gettext
 PLIST_SUB+=	GETTEXT=""
 .else
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .endif
 
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+= -O3 -funroll-loops
+.endif
+
+.if defined(WITH_DEBUG) && defined(WITH_STRIPBIN)
+	@${ECHO} "WITH_DEBUG and WITH_STRIPBIN are mutually exclusive tunables."
+	@${ECHO} "Please choose one or the other."
+	@exit ${FALSE}
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+.if defined(WITH_STRIPBIN)
+INSTALL_TARGET=	install-strip
+.endif
+
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
+.if defined(WITHOUT_SERVER)
+PKGMESSAGE=	${PKGDIR}/pkg-message.client
+PLIST_SUB+=	SERVER="@comment "
+PKGNAMESUFFIX=	-client
+.else
+SERVERBINARIES+=	postgres
+PLIST_SUB+=	SERVER=""
+INSTALL_TARGET=	install install-all-headers
+.endif
+
+.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.endif
+
+.if defined(WITH_MIT_KRB5)
+KRB5CONF=	${LOCALBASE}/bin/krb5-config
+.if !exists(${KRB5CONFIG})
+	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
+	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
+	@exit 1
+.endif
+WITH_KRB5=	yes
+.endif
+
+.if defined(WITH_HEIMDAL_KRB5)
+KRB5CONF=	/usr/bin/krb5-config
+.if !exists(${KRB5CONFIG})
+	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
+	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
+	@${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)."
+	@exit 1
+.endif
+LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
+WITH_KRB5=	yes
+.endif
+
+.if defined(WITH_KRB5)
+CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+LDFLAGS+=	`${KRB5CONF} --libs krb5`
+.endif
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+= -O3 -funroll-loops
+.endif
+
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
 		dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \
-		pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_restore.1 \
-		pgaccess.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
+		pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_restore.1 \
+		pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
 		vacuumdb.1
 MAN7=		abort.7 alter_group.7 alter_table.7 alter_user.7 analyze.7 \
 		begin.7 checkpoint.7 close.7 cluster.7 comment.7 commit.7 copy.7 \
@@ -90,52 +154,45 @@ MAN7=		abort.7 alter_group.7 alter_table.7 alter_user.7 analyze.7 \
 		set_session_authorization.7 \
 		truncate.7 unlisten.7 update.7 vacuum.7
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		WRKDIR="${WRKDIR}" \
-		FILESDIR="${FILESDIR}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		DISTNAME="${DISTNAME}"
-
-# We must .include here because we need the Makefile.inc @ pre-install
-# to determine the correct plist.
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
+pre-everything::
+	@${SH} ${PKGDIR}/pkg-install ${PORTNAME} BACKUPWARNING
+	@${ECHO} ""
+	@${ECHO} "${PORTNAME} has several tunables that can be used to configure PostgreSQL:"
+	@${ECHO} ""
+	@${ECHO} "	WITHOUT_GNUGETOPT	Don't install GNU getopt (will"
+	@${ECHO} "				still be used if already installed)"
+	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
+	@${ECHO} "				internationalized error messages"
+	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
+	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
+	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
+	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
+	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
+	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
+	@${ECHO} "	WITH_STRIPBIN		Installs stripped binaries"
+	@${ECHO} ""
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
-PLIST_SUB+=	SERVER="@comment "
-.else
-PLIST_SUB+=	SERVER=""
-.endif
-
-.if defined(WITHOUT_MULTIBYTE)
-PLIST_SUB+=	MULTIBYTE="@comment "
+do-install:
+	@ cd ${WRKSRC}; \
+	${GMAKE} -C src/bin ${INSTALL_TARGET} ;\
+	${GMAKE} -C src/include ${INSTALL_TARGET} ;\
+	${GMAKE} -C src/interfaces ${INSTALL_TARGET} ;\
+	${GMAKE} -C doc ${INSTALL_TARGET}
 .else
-PLIST_SUB+=	MULTIBYTE=""
-CONFIGURE_ARGS+=--enable-multibyte=${MULTIBYTE_ENCODING}
-.endif
-
-pre-everything::
-	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
-
 pre-install:
-.if !defined(WITHOUT_SERVER)
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 .endif
 
-post-build:
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/odbc odbc-drop.sql
-
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
 	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(DEBUG_FLAGS)
-.for file in ecpg pg_dump pg_id pg_passwd pg_restore psql
+.for file in ecpg pg_dump pg_id pg_restore psql ${SERVERBINARIES}
 	@ strip ${PREFIX}/bin/${file}
 .endfor
 .endif
@@ -159,19 +216,8 @@ post-install:
 	${INSTALL_DATA} ${PREFIX}/share/postgresql/post-install-notes ~pgsql/. ;\
 	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${INSTALL_DATA} ${FILESDIR}/502.pgsql \
-			${WRKSRC}/src/interfaces/odbc/odbc.sql \
-			${WRKSRC}/src/interfaces/odbc/odbc-drop.sql \
 			${PREFIX}/share/postgresql
-.else
-do-install:
-	@ cd ${WRKSRC}; \
-	${GMAKE} -C src/bin install ;\
-	${GMAKE} -C src/include install ;\
-	${GMAKE} -C src/interfaces install
 .endif
 
-post-clean:
-	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
 .include <bsd.port.mk>
 .endif