pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/libcrack PKG_DESTDIR_SUPPORT=user-destdir



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d1eacb5056d
branches:  trunk
changeset: 568320:5d1eacb5056d
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 10 23:30:53 2009 +0000

description:
PKG_DESTDIR_SUPPORT=user-destdir

diffstat:

 security/libcrack/Makefile         |  15 ++++++++-------
 security/libcrack/distinfo         |   8 ++++----
 security/libcrack/patches/patch-aa |  19 ++++++++++++-------
 security/libcrack/patches/patch-ab |   6 +++---
 security/libcrack/patches/patch-ac |   4 ++--
 5 files changed, 29 insertions(+), 23 deletions(-)

diffs (127 lines):

diff -r 4983b1164c10 -r 5d1eacb5056d security/libcrack/Makefile
--- a/security/libcrack/Makefile        Thu Dec 10 22:00:24 2009 +0000
+++ b/security/libcrack/Makefile        Thu Dec 10 23:30:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/10/28 18:50:53 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2009/12/10 23:30:53 abs Exp $
 #
 
 DISTNAME=      cracklib,2.7
@@ -12,21 +12,22 @@
 COMMENT=       Password checking library
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=user-destdir
 
 USE_LIBTOOL=   YES
 
 INSTALLATION_DIRS=     bin include/cracklib lib libdata
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/cracklib
-       ${INSTALL_DATA} ${FILESDIR}/crack.h ${PREFIX}/include/cracklib
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/cracklib
+       ${INSTALL_DATA} ${FILESDIR}/crack.h ${DESTDIR}${PREFIX}/include/cracklib
        cd ${WRKSRC}/cracklib &&                                        \
-       ${LIBTOOL} --mode=install ${INSTALL_DATA} libcrack.la ${PREFIX}/lib && \
-       ${INSTALL_DATA} packer.h ${PREFIX}/include/cracklib
-       ${INSTALL_SCRIPT} ${WRKSRC}/util/mkdict ${PREFIX}/bin/libcrack_mkdict
+       ${LIBTOOL} --mode=install ${INSTALL_DATA} libcrack.la ${DESTDIR}${PREFIX}/lib && \
+       ${INSTALL_DATA} packer.h ${DESTDIR}${PREFIX}/include/cracklib
+       ${INSTALL_SCRIPT} ${WRKSRC}/util/mkdict ${DESTDIR}${PREFIX}/bin/libcrack_mkdict
 .for util in packer testlib testnum teststr unpacker
        cd ${WRKSRC}/util &&                                            \
-       ${INSTALL_PROGRAM} ${util} ${PREFIX}/bin/libcrack_${util}
+       ${INSTALL_PROGRAM} ${util} ${DESTDIR}${PREFIX}/bin/libcrack_${util}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 4983b1164c10 -r 5d1eacb5056d security/libcrack/distinfo
--- a/security/libcrack/distinfo        Thu Dec 10 22:00:24 2009 +0000
+++ b/security/libcrack/distinfo        Thu Dec 10 23:30:53 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/10/28 18:50:53 drochner Exp $
+$NetBSD: distinfo,v 1.6 2009/12/10 23:30:53 abs Exp $
 
 SHA1 (cracklib,2.7.tar.gz) = 903bb7e2400c7e486f432aab026dd6584815d2c1
 RMD160 (cracklib,2.7.tar.gz) = 8c1710580ed5778f54d30b709cac0b4b07543aed
 Size (cracklib,2.7.tar.gz) = 21059 bytes
-SHA1 (patch-aa) = 7994e065579da1b535c0d09871a66f55fd3109f1
-SHA1 (patch-ab) = 0240dd8ca90884aaf46cf3e4451b14b3fa900cb8
-SHA1 (patch-ac) = 49bdc2e1b15486edbcb150d78362c0a748d653da
+SHA1 (patch-aa) = 8119a733f4bdb0a5a41e41ab53e9923564a70855
+SHA1 (patch-ab) = b9a0b5929936a1335f08cab93710bbe66c74183d
+SHA1 (patch-ac) = 43031370c2bb08c7b43c6afad0fabe8060ac66b3
diff -r 4983b1164c10 -r 5d1eacb5056d security/libcrack/patches/patch-aa
--- a/security/libcrack/patches/patch-aa        Thu Dec 10 22:00:24 2009 +0000
+++ b/security/libcrack/patches/patch-aa        Thu Dec 10 23:30:53 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2003/05/22 07:30:15 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/12/10 23:30:53 abs Exp $
 
---- Makefile.orig      Wed Dec 31 02:33:53 1997
-+++ Makefile   Tue Mar 25 15:14:02 2003
+--- Makefile.orig      1997-12-31 10:33:53.000000000 +0000
++++ Makefile
 @@ -9,12 +9,12 @@
  ###
  # set this to the absolute path (less extn) of compressed dict.
@@ -17,9 +17,9 @@
  
  ###
  # If you have installed the cracklib-dicts directory, use this
-@@ -24,15 +24,15 @@
+@@ -24,19 +24,19 @@ default:
        @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 $$? )
@@ -28,7 +28,7 @@
 +      ( 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 $$? )
@@ -37,5 +37,10 @@
 +      -( cd util && $(MAKE) clean && exit $$? )
 +###   -( cd passwd && $(MAKE) clean && exit $$? )
        -rm -f all installed Part* *.BAK *.bak *~
-
+ 
  install: all
+       @echo 'if "sort" dies from lack of space, see "util/mkdict"'
+-      util/mkdict $(SRCDICTS) | util/packer $(DICTPATH)
++      util/mkdict $(SRCDICTS) | util/packer $(DESTDIR)$(DICTPATH)
+       touch installed
+ ###   @echo 'now go install passwd/passwd where you want it'
diff -r 4983b1164c10 -r 5d1eacb5056d security/libcrack/patches/patch-ab
--- a/security/libcrack/patches/patch-ab        Thu Dec 10 22:00:24 2009 +0000
+++ b/security/libcrack/patches/patch-ab        Thu Dec 10 23:30:53 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2003/05/22 07:30:15 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2009/12/10 23:30:53 abs Exp $
 
---- cracklib/Makefile.orig     Sun Dec 14 14:49:21 1997
-+++ cracklib/Makefile  Mon Mar 24 19:18:40 2003
+--- cracklib/Makefile.orig     1997-12-14 22:49:21.000000000 +0000
++++ cracklib/Makefile
 @@ -7,12 +7,16 @@
  ###
  
diff -r 4983b1164c10 -r 5d1eacb5056d security/libcrack/patches/patch-ac
--- a/security/libcrack/patches/patch-ac        Thu Dec 10 22:00:24 2009 +0000
+++ b/security/libcrack/patches/patch-ac        Thu Dec 10 23:30:53 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/10/21 09:26:21 rh Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/10 23:30:53 abs Exp $
 
---- util/Makefile.orig Sun Dec 14 23:49:34 1997
+--- util/Makefile.orig 1997-12-14 22:49:34.000000000 +0000
 +++ util/Makefile
 @@ -14,26 +14,26 @@
  #SunOS users (and others?) should consider static linking of their passwd binary



Home | Main Index | Thread Index | Old Index