diff options
author | minskim <minskim@pkgsrc.org> | 2006-03-08 23:06:40 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2006-03-08 23:06:40 +0000 |
commit | 3f2d2088d3cda1d0fa70f31676924d6d63802d25 (patch) | |
tree | 5579cffd5fbc2d5f23def2ba9e10751496216831 /security/zebedee | |
parent | 19b9a79c1886b2cbc4d39f4591487d60e752453c (diff) | |
download | pkgsrc-3f2d2088d3cda1d0fa70f31676924d6d63802d25.tar.gz |
Patch general variables instead of OS-specific ones, to build on more
platforms.
Diffstat (limited to 'security/zebedee')
-rw-r--r-- | security/zebedee/distinfo | 4 | ||||
-rw-r--r-- | security/zebedee/patches/patch-aa | 38 |
2 files changed, 28 insertions, 14 deletions
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index f8929a1b1d4..d5d9a237cb0 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2006/01/19 23:58:28 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/03/08 23:06:40 minskim Exp $ SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 Size (zebedee-2.5.3.tar.gz) = 176088 bytes -SHA1 (patch-aa) = 180c56db297d1e10092d8c3621363b1979ac672f +SHA1 (patch-aa) = 5ab4c410cc372c1eb1e56f90ff92386b92454b40 SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa index e07439be4a7..94a3fba77bf 100644 --- a/security/zebedee/patches/patch-aa +++ b/security/zebedee/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2006/01/19 23:58:28 joerg Exp $ +$NetBSD: patch-aa,v 1.8 2006/03/08 23:06:40 minskim Exp $ ---- Makefile.orig 2005-09-06 05:59:53.000000000 +0000 +--- Makefile.orig 2005-09-05 22:59:53.000000000 -0700 +++ Makefile @@ -20,7 +20,9 @@ CC_win32 = gcc -mno-cygwin CC_linux = gcc -pthread @@ -28,14 +28,14 @@ $NetBSD: patch-aa,v 1.7 2006/01/19 23:58:28 joerg Exp $ -BFINC = -I../blowfish-0.9.5a -BFLIB = ../blowfish-0.9.5a/libblowfish.a +BFINC = -+BFLIB = ++BFLIB = -lcrypto # Location of zlib include and library -ZINC = -I../zlib-1.2.3 -ZLIB = ../zlib-1.2.3/libz.a +ZINC = -+ZLIB = ++ZLIB = -lz # Location of bzlib include and library # Set these empty if you don't want bzib2 support @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/19 23:58:28 joerg Exp $ -BZINC = -I../bzip2-1.0.3 -BZLIB = ../bzip2-1.0.3/libbz2.a +BZINC = -+BZLIB = ++BZLIB = -lbz2 # # Tools needed for Perl "POD"-format documentation conversion. @@ -83,15 +83,29 @@ $NetBSD: patch-aa,v 1.7 2006/01/19 23:58:28 joerg Exp $ # Suffix for executables -@@ -167,6 +172,8 @@ OSLIBS_linux = -lpthread +@@ -163,14 +168,16 @@ EXE = $(EXE_$(OS)) + # Extra OS-specific libraries + + OSLIBS_win32 = -lwsock32 -lwinmm +-OSLIBS_linux = -lpthread ++OSLIBS_linux = OSLIBS_linux64 = $(OSLIBS_linux) - OSLIBS_solaris = -lsocket -lnsl -lthread +-OSLIBS_solaris = -lsocket -lnsl -lthread ++OSLIBS_solaris = -lsocket -lnsl OSLIBS_freebsd = -+OSLIBS_dragonfly = -lcrypto -lbz2 -lz -+OSLIBS_netbsd = -lcrypto -lbz2 -lz - OSLIBS_tru64 = -lpthread - OSLIBS_irix = -lpthread - OSLIBS_hpux = -lpthread -lnsl +-OSLIBS_tru64 = -lpthread +-OSLIBS_irix = -lpthread +-OSLIBS_hpux = -lpthread -lnsl +-OSLIBS_macosx = -lpthread ++OSLIBS_dragonfly = ++OSLIBS_netbsd = ++OSLIBS_tru64 = ++OSLIBS_irix = ++OSLIBS_hpux = -lnsl ++OSLIBS_macosx = + OSLIBS_bsdi = + OSLIBS = $(OSLIBS_$(OS)) + @@ -186,9 +193,10 @@ SERVICEOBJ = $(SERVICEOBJ_$(OS)) #### You REALLY shouldn't have to modify anything beyond here ... #### |