diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql-devel/Makefile | 16 | ||||
| -rw-r--r-- | databases/postgresql-devel/distinfo | 2 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/patch-configure | 10 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/patch-contrib::pgcrypto::Makefile | 20 | ||||
| -rw-r--r-- | databases/postgresql-devel/pkg-plist | 21 |
5 files changed, 61 insertions, 8 deletions
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index b448e12d6583..185982a95508 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.4.2003.05.06 +PORTVERSION?= 7.4.2003.05.08 CATEGORIES?= databases MASTER_SITES= http://freebsd.sean.chittenden.org/ports/ \ http://people.freebsd.org/~seanc/ports/ @@ -34,7 +34,7 @@ INSTALLS_SHLIB= YES BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison1875 CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ - --with-docdir=${LOCALBASE}/share/doc/$PORTNAME}${PKGNAMESUFFIX} + --with-docdir=${LOCALBASE}/share/doc/${PORTNAME}${PKGNAMESUFFIX} .if !defined(WITHOUT_GNUGETOPT) LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt @@ -60,6 +60,12 @@ INSTALL_TARGET= install INSTALL_TARGET= install-strip .endif +.if !defined(WITHOUT_PGCRYPTO) +PLIST_SUB+= PGCRYPTO="" +.else +PLIST_SUB+= PGCRYPTO="@comment " +.endif + .if !defined(WITHOUT_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}" @@ -110,7 +116,7 @@ pre-everything:: @${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_PGCRYPTO Builds and installs pgcrypto" + @${ECHO} " WITHOUT_PGCRYPTO Builds without pgcrypto support" @${ECHO} " WITH_DEBUG Builds with debugging symbols" @${ECHO} "" .if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) @@ -130,7 +136,7 @@ pre-everything:: @exit 1 .endif -.if defined(WITH_PGCRYPTO) +.if !defined(WITHOUT_PGCRYPTO) post-build: ${GMAKE} -C ${WRKSRC}/contrib/pgcrypto .endif @@ -148,7 +154,7 @@ pre-install: .endif post-install: -.if defined(WITH_PGCRYPTO) +.if !defined(WITHOUT_PGCRYPTO) ${GMAKE} -C ${WRKSRC}/contrib/pgcrypto install .endif @ ${MKDIR} ${PREFIX}/share/postgresql ;\ diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo index df9748976044..5dff3fe0296a 100644 --- a/databases/postgresql-devel/distinfo +++ b/databases/postgresql-devel/distinfo @@ -1 +1 @@ -MD5 (postgresql/postgresql-7.4.2003.05.06.tar.bz2) = 4c5e17e55ad506854f6c26f3b071e2fd +MD5 (postgresql/postgresql-7.4.2003.05.08.tar.bz2) = bfd840b0db64912e88b978a0ba6a4ee4 diff --git a/databases/postgresql-devel/files/patch-configure b/databases/postgresql-devel/files/patch-configure index efeca517d300..cbf298f1a612 100644 --- a/databases/postgresql-devel/files/patch-configure +++ b/databases/postgresql-devel/files/patch-configure @@ -1,5 +1,15 @@ --- 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 diff --git a/databases/postgresql-devel/files/patch-contrib::pgcrypto::Makefile b/databases/postgresql-devel/files/patch-contrib::pgcrypto::Makefile new file mode 100644 index 000000000000..66112d5d50a9 --- /dev/null +++ b/databases/postgresql-devel/files/patch-contrib::pgcrypto::Makefile @@ -0,0 +1,20 @@ +--- contrib/pgcrypto/Makefile.orig Thu May 8 16:09:28 2003 ++++ contrib/pgcrypto/Makefile Thu May 8 16:12:47 2003 +@@ -7,7 +7,7 @@ + include $(top_builddir)/src/Makefile.global + + # either 'builtin', 'mhash', 'openssl' +-cryptolib = builtin ++cryptolib = openssl + + # either 'builtin', 'system' + cryptsrc = builtin +@@ -21,7 +21,7 @@ + # This works ofcouse only with cryptolib = openssl + # + # 'silly' - use libc random() - very weak +-random = silly ++random = dev + random_dev = \"/dev/urandom\" + + ########################## diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist index 816c6760b2e0..e1bd78eec380 100644 --- a/databases/postgresql-devel/pkg-plist +++ b/databases/postgresql-devel/pkg-plist @@ -151,6 +151,7 @@ include/postgresql/server/executor/nodeTidscan.h include/postgresql/server/executor/nodeUnique.h include/postgresql/server/executor/spi.h include/postgresql/server/executor/spi_priv.h +include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h include/postgresql/server/lib/dllist.h include/postgresql/server/lib/lispsort.h @@ -163,7 +164,6 @@ include/postgresql/server/libpq/ip.h include/postgresql/server/libpq/libpq-be.h include/postgresql/server/libpq/libpq-fs.h include/postgresql/server/libpq/libpq.h -include/postgresql/server/libpq/password.h include/postgresql/server/libpq/pqcomm.h include/postgresql/server/libpq/pqformat.h include/postgresql/server/libpq/pqsignal.h @@ -224,6 +224,7 @@ include/postgresql/server/parser/scansup.h include/postgresql/server/port/aix.h include/postgresql/server/port/beos.h include/postgresql/server/port/bsdi.h +include/postgresql/server/port/cygwin.h include/postgresql/server/port/darwin.h include/postgresql/server/port/dgux.h include/postgresql/server/port/freebsd.h @@ -273,7 +274,6 @@ include/postgresql/server/storage/lmgr.h include/postgresql/server/storage/lock.h include/postgresql/server/storage/lwlock.h include/postgresql/server/storage/off.h -include/postgresql/server/storage/page.h include/postgresql/server/storage/pg_sema.h include/postgresql/server/storage/pg_shmem.h include/postgresql/server/storage/pmsignal.h @@ -340,8 +340,10 @@ include/postgresql/server/c.h include/postgresql/server/dynloader.h include/postgresql/server/fmgr.h include/postgresql/server/funcapi.h +include/postgresql/server/getaddrinfo.h include/postgresql/server/getopt_long.h include/postgresql/server/miscadmin.h +include/postgresql/server/pg_config_manual.h include/postgresql/server/pgstat.h include/postgresql/server/postgres.h include/postgresql/server/postgres_ext.h @@ -373,9 +375,12 @@ include/pg_config_os.h include/libpq/libpq-fs.h @dirrm include/libpq include/libpq-fe.h +include/ecpg_informix.h include/ecpgerrno.h include/ecpglib.h include/ecpgtype.h +include/pgtypes_error.h +include/pgtypes_numeric.h include/sqlca.h include/sql3types.h lib/libpq.so @@ -384,6 +389,13 @@ lib/libpq.so.3 lib/libecpg.so lib/libecpg.a lib/libecpg.so.3 +lib/libpgtypes.so +lib/libpgtypes.a +lib/libpgtypes.so.1 +lib/libecpg_compat.a +lib/libecpg_compat.so.1 +lib/libecpg_compat.so +%%PGCRYPTO%%lib/postgresql/pgcrypto.so %%SERVER%%lib/postgresql/plpgsql.so %%SERVER%%lib/postgresql/ascii_and_mic.so %%SERVER%%lib/postgresql/cyrillic_and_mic.so @@ -422,6 +434,11 @@ lib/libecpg.so.3 %%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 +@unexec rmdir %D/share/doc/postgresql 2> /dev/null || true +%%PGCRYPTO%%share/postgresql/contrib/pgcrypto.sql +@unexec rmdir %D/share/postgresql/contrib 2> /dev/null || true share/postgresql/post-install-notes @unexec rmdir %D/share/postgresql 2>/dev/null || true @unexec rmdir %D/pgsql 2>/dev/null || true |