From 21b5e839a306102dea852036193659b62afc32fb Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Mon, 2 Jun 2003 01:44:03 +0000 Subject: Update to 7.3.3. 1. Optionally link with libc_r to get plpython working. [1] 2. Fix kerberos build. [2] 3. There was a duplication of some declarations. [3] PR: ports/52851 PR: ports/51080 [2] Submitted by: Mike Meyer [1] Submitted by: Gerweck [2] Pointed out by: Mike Harding [3] Submitted by: Palle Girgensohn (maintainer) --- databases/postgresql90-server/Makefile | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'databases/postgresql90-server/Makefile') diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index c204fbcacebe..3465ae6d39fd 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.3.2 -PORTREVISION= 1 +PORTVERSION?= 7.3.3 CATEGORIES?= databases MASTER_SITES= ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \ @@ -47,6 +46,7 @@ INSTALLS_SHLIB= YES CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" .if !defined(WITHOUT_GNUGETOPT) LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt @@ -98,19 +98,22 @@ LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 WITH_KRB5= yes .endif +.include .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 +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" .endif .if defined(WITH_TESTS) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} .endif +.if defined(WITH_LIBC_R) +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +.endif + MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \ droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \ pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \ @@ -140,7 +143,7 @@ MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \ truncate.7 unlisten.7 update.7 vacuum.7 pre-everything:: - @${SH} ${PKGDIR}/pkg-install ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING @${ECHO} "" @${ECHO} "${PORTNAME} has several tunables that can be used to configure PostgreSQL:" @${ECHO} "" @@ -157,6 +160,8 @@ pre-everything:: @${ECHO} " WITH_DEBUG Builds with debugging symbols" @${ECHO} " WITH_TESTS Allows the use of a \"check\" target" @${ECHO} " building the module" + @${ECHO} " WITH_LIBC_R Link the binaries with libc_r." + @${ECHO} " Needed to run plpython" @${ECHO} "" .if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." @@ -185,7 +190,7 @@ do-install: .else pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL + ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif post-install: @@ -225,5 +230,5 @@ check: fi .endif -.include +.include .endif -- cgit v1.2.3