diff options
author | joerg <joerg@pkgsrc.org> | 2011-11-11 23:43:43 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-11-11 23:43:43 +0000 |
commit | 2d834dee4acd1a10423235cc555be8913a6e2d01 (patch) | |
tree | cdc7eb4eaed3df472c6723562d842d115775b3c1 | |
parent | eb51099f6391e5bb5e41a88bb6a499e0310a7a22 (diff) | |
download | pkgsrc-2d834dee4acd1a10423235cc555be8913a6e2d01.tar.gz |
Add user-destdir support. Fix build with newer flex. Use SPECIAL_PERMS.
Bump revision.
-rw-r--r-- | net/gated/Makefile | 19 | ||||
-rw-r--r-- | net/gated/distinfo | 5 | ||||
-rw-r--r-- | net/gated/patches/patch-ah | 34 | ||||
-rw-r--r-- | net/gated/patches/patch-src-lexer.l | 13 |
4 files changed, 58 insertions, 13 deletions
diff --git a/net/gated/Makefile b/net/gated/Makefile index 131e9bdf7bf..48569d29247 100644 --- a/net/gated/Makefile +++ b/net/gated/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2010/11/13 21:09:02 shattered Exp $ +# $NetBSD: Makefile,v 1.36 2011/11/11 23:43:43 joerg Exp $ DISTNAME= gated-3-5-11 PKGNAME= gated-3.5.11 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.funet.fi/pub/unix/tcpip/gated/ @@ -11,6 +11,11 @@ HOMEPAGE= http://www.gated.org/ COMMENT= Routing protocol daemon LICENSE= gated-license +PKG_DESTDIR_SUPPORT= user-destdir + +SPECIAL_PERMS+= bin/gdc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4510 \ + bin/ospf_monitor ${SETUID_ROOT_PERMS} + RESTRICTED= Required license from Merit NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} @@ -26,6 +31,7 @@ RCD_SCRIPT_SRC.gated= ${FILESDIR}/gated BUILD_TARGET= gated +INSTALL_MAKE_FLAGS= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 sbin share/doc/gated post-extract: @@ -42,11 +48,10 @@ do-configure: ${RM} -f Config post-install: - ${CHMOD} -w ${PREFIX}/bin/gdc ${PREFIX}/bin/ospf_monitor - cd ${WRKSRC}/doc && pax -rw . ${PREFIX}/share/doc/gated - ${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated - ${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated - ${FIND} ${PREFIX}/share/doc/gated -type f -print | \ + cd ${WRKSRC}/doc && pax -rw . ${DESTDIR}${PREFIX}/share/doc/gated + ${CHOWN} -R ${SHAREOWN} ${DESTDIR}${PREFIX}/share/doc/gated + ${CHGRP} -R ${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/gated + ${FIND} ${DESTDIR}${PREFIX}/share/doc/gated -type f -print | \ ${XARGS} ${CHMOD} -x .include "../../mk/bsd.pkg.mk" diff --git a/net/gated/distinfo b/net/gated/distinfo index c5c51045931..24bcce44dde 100644 --- a/net/gated/distinfo +++ b/net/gated/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2008/01/05 15:15:01 rillig Exp $ +$NetBSD: distinfo,v 1.9 2011/11/11 23:43:43 joerg Exp $ SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07 RMD160 (gated-3-5-11.tar.gz) = 16624c1e2229fb783dd3bbc5759945e5e368c1f3 @@ -9,9 +9,10 @@ SHA1 (patch-ad) = 0338ffe0160d72daf45c1fb641cae7baee82e13e SHA1 (patch-ae) = c02081fa9281cbe5adfab53f24c3c662fcdf9beb SHA1 (patch-af) = 3b27a9b1e13533f4dd6dc6c2dc7d23c0a3ae725e SHA1 (patch-ag) = 375e91f1e04995ef4f7d3f7dcc592d90901fa21c -SHA1 (patch-ah) = b1ebbf21e0bf8978503ff4b40f5019c02a2d619a +SHA1 (patch-ah) = 373152725d376e8bf0963de8f352906fe6b46355 SHA1 (patch-ai) = 93d75b6132bcd0d79c075a53c9fb121571464fc9 SHA1 (patch-aj) = d8aab039599d1cf152d8bb39bba629c4d5d37c66 SHA1 (patch-ak) = 04857d0be869480812138b059e303f6a3aac00e7 SHA1 (patch-if) = 8430686ee894c1fc4f9fb58784ebf729a26083af SHA1 (patch-is) = 17bb369653948890a41e61f27a198075c7b22214 +SHA1 (patch-src-lexer.l) = 45b9aeade98eff68911c7e02c1eecb5bf2c75b5e diff --git a/net/gated/patches/patch-ah b/net/gated/patches/patch-ah index 1e38e20aba8..ee58bdd9453 100644 --- a/net/gated/patches/patch-ah +++ b/net/gated/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2001/10/25 20:16:55 agc Exp $ +$NetBSD: patch-ah,v 1.2 2011/11/11 23:43:43 joerg Exp $ ---- src/util/Makefile.template.orig Tue Sep 15 17:48:41 1998 -+++ src/util/Makefile.template Thu Oct 25 20:56:31 2001 -@@ -203,7 +203,7 @@ +--- src/util/Makefile.template.orig 1998-09-15 16:48:41.000000000 +0000 ++++ src/util/Makefile.template +@@ -203,7 +203,7 @@ make-start: true make-end: true @echo "Make ended at `${DATE}`" @@ -11,3 +11,29 @@ $NetBSD: patch-ah,v 1.1 2001/10/25 20:16:55 agc Exp $ # Rebuild Makefile +@@ -450,7 +450,7 @@ install-man:: inst-man ${O_MANS} + MANDIR=${MANDIR} ./inst-man -${MANTYPE} ${O_MANS} + + ${DESTDIR}${BINDIR}/${OSPF_MONITOR}: ${OSPF_MONITOR} +- ${INSTALL} ${INSTALLFLAGS} -o ${OSPFM_USER} -m ${OSPFM_MODE} ${OSPF_MONITOR} ${DESTDIR}${BINDIR}/${OSPF_MONITOR} ++ ${INSTALL} ${INSTALLFLAGS} ${OSPF_MONITOR} ${DESTDIR}${BINDIR}/${OSPF_MONITOR} + + @END: PROTO_OSPF + +@@ -479,15 +479,7 @@ install-man:: inst-man ${G_MANS} + MANDIR=${MANDIR} ./inst-man -${MANTYPE} ${G_MANS} + + ${DESTDIR}${BINDIR}/${GDC}: ${GDC} +- -@${TOUCH} /tmp/$$ ; ${CHGRP} ${GDC_GROUP} /tmp/$$ \ +- && ${CHOWN} ${GDC_USER} /tmp/$$ ; \ +- if [ $$? -eq 0 ]; then \ +- MODES="-m ${GDC_MODE} -o ${GDC_USER} -g ${GDC_GROUP}" ; \ +- else \ +- MODES= ; \ +- fi ; \ +- ( set -x ; ${INSTALL} ${INSTALLFLAGS} $${MODES} ${GDC} ${DESTDIR}${BINDIR}/${GDC} ) ; \ +- ${RM} -f /tmp/$$ ++ ${INSTALL} ${INSTALLFLAGS} ${GDC} ${DESTDIR}${BINDIR}/${GDC} + + + # diff --git a/net/gated/patches/patch-src-lexer.l b/net/gated/patches/patch-src-lexer.l new file mode 100644 index 00000000000..b4fe883556f --- /dev/null +++ b/net/gated/patches/patch-src-lexer.l @@ -0,0 +1,13 @@ +$NetBSD: patch-src-lexer.l,v 1.1 2011/11/11 23:43:43 joerg Exp $ + +--- src/lexer.l.orig 1998-09-15 16:46:49.000000000 +0000 ++++ src/lexer.l +@@ -176,8 +176,6 @@ PROTOTYPE(parse_eof, + + #define YYTEXT yytext + +-int yylineno = 0; +- + #undef YY_INPUT + #define YY_INPUT(buf, result, max_size) \ + { \ |