Ticket #29095: qdbm-paths.diff

files/Makefile.in.diff

@@ -1 @@
---- Makefile.in.orig    2010-12-24 12:14:33.000000000 +1100
-+++ Makefile.in 2010-12-24 12:14:59.000000000 +1100
+--- Makefile.in.orig    2010-08-04 12:14:34.000000000 -0500
++++ Makefile.in 2011-04-11 16:31:02.000000000 -0500
+@@ -52,19 +52,19 @@
+ # Building binaries
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++  @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 -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@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) $(LIBS)
++LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR)
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR)
+ 
+ 
+ 
 @@ -427,7 +427,7 @@
  
  

files/configure.in.diff

@@ +1 @@
+--- configure.in.orig   2007-12-22 02:29:12.000000000 -0600
++++ configure.in        2011-04-11 16:17:21.000000000 -0500
+@@ -20,14 +20,6 @@
+ LD="ld"
+ AR="ar"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+ 
+ 
+ 

Portfile

@@ -25 +25 @@
 
 depends_lib             port:libiconv port:zlib
 
-patchfiles              Makefile.in.diff
+patchfiles      Makefile.in.diff \
+                configure.in.diff
 
+use_autoreconf  yes
+
 configure.args  --mandir=${prefix}/share/man \
                 --datadir=${prefix}/share/doc \
                 --enable-pthread \
                 --enable-zlib --enable-iconv
 
-post-extract    {
-                                #configure
-                                reinplace "s|\$HOME|\${prefix}|g" \
-                                        ${worksrcpath}/configure
-                                # Makefile.in
-                                reinplace "s|\$(HOME)|\$(prefix)|g" \
-                                        ${worksrcpath}/Makefile.in
-                                }
-
 test.run yes
 
 platform macosx   {