summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-05-22 07:30:14 +0000
committerwiz <wiz@pkgsrc.org>2003-05-22 07:30:14 +0000
commit075e7d52b286b7c7caae3484e225feb3c6de68ad (patch)
treec938df9ef09f7ac06cbbeee2bcd2bb53d4bf7254
parentb2b7803e3df51923b2e9c9637aee642ad94867b0 (diff)
downloadpkgsrc-075e7d52b286b7c7caae3484e225feb3c6de68ad.tar.gz
s/make/${MAKE}/; make Makefiles more portable.
From Jeremy C. Reed in PR 20843.
-rw-r--r--security/libcrack/distinfo6
-rw-r--r--security/libcrack/patches/patch-aa28
-rw-r--r--security/libcrack/patches/patch-ab10
3 files changed, 33 insertions, 11 deletions
diff --git a/security/libcrack/distinfo b/security/libcrack/distinfo
index 8daeb24882f..1b0cc5f55a9 100644
--- a/security/libcrack/distinfo
+++ b/security/libcrack/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/05/22 07:30:14 wiz Exp $
SHA1 (cracklib,2.7.tgz) = 393688e84fbf12b8359f02564211e89ac5be8b68
Size (cracklib,2.7.tgz) = 20901 bytes
-SHA1 (patch-aa) = 0ccb894dda9faf909b2886aead03f7d15dcb149a
-SHA1 (patch-ab) = d0cd8a2800a50e14825c83d64f311386feecec8a
+SHA1 (patch-aa) = 7994e065579da1b535c0d09871a66f55fd3109f1
+SHA1 (patch-ab) = 0240dd8ca90884aaf46cf3e4451b14b3fa900cb8
SHA1 (patch-ac) = 49bdc2e1b15486edbcb150d78362c0a748d653da
diff --git a/security/libcrack/patches/patch-aa b/security/libcrack/patches/patch-aa
index 20db843bda5..7b8af6124ae 100644
--- a/security/libcrack/patches/patch-aa
+++ b/security/libcrack/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/21 09:26:21 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/22 07:30:15 wiz Exp $
---- Makefile.orig Wed Dec 31 11:33:53 1997
-+++ Makefile
+--- Makefile.orig Wed Dec 31 02:33:53 1997
++++ Makefile Tue Mar 25 15:14:02 2003
@@ -9,12 +9,12 @@
###
# set this to the absolute path (less extn) of compressed dict.
@@ -17,3 +17,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/10/21 09:26:21 rh Exp $
###
# If you have installed the cracklib-dicts directory, use this
+@@ -24,15 +24,15 @@
+ @echo "you evidently don't know what you're doing. go read the README"
+
+ all:
+- ( cd cracklib && make && exit $$? )
+- ( cd util && make DICTPATH=$(DICTPATH) && exit $$? )
+-### ( cd passwd && make DICTPATH=$(DICTPATH) passwd && exit $$? )
++ ( cd cracklib && $(MAKE) && exit $$? )
++ ( cd util && $(MAKE) DICTPATH=$(DICTPATH) && exit $$? )
++### ( cd passwd && $(MAKE) DICTPATH=$(DICTPATH) passwd && exit $$? )
+ ### touch all
+
+ clean:
+- -( cd cracklib && make clean && exit $$? )
+- -( cd util && make clean && exit $$? )
+-### -( cd passwd && make clean && exit $$? )
++ -( cd cracklib && $(MAKE) clean && exit $$? )
++ -( cd util && $(MAKE) clean && exit $$? )
++### -( cd passwd && $(MAKE) clean && exit $$? )
+ -rm -f all installed Part* *.BAK *.bak *~
+
+ install: all
diff --git a/security/libcrack/patches/patch-ab b/security/libcrack/patches/patch-ab
index 58c3e1f62c9..cf47032cb0e 100644
--- a/security/libcrack/patches/patch-ab
+++ b/security/libcrack/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/21 09:26:21 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/22 07:30:15 wiz Exp $
---- cracklib/Makefile.orig Sun Dec 14 23:49:21 1997
-+++ cracklib/Makefile
+--- cracklib/Makefile.orig Sun Dec 14 14:49:21 1997
++++ cracklib/Makefile Mon Mar 24 19:18:40 2003
@@ -7,12 +7,16 @@
###
@@ -17,10 +17,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/10/21 09:26:21 rh Exp $
+all: ${LIB}
+
+.c.o:
-+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${.IMPSRC} -c -o ${.TARGET}
++ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $< -c -o ${.TARGET}
+
+${LIB}: ${OBJS}
-+ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7
++ ${LIBTOOL} --mode=link ${CC} -o ${@:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:7
clean:
-rm -f $(OBJ) $(LIB) *~