4 files changed, 8 insertions, 75 deletions

diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index e8df86027429..3032ad72a51b 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.5.2003.11.17
+PORTVERSION?=	7.5.2003.12.03
 CATEGORIES?=	databases
 MASTER_SITES=	http://freebsd.sean.chittenden.org/ports/ \
 		http://people.freebsd.org/~seanc/ports/
@@ -82,7 +82,7 @@ PLIST_SUB+=	PGCRYPTO="@comment "
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl"
 .endif
 
 .if defined(WITHOUT_SERVER)
diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo
index c5beda6dddf2..8e53185b2dfe 100644
--- a/databases/postgresql-devel/distinfo
+++ b/databases/postgresql-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.5.2003.11.17.tar.bz2) = 38d610a523f29fba668d15418f2b4e03
+MD5 (postgresql/postgresql-7.5.2003.12.03.tar.bz2) = 0b276e11d9c1a41a38da5c12dc616541
 MD5 (postgresql/patch-pgblocksize-16K) = 2ac9dac033302e9ce15816db0e346d55
 MD5 (postgresql/patch-pgblocksize-32K) = 0910cbfbecbb25e2bd23ebe50eb29287
 MD5 (postgresql/patch-pgblocksize-65K) = 0e197b76e262bb5efe1ebf0f5c0a80ee
diff --git a/databases/postgresql-devel/files/patch-configure b/databases/postgresql-devel/files/patch-configure
deleted file mode 100644
index cbf298f1a612..000000000000
--- a/databases/postgresql-devel/files/patch-configure
+++ /dev/null
@@ -1,69 +0,0 @@
---- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -337,7 +337,8 @@
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--docdir='${prefix}/doc'
-+# docdir='${prefix}/doc'
-+docdir='${prefix}/share/doc'
- mandir='${prefix}/man'
-
- ac_prev=
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
--  if test -d "$krb4_prefix/include"; then
--    INCLUDES="$INCLUDES -I$krb4_prefix/include"
--  fi
--  if test -d "$krb4_prefix/lib"; then
--    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
--  if test -d "$krb5_prefix/include"; then
--    INCLUDES="$INCLUDES -I$krb5_prefix/include"
--  fi
--  if test -d "$krb5_prefix/lib"; then
--    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
--  if test -d "${openssl_prefix}/include" ; then
--    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
--  fi
--  if test -d "${openssl_prefix}/lib" ; then
--    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist
index 71e2578228eb..0fac964ea900 100644
--- a/databases/postgresql-devel/pkg-plist
+++ b/databases/postgresql-devel/pkg-plist
@@ -25,8 +25,9 @@ bin/pg_encoding
 include/postgresql/internal/libpq/pqcomm.h
 include/postgresql/internal/lib/dllist.h
 include/postgresql/internal/c.h
-include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/libpq-int.h
+include/postgresql/internal/port.h
+include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/pqexpbuffer.h
 @dirrm include/postgresql/internal/lib
 @dirrm include/postgresql/internal/libpq
@@ -447,8 +448,9 @@ lib/libecpg_compat.so
 %%SERVER%%share/postgresql/pg_hba.conf.sample
 %%SERVER%%share/postgresql/pg_ident.conf.sample
 %%SERVER%%share/postgresql/postgresql.conf.sample
-%%PGCRYPTO%%share/doc/postgresql/contrib/README.pgcrypto
-@unexec rmdir %D/share/doc/postgresql/contrib 2> /dev/null || true
+%%PGCRYPTO%%share/doc/postgresql-devel/contrib/README.pgcrypto
+@unexec rmdir %D/share/doc/postgresql-devel/contrib 2> /dev/null || true
+@unexec rmdir %D/share/doc/postgresql-devel 2> /dev/null || true
 @unexec rm -f %D/share/doc/postgresql/* 2>/dev/null || true
 @unexec rmdir %D/share/doc/postgresql 2> /dev/null || true
 %%PGCRYPTO%%share/postgresql/contrib/pgcrypto.sql