From fe509f61353569140a4072e080f9b16e8260fa54 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 2 Jan 2006 18:08:35 +0000 Subject: Add DragonFly support. --- databases/odbc-postgresql/Makefile | 24 +++++++++++++++++++++++- databases/odbc-postgresql/distinfo | 5 +++-- databases/odbc-postgresql/patches/patch-aa | 16 ++++++++++++++++ databases/odbc-postgresql/patches/patch-ac | 30 +++++++++++++++++++++++------- 4 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 databases/odbc-postgresql/patches/patch-aa (limited to 'databases/odbc-postgresql') diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile index cd65ee00c00..7151054310d 100644 --- a/databases/odbc-postgresql/Makefile +++ b/databases/odbc-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:04 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2006/01/02 18:08:35 joerg Exp $ .include "Makefile.common" @@ -7,4 +7,26 @@ COMMENT= ODBC interface to PostgreSQL CONFIGURE_ARGS+= --with-odbcinst=${PKG_SYSCONFDIR:Q} +post-extract: + if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \ + fi + if [ -d ${WRKSRC}/src/template ]; then \ + ${TOUCH} ${WRKSRC}/src/template/dragonfly; \ + fi + if [ -d ${WRKSRC}/src/include/port ]; then \ + ${CP} ${WRKSRC}/src/include/port/freebsd.h \ + ${WRKSRC}/src/include/port/dragonfly.h; \ + fi + if [ -d ${WRKSRC}/src/makefiles ]; then \ + ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ + ${WRKSRC}/src/makefiles/Makefile.dragonfly; \ + fi + + .include "../../mk/bsd.pkg.mk" diff --git a/databases/odbc-postgresql/distinfo b/databases/odbc-postgresql/distinfo index 55ffb9d2811..27d96c48993 100644 --- a/databases/odbc-postgresql/distinfo +++ b/databases/odbc-postgresql/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 16:33:07 agc Exp $ +$NetBSD: distinfo,v 1.7 2006/01/02 18:08:35 joerg Exp $ SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791 RMD160 (postgresql-7.2.3.tar.gz) = 5a99a763bb00d7f36dd606ed4b73e17a1a74487b Size (postgresql-7.2.3.tar.gz) = 9244039 bytes +SHA1 (patch-aa) = 31f73fec94a37386362be7587163cd9650a853ca SHA1 (patch-ab) = 631ff6e24af142ebbb14bb19e61108af9db698d7 -SHA1 (patch-ac) = 8e3556f9a513bf6d5f0099b0e43f55dc73870606 +SHA1 (patch-ac) = 2a30450035f310b293e13bf5db94f725859b86de diff --git a/databases/odbc-postgresql/patches/patch-aa b/databases/odbc-postgresql/patches/patch-aa new file mode 100644 index 00000000000..f61f8b05601 --- /dev/null +++ b/databases/odbc-postgresql/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.3 2006/01/02 18:08:35 joerg Exp $ + +--- src/Makefile.shlib.orig 2001-11-11 19:20:53.000000000 +0000 ++++ src/Makefile.shlib +@@ -137,6 +137,11 @@ ifeq ($(PORTNAME), bsdi) + endif + endif + ++ifeq ($(PORTNAME), dragonfly) ++ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ++ LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) ++endif ++ + ifeq ($(PORTNAME), freebsd) + ifdef ELF_SYSTEM + shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) diff --git a/databases/odbc-postgresql/patches/patch-ac b/databases/odbc-postgresql/patches/patch-ac index d3e2641f669..2b647dc41f4 100644 --- a/databases/odbc-postgresql/patches/patch-ac +++ b/databases/odbc-postgresql/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2006/01/02 18:08:35 joerg Exp $ ---- configure.orig Mon Sep 30 23:34:27 2002 +--- configure.orig 2002-10-01 03:34:27.000000000 +0000 +++ configure @@ -19,6 +19,8 @@ ac_help="$ac_help ac_help="$ac_help @@ -20,7 +20,15 @@ $NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ --with-java build JDBC interface and Java tools" ac_help="$ac_help --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -817,6 +821,32 @@ fi +@@ -694,6 +698,7 @@ case $host_os in + darwin*) template=darwin ;; + dgux*) template=dgux ;; + freebsd*) template=freebsd ;; ++dragonfly*) template=dragonfly ;; + hpux*) template=hpux ;; + irix*) template=irix5 ;; + linux*) template=linux ;; +@@ -817,6 +822,32 @@ fi # @@ -53,7 +61,7 @@ $NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -@@ -1859,6 +1889,35 @@ fi +@@ -1859,6 +1890,35 @@ fi echo "$ac_t""$with_python" 1>&6 @@ -89,7 +97,15 @@ $NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ # # Optionally build the Java/JDBC tools # -@@ -3282,9 +3341,10 @@ fi +@@ -2287,6 +2347,7 @@ fi + case $host_os in + freebsd1*|freebsd2*) elf=no;; + freebsd3*|freebsd4*) elf=yes;; ++ dragonfly*) elf=yes;; + esac + + cat > conftest.$ac_ext <&6 -@@ -3408,6 +3468,7 @@ EOF +@@ -3408,6 +3470,7 @@ EOF else : fi @@ -109,7 +125,7 @@ $NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then -@@ -9007,6 +9068,7 @@ s%@with_tcl@%$with_tcl%g +@@ -9007,6 +9070,7 @@ s%@with_tcl@%$with_tcl%g s%@with_tk@%$with_tk%g s%@with_perl@%$with_perl%g s%@with_python@%$with_python%g -- cgit v1.2.3