diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/net-snmp/Makefile | 33 | ||||
-rw-r--r-- | net/net-snmp/distinfo | 2 | ||||
-rw-r--r-- | net/net-snmp/files/patch-aa | 14 | ||||
-rw-r--r-- | net/net-snmp/pkg-plist | 8 | ||||
-rw-r--r-- | net/net-snmp4/Makefile | 33 | ||||
-rw-r--r-- | net/net-snmp4/distinfo | 2 | ||||
-rw-r--r-- | net/net-snmp4/files/patch-aa | 14 | ||||
-rw-r--r-- | net/net-snmp4/pkg-plist | 8 | ||||
-rw-r--r-- | net/ucd-snmp/Makefile | 33 | ||||
-rw-r--r-- | net/ucd-snmp/distinfo | 2 | ||||
-rw-r--r-- | net/ucd-snmp/files/patch-aa | 14 | ||||
-rw-r--r-- | net/ucd-snmp/pkg-plist | 8 |
12 files changed, 126 insertions, 45 deletions
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 6ea9e12a3e68..f9c8ac74ffc0 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -3,14 +3,14 @@ # Date created: 26 June 1996 # Whom: gpalmer # -# $Id: Makefile,v 1.20 1998/08/26 21:20:40 asami Exp $ +# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $ # -DISTNAME= ucd-snmp-3.5 +DISTNAME= ucd-snmp-3.5.3 CATEGORIES= net MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/snmp/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ - ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ + ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ MAINTAINER= gpalmer@FreeBSD.ORG @@ -34,18 +34,29 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample + post-install: - ( cd ${PREFIX}/bin; strip ${BIN} ) - ( cd ${PREFIX}/sbin; strip ${SBIN} ) - (cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.3.5) + ( cd ${PREFIX}/bin && strip ${BIN} ) + ( cd ${PREFIX}/sbin && strip ${SBIN} ) + ( cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.${SHLIB_VERSION} ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp @for F in ${WRKSRC}/etc/* ; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done - @if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \ - echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \ - echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \ - chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \ + @if [ ! -f ${STARTUP_FILE} ]; then \ + ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${STARTUP_FILE}; \ + ${ECHO} "[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && ${ECHO} -n ' snmpd'" >> ${STARTUP_FILE}; \ + chmod 751 ${STARTUP_FILE}; \ fi + ${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> + +.if (${PORTOBJFORMAT} == "aout") +SHLIB_VERSION=3.5 +PATCHDIR=patches.aout +.else +SHLIB_VERSION=3 +.endif +MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION} diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 77e78e6d0bcc..e05322c5e4f7 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-3.5.tar.gz) = 96b50f6e41da6f78ae7f0de158823fa8 +MD5 (ucd-snmp-3.5.3.tar.gz) = af2e8d7a4975d9ef207d9342391249a6 diff --git a/net/net-snmp/files/patch-aa b/net/net-snmp/files/patch-aa new file mode 100644 index 000000000000..26a99aa30842 --- /dev/null +++ b/net/net-snmp/files/patch-aa @@ -0,0 +1,14 @@ +--- snmplib/Makefile.in.orig Mon Sep 7 16:19:24 1998 ++++ snmplib/Makefile.in Mon Oct 19 16:16:19 1998 +@@ -23,7 +23,10 @@ + all: $(TARG) + + libsnmp.$(SHLIB_EXTENSION): ${OBJS} +- $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) \ ++ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ln -f libsnmp.$(SHLIB_EXTENSION) \ ++ libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) + $(RANLIB) libsnmp.$(SHLIB_EXTENSION) + + installdirs: diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist index 8ebb03c37437..284e144e9a09 100644 --- a/net/net-snmp/pkg-plist +++ b/net/net-snmp/pkg-plist @@ -12,7 +12,7 @@ bin/snmpdelta bin/snmptable bin/snmpcheck bin/tkmib -etc/rc.d/snmpd.sh +etc/rc.d/snmpd.sh.sample include/ucd-snmp/asn1.h include/ucd-snmp/snmp_api.h include/ucd-snmp/snmp_client.h @@ -20,10 +20,10 @@ include/ucd-snmp/snmp_impl.h include/ucd-snmp/snmp.h include/ucd-snmp/parse.h include/ucd-snmp/mib.h +include/ucd-snmp/ucd-snmp-config.h @dirrm include/ucd-snmp lib/libsnmp.so -@exec ln %D/lib/libsnmp.so %D/lib/libsnmp.so.3.5 -@unexec rm -f %D/lib/libsnmp.so.3.5 +lib/libsnmp.so.3.5 sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README @@ -61,3 +61,5 @@ share/snmp/mibs/IPFWACC-MIB.txt @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs @dirrm share/snmp +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile index 6ea9e12a3e68..f9c8ac74ffc0 100644 --- a/net/net-snmp4/Makefile +++ b/net/net-snmp4/Makefile @@ -3,14 +3,14 @@ # Date created: 26 June 1996 # Whom: gpalmer # -# $Id: Makefile,v 1.20 1998/08/26 21:20:40 asami Exp $ +# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $ # -DISTNAME= ucd-snmp-3.5 +DISTNAME= ucd-snmp-3.5.3 CATEGORIES= net MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/snmp/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ - ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ + ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ MAINTAINER= gpalmer@FreeBSD.ORG @@ -34,18 +34,29 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample + post-install: - ( cd ${PREFIX}/bin; strip ${BIN} ) - ( cd ${PREFIX}/sbin; strip ${SBIN} ) - (cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.3.5) + ( cd ${PREFIX}/bin && strip ${BIN} ) + ( cd ${PREFIX}/sbin && strip ${SBIN} ) + ( cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.${SHLIB_VERSION} ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp @for F in ${WRKSRC}/etc/* ; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done - @if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \ - echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \ - echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \ - chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \ + @if [ ! -f ${STARTUP_FILE} ]; then \ + ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${STARTUP_FILE}; \ + ${ECHO} "[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && ${ECHO} -n ' snmpd'" >> ${STARTUP_FILE}; \ + chmod 751 ${STARTUP_FILE}; \ fi + ${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> + +.if (${PORTOBJFORMAT} == "aout") +SHLIB_VERSION=3.5 +PATCHDIR=patches.aout +.else +SHLIB_VERSION=3 +.endif +MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION} diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo index 77e78e6d0bcc..e05322c5e4f7 100644 --- a/net/net-snmp4/distinfo +++ b/net/net-snmp4/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-3.5.tar.gz) = 96b50f6e41da6f78ae7f0de158823fa8 +MD5 (ucd-snmp-3.5.3.tar.gz) = af2e8d7a4975d9ef207d9342391249a6 diff --git a/net/net-snmp4/files/patch-aa b/net/net-snmp4/files/patch-aa new file mode 100644 index 000000000000..26a99aa30842 --- /dev/null +++ b/net/net-snmp4/files/patch-aa @@ -0,0 +1,14 @@ +--- snmplib/Makefile.in.orig Mon Sep 7 16:19:24 1998 ++++ snmplib/Makefile.in Mon Oct 19 16:16:19 1998 +@@ -23,7 +23,10 @@ + all: $(TARG) + + libsnmp.$(SHLIB_EXTENSION): ${OBJS} +- $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) \ ++ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ln -f libsnmp.$(SHLIB_EXTENSION) \ ++ libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) + $(RANLIB) libsnmp.$(SHLIB_EXTENSION) + + installdirs: diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist index 8ebb03c37437..284e144e9a09 100644 --- a/net/net-snmp4/pkg-plist +++ b/net/net-snmp4/pkg-plist @@ -12,7 +12,7 @@ bin/snmpdelta bin/snmptable bin/snmpcheck bin/tkmib -etc/rc.d/snmpd.sh +etc/rc.d/snmpd.sh.sample include/ucd-snmp/asn1.h include/ucd-snmp/snmp_api.h include/ucd-snmp/snmp_client.h @@ -20,10 +20,10 @@ include/ucd-snmp/snmp_impl.h include/ucd-snmp/snmp.h include/ucd-snmp/parse.h include/ucd-snmp/mib.h +include/ucd-snmp/ucd-snmp-config.h @dirrm include/ucd-snmp lib/libsnmp.so -@exec ln %D/lib/libsnmp.so %D/lib/libsnmp.so.3.5 -@unexec rm -f %D/lib/libsnmp.so.3.5 +lib/libsnmp.so.3.5 sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README @@ -61,3 +61,5 @@ share/snmp/mibs/IPFWACC-MIB.txt @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs @dirrm share/snmp +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 6ea9e12a3e68..f9c8ac74ffc0 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -3,14 +3,14 @@ # Date created: 26 June 1996 # Whom: gpalmer # -# $Id: Makefile,v 1.20 1998/08/26 21:20:40 asami Exp $ +# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $ # -DISTNAME= ucd-snmp-3.5 +DISTNAME= ucd-snmp-3.5.3 CATEGORIES= net MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/snmp/ \ ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \ - ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ + ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/ MAINTAINER= gpalmer@FreeBSD.ORG @@ -34,18 +34,29 @@ BIN= snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk SBIN= snmpd snmptrapd +STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh.sample + post-install: - ( cd ${PREFIX}/bin; strip ${BIN} ) - ( cd ${PREFIX}/sbin; strip ${SBIN} ) - (cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.3.5) + ( cd ${PREFIX}/bin && strip ${BIN} ) + ( cd ${PREFIX}/sbin && strip ${SBIN} ) + ( cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.${SHLIB_VERSION} ) @${MKDIR} ${PREFIX}/share/examples/ucd-snmp @for F in ${WRKSRC}/etc/* ; do \ ${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done - @if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \ - echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \ - echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \ - chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \ + @if [ ! -f ${STARTUP_FILE} ]; then \ + ${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${STARTUP_FILE}; \ + ${ECHO} "[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && ${ECHO} -n ' snmpd'" >> ${STARTUP_FILE}; \ + chmod 751 ${STARTUP_FILE}; \ fi + ${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> + +.if (${PORTOBJFORMAT} == "aout") +SHLIB_VERSION=3.5 +PATCHDIR=patches.aout +.else +SHLIB_VERSION=3 +.endif +MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION} diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo index 77e78e6d0bcc..e05322c5e4f7 100644 --- a/net/ucd-snmp/distinfo +++ b/net/ucd-snmp/distinfo @@ -1 +1 @@ -MD5 (ucd-snmp-3.5.tar.gz) = 96b50f6e41da6f78ae7f0de158823fa8 +MD5 (ucd-snmp-3.5.3.tar.gz) = af2e8d7a4975d9ef207d9342391249a6 diff --git a/net/ucd-snmp/files/patch-aa b/net/ucd-snmp/files/patch-aa new file mode 100644 index 000000000000..26a99aa30842 --- /dev/null +++ b/net/ucd-snmp/files/patch-aa @@ -0,0 +1,14 @@ +--- snmplib/Makefile.in.orig Mon Sep 7 16:19:24 1998 ++++ snmplib/Makefile.in Mon Oct 19 16:16:19 1998 +@@ -23,7 +23,10 @@ + all: $(TARG) + + libsnmp.$(SHLIB_EXTENSION): ${OBJS} +- $(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) \ ++ -o libsnmp.$(SHLIB_EXTENSION) ${OBJS} ++ ln -f libsnmp.$(SHLIB_EXTENSION) \ ++ libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) + $(RANLIB) libsnmp.$(SHLIB_EXTENSION) + + installdirs: diff --git a/net/ucd-snmp/pkg-plist b/net/ucd-snmp/pkg-plist index 8ebb03c37437..284e144e9a09 100644 --- a/net/ucd-snmp/pkg-plist +++ b/net/ucd-snmp/pkg-plist @@ -12,7 +12,7 @@ bin/snmpdelta bin/snmptable bin/snmpcheck bin/tkmib -etc/rc.d/snmpd.sh +etc/rc.d/snmpd.sh.sample include/ucd-snmp/asn1.h include/ucd-snmp/snmp_api.h include/ucd-snmp/snmp_client.h @@ -20,10 +20,10 @@ include/ucd-snmp/snmp_impl.h include/ucd-snmp/snmp.h include/ucd-snmp/parse.h include/ucd-snmp/mib.h +include/ucd-snmp/ucd-snmp-config.h @dirrm include/ucd-snmp lib/libsnmp.so -@exec ln %D/lib/libsnmp.so %D/lib/libsnmp.so.3.5 -@unexec rm -f %D/lib/libsnmp.so.3.5 +lib/libsnmp.so.3.5 sbin/snmpd sbin/snmptrapd share/examples/ucd-snmp/README @@ -61,3 +61,5 @@ share/snmp/mibs/IPFWACC-MIB.txt @unexec rm -f %D/share/snmp/mibs/.index @dirrm share/snmp/mibs @dirrm share/snmp +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |