diff options
Diffstat (limited to 'security/mit-krb5')
-rw-r--r-- | security/mit-krb5/Makefile | 5 | ||||
-rw-r--r-- | security/mit-krb5/distinfo | 8 | ||||
-rw-r--r-- | security/mit-krb5/patches/patch-ab | 6 | ||||
-rw-r--r-- | security/mit-krb5/patches/patch-ac | 6 | ||||
-rw-r--r-- | security/mit-krb5/patches/patch-ad | 34 |
5 files changed, 27 insertions, 32 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 53d0cd9ec72..704c63cfee4 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/02/24 19:07:51 tez Exp $ +# $NetBSD: Makefile,v 1.48 2010/03/26 21:44:59 joerg Exp $ DISTNAME= krb5-1.4.2 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -12,6 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://web.mit.edu/kerberos/www/ COMMENT= MIT Kerberos 5 authentication system +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/${DISTNAME}/src @@ -155,7 +156,7 @@ pre-configure: post-install: cd ${WRKSRC}/../doc; for f in *.info *.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ - ${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR}; \ + ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo index 2d8c3de2f9c..a2a7f43f68a 100644 --- a/security/mit-krb5/distinfo +++ b/security/mit-krb5/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.23 2010/02/24 19:07:51 tez Exp $ +$NetBSD: distinfo,v 1.24 2010/03/26 21:44:59 joerg Exp $ SHA1 (krb5-1.4.2-signed.tar) = bbc03bd319d539fb9523c2545d80ba0784522e88 RMD160 (krb5-1.4.2-signed.tar) = 44500f5fab8e5959cf43f17f5f52f68e2dc73a1f Size (krb5-1.4.2-signed.tar) = 6696960 bytes SHA1 (patch-aa) = 17e0934ea2ef21b3457fba54cf3d1c36de2da479 -SHA1 (patch-ab) = 8d6904b80e8576085acbaa3ac0cd17824c7b301d -SHA1 (patch-ac) = d0777e6005cd1249c7c6406068973f6959d11302 -SHA1 (patch-ad) = 7b17ffcd14cdedeb0ddfb606802a156589995c1b +SHA1 (patch-ab) = 9650a9c8b6191d6feb99c01ba37b2e60f266e6e9 +SHA1 (patch-ac) = 10884715858367214a562d7d631312c7f8ca1e0e +SHA1 (patch-ad) = c0beee554840aa80dba0e72bda21b4cf63ec2044 SHA1 (patch-ae) = fc6d5e11cd827cdfbe1bfc3a3c7ca9f5a71c17d7 SHA1 (patch-af) = c9631743e3c93aee2aab5c8a370e9bebfc4084e5 SHA1 (patch-ag) = 5da57455f36a2bd40e0f97db94e93249e90e0b8e diff --git a/security/mit-krb5/patches/patch-ab b/security/mit-krb5/patches/patch-ab index 386730b549d..210470c42d6 100644 --- a/security/mit-krb5/patches/patch-ab +++ b/security/mit-krb5/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2005/04/10 07:15:25 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2010/03/26 21:44:59 joerg Exp $ --- appl/telnet/telnet/Makefile.in.orig 2004-04-24 18:20:46.000000000 -0400 +++ appl/telnet/telnet/Makefile.in @@ -8,8 +8,8 @@ $NetBSD: patch-ab,v 1.2 2005/04/10 07:15:25 jlam Exp $ -telnet: $(OBJS) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a - $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(KRB4COMPAT_LIBS) -+telnet: $(OBJS) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet$(DEPSTLIBEXT) -+ $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet$(DEPSTLIBEXT) $(KRB4COMPAT_LIBS) ++telnet: $(OBJS) $(KRB4COMPAT_DEPLIBS) ../../../lib/libtelnet$(DEPSTLIBEXT) ++ $(CC_LINK) -o $@ $(OBJS) ../../../lib/libtelnet$(DEPSTLIBEXT) $(KRB4COMPAT_LIBS) clean:: $(RM) telnet diff --git a/security/mit-krb5/patches/patch-ac b/security/mit-krb5/patches/patch-ac index 573d873bcb1..fa3c8c6ad4a 100644 --- a/security/mit-krb5/patches/patch-ac +++ b/security/mit-krb5/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2005/04/10 07:15:25 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2010/03/26 21:44:59 joerg Exp $ --- appl/telnet/telnetd/Makefile.in.orig 2004-09-22 18:59:45.000000000 -0400 +++ appl/telnet/telnetd/Makefile.in @@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.2 2005/04/10 07:15:25 jlam Exp $ -telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a - $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS) -+telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet$(DEPSTLIBEXT) -+ $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet$(DEPSTLIBEXT) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS) ++telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../../../lib/libtelnet$(DEPSTLIBEXT) ++ $(CC_LINK) -o $@ $(OBJS) ../../../lib/libtelnet$(DEPSTLIBEXT) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS) clean:: $(RM) telnetd diff --git a/security/mit-krb5/patches/patch-ad b/security/mit-krb5/patches/patch-ad index 3f70e264925..1fe78288101 100644 --- a/security/mit-krb5/patches/patch-ad +++ b/security/mit-krb5/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.3 2005/09/22 19:45:42 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2010/03/26 21:44:59 joerg Exp $ ---- config/lib.in.orig 2005-04-07 17:38:51.000000000 -0400 +--- config/lib.in.orig 2005-04-07 21:38:51.000000000 +0000 +++ config/lib.in @@ -26,8 +26,9 @@ # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc... @@ -13,11 +13,15 @@ $NetBSD: patch-ad,v 1.3 2005/09/22 19:45:42 jlam Exp $ # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files PARSE_OBJLISTS= set -x && $(PERL) -p -e '$$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;' -@@ -90,6 +91,17 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) +@@ -90,6 +91,21 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ -+lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) ++lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) ++ $(RM) $@ ++ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ ++ ++${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) + $(RM) $@ + @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))" + @dirs=`echo $(LAOBJLISTS) | \ @@ -31,39 +35,29 @@ $NetBSD: patch-ad,v 1.3 2005/09/22 19:45:42 jlam Exp $ $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) $(RM) $@ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) -@@ -105,6 +117,9 @@ $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): li - $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT): lib$(LIBBASE)$(PFLIBEXT) - $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(PFLIBEXT) .) -+$(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT): lib$(LIBBASE)$(LALIBEXT) -+ $(RM) $@ -+ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(LALIBEXT) .) - - all-libs: $(LIBLIST) - all-liblinks: $(LIBLINKS) -@@ -115,6 +130,7 @@ clean-libs: +@@ -115,6 +131,7 @@ clean-libs: $(RM) lib$(LIBBASE)$(SHLIBSEXT) $(RM) lib$(LIBBASE)$(SHLIBEXT) $(RM) lib$(LIBBASE)$(PFLIBEXT) -+ $(LIBTOOL) --mode=uninstall $(RM) lib$(LIBBASE)$(LALIBEXT) ++ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(RM) binutils.versions osf1.exports clean-liblinks: -@@ -123,6 +139,7 @@ clean-liblinks: +@@ -123,6 +140,7 @@ clean-liblinks: $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT) -+ $(RM) $(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT) ++ $(RM) lib$(LIBBASE)$(LALIBEXT) install-libs: $(LIBINSTLIST) install-static: -@@ -143,6 +160,9 @@ install-profiled: +@@ -143,6 +161,9 @@ install-profiled: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) +install-libtool: + $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(LALIBEXT) -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR) ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR) Makefile: $(SRCTOP)/config/lib.in $(thisconfigdir)/config.status: $(SRCTOP)/config/shlib.conf |