From 45a40029a5c2dde5adcbdfaf01d619602b6f9adc Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 15 Aug 1999 09:44:00 +0000 Subject: Make this package build on ELF systems. --- net/ucd-snmp/Makefile | 5 +-- net/ucd-snmp/files/patch-sum | 7 ++-- net/ucd-snmp/patches/patch-ab | 25 +++++++++++--- net/ucd-snmp/patches/patch-ac | 51 ++++++++++++++++++++++++++++ net/ucd-snmp/patches/patch-ad | 77 +++++++++++++++++++++++++++++++++++++++++++ net/ucd-snmp/patches/patch-ae | 30 +++++++++++++++++ 6 files changed, 185 insertions(+), 10 deletions(-) create mode 100644 net/ucd-snmp/patches/patch-ac create mode 100644 net/ucd-snmp/patches/patch-ad create mode 100644 net/ucd-snmp/patches/patch-ae (limited to 'net/ucd-snmp') diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 5954236f809..7684ba79bde 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1999/05/04 03:51:57 tv Exp $ +# $NetBSD: Makefile,v 1.13 1999/08/15 09:44:00 tron Exp $ # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp # @@ -19,9 +19,6 @@ CONFIGURE_ARGS+=--with-defaults --with-libwrap --with-logfile="/var/log/snmpd" # this might make it easier to use scotty's mibs, and local ones too CONFIGURE_ARGS+=--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" -# provide path to libtool's lib directory: -MAKE_ENV= CC_RUNTIME_ARG="-L../snmplib/.libs -L../../snmplib/.libs" - # deal with libwrap bogosity by providing these variables to programs which # do not supply them: post-extract: diff --git a/net/ucd-snmp/files/patch-sum b/net/ucd-snmp/files/patch-sum index 85f18e683d4..8c394eb0ca9 100644 --- a/net/ucd-snmp/files/patch-sum +++ b/net/ucd-snmp/files/patch-sum @@ -1,4 +1,7 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:30 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/08/15 09:44:01 tron Exp $ MD5 (patch-aa) = c681fd865ec75d7a09ecc55630381e5d -MD5 (patch-ab) = b68f86c708d476660c5a18685c229495 +MD5 (patch-ab) = a690180421173141cfa23c55630bbdb9 +MD5 (patch-ac) = 9abe56a6a7600da8725526c9aa3cf9ff +MD5 (patch-ad) = a12aa5add0ad5493ef3bf9429462479b +MD5 (patch-ae) = 7506a27cc308c926396420830c5274fe diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-ab index 89fc3e9c050..526c3c53ac1 100644 --- a/net/ucd-snmp/patches/patch-ab +++ b/net/ucd-snmp/patches/patch-ab @@ -1,8 +1,25 @@ -$NetBSD: patch-ab,v 1.2 1999/05/04 03:51:57 tv Exp $ +$NetBSD: patch-ab,v 1.3 1999/08/15 09:44:01 tron Exp $ ---- snmplib/Makefile.in.orig Mon Mar 15 11:49:10 1999 -+++ snmplib/Makefile.in Mon May 3 23:26:56 1999 -@@ -35,19 +35,18 @@ +--- snmplib/Makefile.in.orig Mon Mar 15 17:49:10 1999 ++++ snmplib/Makefile.in Sun Aug 15 11:17:50 1999 +@@ -7,12 +7,14 @@ + snmp_auth.c asn1.c md5.c \ + party.c context.c acl.c view.c \ + party_parse.c context_parse.c acl_parse.c \ +- system.c vacm.c int64.c read_config.c snmp_debug.c ++ system.c vacm.c int64.c read_config.c snmp_debug.c \ ++ libwrap.c + OBJS= snmp_client.o mib.o parse.o snmp_api.o snmp.o \ + snmp_auth.o asn1.o md5.o \ + party.o context.o acl.o view.o \ + party_parse.o context_parse.o acl_parse.o \ +- system.o vacm.o int64.o read_config.o snmp_debug.o ++ system.o vacm.o int64.o read_config.o snmp_debug.o \ ++ libwrap.o + + #all but md5.h, vacm.h, libsnmp.h, and read_config.h are copied to the installed + #include directory +@@ -35,19 +37,18 @@ CFLAGS=@CFLAGS@ @SHLIB_CFLAGS@ CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac new file mode 100644 index 00000000000..664c7e3453a --- /dev/null +++ b/net/ucd-snmp/patches/patch-ac @@ -0,0 +1,51 @@ +$NetBSD: patch-ac,v 1.1 1999/08/15 09:44:01 tron Exp $ + +--- agent/Makefile.in.orig Tue Mar 16 01:24:39 1999 ++++ agent/Makefile.in Sun Aug 15 11:32:24 1999 +@@ -3,8 +3,8 @@ + # + + TARG= snmpd +-USELIBS= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) +-LIBS= -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@ ++USELIBS= ../snmplib/libsnmp.la ++LIBS= ${USELIBS} @LIBS@ + + CPPFLAGS=@CPPFLAGS@ -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib \ + -I$(srcdir) -I. -I$(srcdir)/mibgroup -Imibgroup +@@ -20,21 +20,21 @@ + # cd dlmods; $(MAKE); cd .. + + getkstat: getkstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ ${LIBTOOL} $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + getkstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? ++ ${LIBTOOL} $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? + + getmibstat: getmibstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ ${LIBTOOL} $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + getmibstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? ++ ${LIBTOOL} $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? + + AGENTOBJS=snmpd.o snmp2p.o kernel.o snmp_agent.o snmp_vars.o view_parse.o agent_read_config.o auto_nlist.o + + snmpd: ${MIBOBJS} ${AGENTOBJS} $(USELIBS) +- ${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} ${LDFLAGS} ${LIBS} + + clean: + rm -f *.o ${TARG} +@@ -42,7 +42,7 @@ + cd mibgroup; make clean + + install: installdirs +- @$(INSTALL) $(TARG) $(sbindir) ; echo "install: installed $(TARG) in $(sbindir) " ++ @${LIBTOOL} $(INSTALL) $(TARG) $(sbindir) ; echo "install: installed $(TARG) in $(sbindir) " + # cd dlmods ; $(MAKE) install; cd .. + + installdirs: diff --git a/net/ucd-snmp/patches/patch-ad b/net/ucd-snmp/patches/patch-ad new file mode 100644 index 00000000000..873f8b7e105 --- /dev/null +++ b/net/ucd-snmp/patches/patch-ad @@ -0,0 +1,77 @@ +$NetBSD: patch-ad,v 1.1 1999/08/15 09:44:01 tron Exp $ + +--- apps/Makefile.in.orig Sat Mar 6 02:25:43 1999 ++++ apps/Makefile.in Sun Aug 15 11:31:09 1999 +@@ -8,8 +8,8 @@ + SUBDIRS= snmpnetstat + TRAPSPECIAL=@trap_list_o@ + +-USELIBS= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) +-LIBS= -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@ ++USELIBS= ../snmplib/libsnmp.la ++LIBS= ${USELIBS} @LIBS@ + + PARSEOBJS=snmp_parse_args.o + +@@ -24,40 +24,40 @@ + done + + snmpwalk: snmpwalk.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmpbulkwalk: snmpbulkwalk.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmptranslate: snmptranslate.o $(USELIBS) +- ${CC} -o $@ snmptranslate.o ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmptranslate.o ${LDFLAGS} ${LIBS} + + snmpstatus: snmpstatus.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpstatus.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpstatus.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmpget: snmpget.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpget.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpget.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmpdelta: snmpdelta.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpdelta.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpdelta.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmptable: snmptable.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmptable.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmptable.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmptest: snmptest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmptest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmptest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmptrapd: snmptrapd.o snmptrapd_handlers.o $(USELIBS) +- ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o ${LDFLAGS} ${LIBS} + + snmptrap: snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmpset: snmpset.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpset.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpset.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + snmpgetnext: snmpgetnext.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} + + clean: + rm -f *.o $(TARG) $(SBINTARG) +@@ -69,7 +69,7 @@ + for i in $(SUBDIRS) ; do \ + ( cd $$i ; $(MAKE) install ) ; \ + done +- @for i in $(TARG) ; do $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done ++ @for i in $(TARG) ; do ${LIBTOOL} $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done + @for i in $(SBINTARG) ; do $(INSTALL) $$i $(sbindir) ; echo "install: installed $$i in $(sbindir)" ; done + + installdirs: diff --git a/net/ucd-snmp/patches/patch-ae b/net/ucd-snmp/patches/patch-ae new file mode 100644 index 00000000000..9714ac310ee --- /dev/null +++ b/net/ucd-snmp/patches/patch-ae @@ -0,0 +1,30 @@ +$NetBSD: patch-ae,v 1.1 1999/08/15 09:44:01 tron Exp $ + +--- apps/snmpnetstat/Makefile.in.orig Sat Mar 6 02:25:46 1999 ++++ apps/snmpnetstat/Makefile.in Sun Aug 15 11:31:31 1999 +@@ -23,13 +23,13 @@ + CPPFLAGS=@CPPFLAGS@ -I../.. -I$(srcdir)/../.. -I$(srcdir)/../../snmplib + CC = @CC@ $(CPPFLAGS) + +-USELIBS=../../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) +-LIBS= -L../../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@ ++USELIBS=../../snmplib/libsnmp.la ++LIBS= ${USELIBS} @LIBS@ + + all: $(TARG) + + snmpnetstat: ${OBJS} ${USELIBS} +- ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS} ++ ${LIBTOOL} ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS} + + distclean: clean + +@@ -49,7 +49,7 @@ + @$(SHELL) $(srcdir)/../../mkinstalldirs $(snmplibdir) $(bindir) + + install: installdirs $(TARG) +- @for i in $(TARG) ; do $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done ++ @for i in $(TARG) ; do ${LIBTOOL} $(INSTALL) $$i $(bindir) ; echo "install: installed $$i in $(bindir)" ; done + + depend: + makedepend $(CPPFLAGS) $(srcdir)/*.c -- cgit v1.2.3