Ticket #29095: qdbm-paths.diff

File qdbm-paths.diff, 3.0 KB (added by ryandesign (Ryan Carsten Schmidt), 14 years ago)

proposed patch

  • files/Makefile.in.diff

     
    1 --- Makefile.in.orig    2010-12-24 12:14:33.000000000 +1100
    2 +++ Makefile.in 2010-12-24 12:14:59.000000000 +1100
     1--- Makefile.in.orig    2010-08-04 12:14:34.000000000 -0500
     2+++ Makefile.in 2011-04-11 16:31:02.000000000 -0500
     3@@ -52,19 +52,19 @@
     4 # Building binaries
     5 CC = @CC@
     6 CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
     7-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
     8+  @MYDEFS@ \
     9   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
     10   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
     11   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
     12 CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
     13 LD = @LD@
     14 LIBS = -lqdbm @LIBS@
     15-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
     16-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
     17-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
     18+LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) @LIBS@
     19+LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) $(LIBS)
     20+LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR)
     21 AR = @AR@
     22 ARFLAGS = rcsv
     23-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
     24+RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR)
     25 
     26 
     27 
    328@@ -427,7 +427,7 @@
    429 
    530 
  • files/configure.in.diff

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

     
    2525
    2626depends_lib             port:libiconv port:zlib
    2727
    28 patchfiles              Makefile.in.diff
     28patchfiles      Makefile.in.diff \
     29                configure.in.diff
    2930
     31use_autoreconf  yes
     32
    3033configure.args  --mandir=${prefix}/share/man \
    3134                --datadir=${prefix}/share/doc \
    3235                --enable-pthread \
    3336                --enable-zlib --enable-iconv
    3437
    35 post-extract    {
    36                                 #configure
    37                                 reinplace "s|\$HOME|\${prefix}|g" \
    38                                         ${worksrcpath}/configure
    39                                 # Makefile.in
    40                                 reinplace "s|\$(HOME)|\$(prefix)|g" \
    41                                         ${worksrcpath}/Makefile.in
    42                                 }
    43 
    4438test.run yes
    4539
    4640platform macosx   {