diff options
author | grant <grant@pkgsrc.org> | 2003-10-11 12:06:04 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2003-10-11 12:06:04 +0000 |
commit | d554d28831ce30a4969a0869ef6b7540cb18c493 (patch) | |
tree | 8db3dcefec45d861daa450c8d1b960e4e78830a6 | |
parent | e2838ca8357c85f308751fcdf153a7d42cd7324e (diff) | |
download | pkgsrc-d554d28831ce30a4969a0869ef6b7540cb18c493.tar.gz |
comment block which uses non-existant variable (because we don't need
the supplied db2).
fixes PR pkg/22912 from Jonathan Perkin.
-rw-r--r-- | security/pks/distinfo | 4 | ||||
-rw-r--r-- | security/pks/patches/patch-aa | 31 |
2 files changed, 19 insertions, 16 deletions
diff --git a/security/pks/distinfo b/security/pks/distinfo index fb168ed5836..9563f937f7f 100644 --- a/security/pks/distinfo +++ b/security/pks/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:40:37 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/10/11 12:06:04 grant Exp $ SHA1 (pks-0.9.4.tar.gz) = 07ab106fc77182187019343843f4f63464b7ac26 Size (pks-0.9.4.tar.gz) = 509043 bytes @@ -6,7 +6,7 @@ SHA1 (pks094-patch2) = 8b46fd91a21dce27d4d6dc0a7ad066e928470c39 Size (pks094-patch2) = 52843 bytes SHA1 (pks094-patch3) = 06849efc45f8c36708057a15c893c5694adc9278 Size (pks094-patch3) = 11120 bytes -SHA1 (patch-aa) = e93eb32936f324f980e32d8bf7d38fbbd94447de +SHA1 (patch-aa) = 4fade73ba6268cf5112b897475a9fb0d95ad8da1 SHA1 (patch-ab) = 2a6918f4e0620090d733147bdd093b370065dce1 SHA1 (patch-ac) = 9d214cfb14ab7790b768ac4e7a184b3a4a09c6c0 SHA1 (patch-ad) = 7f82a8277d8c958ec2791e0ad1dcafa67971b4ff diff --git a/security/pks/patches/patch-aa b/security/pks/patches/patch-aa index 7c253a14d9a..9bdd2ead5c8 100644 --- a/security/pks/patches/patch-aa +++ b/security/pks/patches/patch-aa @@ -1,21 +1,24 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2003/10/11 12:06:04 grant Exp $ ---- Makefile.in.orig Thu Jul 27 11:11:28 2000 -+++ Makefile.in Thu Jul 27 11:24:02 2000 -@@ -9,9 +9,9 @@ - SHELL = /bin/sh +--- Makefile.in.orig 2003-10-11 21:56:03.000000000 +1000 ++++ Makefile.in +@@ -10,10 +10,11 @@ SHELL = /bin/sh ## this does recursion for db2, if it's in the tree -- + -SUBDIRS = db2-sleepycat/dist - +-depend all install check clean distclean maintainer-clean:: +- for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done ++# We use the installed db2, so we don't need this stuff anymore ++#SUBDIRS = db2-sleepycat/dist +# -+# We use the installed db2, so we don't need this line anymore -+# - depend all install check clean distclean maintainer-clean:: - for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done ++#depend all install check clean distclean maintainer-clean:: ++# for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done + + ## this builds the keyserver -@@ -32,12 +32,13 @@ +@@ -32,12 +33,13 @@ all:: $(ALL) $(SYSCONF) all-pure:: $(ALL_PURE) all-utils:: $(UTILS) @@ -32,7 +35,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $ SOCKLIBS = @LIBS@ VPATH = @srcdir@ -@@ -60,7 +61,7 @@ +@@ -60,7 +62,7 @@ DBG = -DDEBUG DEFINES = $(DBG) @DEFS@ CFLAGS = @gcc_cflags@ -g -O $(INCLUDES) $(DEFINES) @@ -41,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $ CLEAN = rm -f -@@ -118,6 +119,8 @@ +@@ -118,6 +120,8 @@ wwwtest: $(O9) pgpdump: pgpdump.o pgpfile.o $(PGPOBJS) $(UTILOBJS) pgpsplit: pgpsplit.o $(PGPOBJS) $(UTILOBJS) @@ -50,7 +53,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $ kvcv: kvcv.o pgpfile.o logging.o $(PGPOBJS) $(UTILOBJS) -@@ -138,7 +141,7 @@ +@@ -138,7 +142,7 @@ installdirs:: install:: all installdirs for f in $(ALL); do $(INSTALL_PROGRAM) $$f $(bindir); done for f in $(SYSCONF); do $(INSTALL_DATA) $$f $(sysconfdir); done |