Prevent the port from hardcoding its own CFLAGS/CXXFLAGS.

This should fix the build with clang 3.4, which refuses to accept options
such as -fforce-addr and -fno-force-addr.

While here, update the port's website in pkg-descr as well.

MFH:		2014Q2

5 files changed, 51 insertions, 10 deletions

diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index a129f06ab27f..b1e77ac4e908 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/qdbm/
 
@@ -12,6 +13,7 @@ COMMENT?=	Quick Database Manager
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+CFLAGS+=	-fPIC
 
 .if !defined(SLAVEPORT)
 USES+=		iconv
diff --git a/databases/qdbm/files/patch-Makefile.in b/databases/qdbm/files/patch-Makefile.in
index 3131ea46cb2c..e6322eb12af3 100644
--- a/databases/qdbm/files/patch-Makefile.in
+++ b/databases/qdbm/files/patch-Makefile.in
@@ -1,11 +1,30 @@
---- Makefile.in.orig    Wed Feb 21 16:44:56 2007
-+++ Makefile.in Sun Jul  8 18:19:52 2007
-@@ -169,8 +169,10 @@
-	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
-	mkdir -p $(DESTDIR)$(MYMAN3DIR)
-	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
+--- Makefile.in.orig	2010-08-04 20:14:34.000000000 +0300
++++ Makefile.in	2014-05-03 18:41:01.000000000 +0300
+@@ -46,7 +46,7 @@
+ MYMAN1DIR = @mandir@/man1
+ MYMAN3DIR = @mandir@/man3
+ MYDATADIR = @datadir@/$(PACKAGE)
+-MYPCDIR = @libdir@/pkgconfig
++MYPCDIR = /usr/local/libdata/pkgconfig
+ DESTDIR =
+ 
+ # Building binaries
+@@ -56,7 +56,6 @@
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+@@ -170,8 +169,10 @@
+ 	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
+ 	mkdir -p $(DESTDIR)$(MYMAN3DIR)
+ 	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
 +.if $(MYDOCS) != ""
-	mkdir -p $(DESTDIR)$(MYDATADIR)
-	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
+ 	mkdir -p $(DESTDIR)$(MYDATADIR)
+ 	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
 +.endif
-	mkdir -p $(DESTDIR)$(MYPCDIR)
+ 	mkdir -p $(DESTDIR)$(MYPCDIR)
+ 	cd $(srcdir) && cp -Rf $(MYPCS) $(DESTDIR)$(MYPCDIR)
+ 	@printf '\n'
diff --git a/databases/qdbm/files/patch-java__Makefile.in b/databases/qdbm/files/patch-java__Makefile.in
new file mode 100644
index 000000000000..82ec1027b52a
--- /dev/null
+++ b/databases/qdbm/files/patch-java__Makefile.in
@@ -0,0 +1,10 @@
+--- java/Makefile.in.orig	2014-05-03 18:41:15.000000000 +0300
++++ java/Makefile.in	2014-05-03 18:41:21.000000000 +0300
+@@ -56,7 +56,6 @@
+   @MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
diff --git a/databases/qdbm/files/patch-plus__Makefile.in b/databases/qdbm/files/patch-plus__Makefile.in
new file mode 100644
index 000000000000..35e31fe36e35
--- /dev/null
+++ b/databases/qdbm/files/patch-plus__Makefile.in
@@ -0,0 +1,10 @@
+--- plus/Makefile.in.orig	2014-05-03 18:41:29.000000000 +0300
++++ plus/Makefile.in	2014-05-03 18:41:32.000000000 +0300
+@@ -44,7 +44,6 @@
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
diff --git a/databases/qdbm/pkg-descr b/databases/qdbm/pkg-descr
index d372016a30cc..62bc13537e26 100644
--- a/databases/qdbm/pkg-descr
+++ b/databases/qdbm/pkg-descr
@@ -5,4 +5,4 @@ Both binary data and character string can be used as a key and a
 value.  There is neither concept of data tables nor data types.
 Records are organized in hash table or B+ tree.
 
-WWW: http://qdbm.sourceforge.net/
+WWW: http://fallabs.com/qdbm/