aboutsummaryrefslogtreecommitdiff
path: root/databases/postgresql7
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2003-06-02 01:44:03 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2003-06-02 01:44:03 +0000
commit21b5e839a306102dea852036193659b62afc32fb (patch)
treebcf2c1dde281cd0dc41dcf9cd27b831701a6437a /databases/postgresql7
parent36bdeacda1d46524cd327c0c14c05623d756d93b (diff)
downloadports-21b5e839a306102dea852036193659b62afc32fb.tar.gz
ports-21b5e839a306102dea852036193659b62afc32fb.zip
Notes
Diffstat (limited to 'databases/postgresql7')
-rw-r--r--databases/postgresql7/Makefile23
-rw-r--r--databases/postgresql7/distinfo8
-rw-r--r--databases/postgresql7/files/patch-src::backend::utils::adt::numutils.c29
3 files changed, 18 insertions, 42 deletions
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index c204fbcacebe..3465ae6d39fd 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/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 <bsd.port.pre.mk>
.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
.endif
diff --git a/databases/postgresql7/distinfo b/databases/postgresql7/distinfo
index 934a97ecd98a..d95d2a295743 100644
--- a/databases/postgresql7/distinfo
+++ b/databases/postgresql7/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.2.tar.gz) = 2cd99c2d455c653fdfe74f5dd658d15c
-MD5 (postgresql/postgresql-opt-7.3.2.tar.gz) = c54a5b0be96b60259bd37f6a5b60abb9
-MD5 (postgresql/postgresql-test-7.3.2.tar.gz) = 9818eb4c50a2fe9057c7df5ae270972c
-MD5 (postgresql/postgresql-docs-7.3.2.tar.gz) = e91131aeed6919a00ab231db2298bd0b
+MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
+MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
+MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
+MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
diff --git a/databases/postgresql7/files/patch-src::backend::utils::adt::numutils.c b/databases/postgresql7/files/patch-src::backend::utils::adt::numutils.c
deleted file mode 100644
index 3a9c84d71961..000000000000
--- a/databases/postgresql7/files/patch-src::backend::utils::adt::numutils.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: src/backend/utils/adt/numutils.c
-===================================================================
-RCS file: /cvsroot/pgsql-server/src/backend/utils/adt/numutils.c,v
-retrieving revision 1.54
-diff -c -c -r1.54 numutils.c
-*** src/backend/utils/adt/numutils.c 4 Sep 2002 20:31:28 -0000 1.54
---- src/backend/utils/adt/numutils.c 19 Dec 2002 17:10:56 -0000
-***************
-*** 70,76 ****
- if (s == (char *) NULL)
- elog(ERROR, "pg_atoi: NULL pointer");
- else if (*s == 0)
-! elog(ERROR, "pg_atoi: zero-length string");
- else
- l = strtol(s, &badp, 10);
-
---- 70,80 ----
- if (s == (char *) NULL)
- elog(ERROR, "pg_atoi: NULL pointer");
- else if (*s == 0)
-! {
-! /* 7.3.X workaround for broken apps, bjm 2002-12-19 */
-! elog(WARNING, "pg_atoi: zero-length string");
-! l = (long) 0;
-! }
- else
- l = strtol(s, &badp, 10);
-
-