Make sysutils/npadmin compile under -current again.

Noticed on: bento

4 files changed, 69 insertions, 0 deletions

diff --git a/sysutils/npadmin/Makefile b/sysutils/npadmin/Makefile
index c5ab02587ed..31da15a0876 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -13,12 +13,19 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dom@happygiraffe.net
 
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
 MAN1=		npadmin.1
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ENV=	LIBS=-lgnugetopt LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
+pre-configure:
+	${RM} ${WRKSRC}/getopt.h ${WRKSRC}/getopt1.c
+
 .include <bsd.port.mk>
diff --git a/sysutils/npadmin/files/patch-Makefile.in b/sysutils/npadmin/files/patch-Makefile.in
new file mode 100644
index 00000000000..72581464bad
--- /dev/null
+++ b/sysutils/npadmin/files/patch-Makefile.in
@@ -0,0 +1,42 @@
+--- Makefile.in.orig	Mon Jun  5 13:44:42 2000
++++ Makefile.in	Thu Nov 21 17:54:41 2002
+@@ -67,7 +67,7 @@
+ 
+ bin_PROGRAMS = npadmin
+ 
+-npadmin_SOURCES = argflags.h ber.C ber.h beroid.C berseq.C compat.h 	npaconsts.h npadmin.C npahelpers.C npahelpers.h npaoids.h         npastructs.h oidseq.C oidseq.h printmib.C printmib.h session.C         session.h structfill.C structfill.h getopt.h getopt.c getopt1.c 	snmpsock.h snmpsock.C
++npadmin_SOURCES = argflags.h ber.C ber.h beroid.C berseq.C compat.h 	npaconsts.h npadmin.C npahelpers.C npahelpers.h npaoids.h         npastructs.h oidseq.C oidseq.h printmib.C printmib.h session.C         session.h structfill.C structfill.h snmpsock.h snmpsock.C
+ 
+ 
+ npadmin_LDADD = @LIBOBJS@
+@@ -86,7 +86,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ npadmin_OBJECTS =  ber.o beroid.o berseq.o npadmin.o npahelpers.o \
+-oidseq.o printmib.o session.o structfill.o getopt.o getopt1.o \
++oidseq.o printmib.o session.o structfill.o getopt.o \
+ snmpsock.o
+ npadmin_DEPENDENCIES =  @LIBOBJS@
+ npadmin_LDFLAGS = 
+@@ -333,8 +333,7 @@
+ beroid.o: beroid.C ber.h compat.h config.h
+ berseq.o: berseq.C ber.h compat.h config.h
+ getopt.o: getopt.c config.h
+-getopt1.o: getopt1.c config.h getopt.h
+-npadmin.o: npadmin.C config.h getopt.h compat.h structfill.h session.h \
++npadmin.o: npadmin.C config.h compat.h structfill.h session.h \
+ 	ber.h oidseq.h snmpsock.h argflags.h npaoids.h npaconsts.h \
+ 	npastructs.h npahelpers.h printmib.h
+ npahelpers.o: npahelpers.C argflags.h npaconsts.h npastructs.h npaoids.h \
+@@ -345,9 +344,9 @@
+ printmib.o: printmib.C printmib.h session.h ber.h compat.h config.h \
+ 	oidseq.h snmpsock.h npaconsts.h npastructs.h npaoids.h \
+ 	argflags.h npahelpers.h structfill.h
+-session.o: session.C getopt.h compat.h config.h ber.h session.h oidseq.h \
++session.o: session.C compat.h config.h ber.h session.h oidseq.h \
+ 	snmpsock.h argflags.h
+-snmpsock.o: snmpsock.C snmpsock.h getopt.h
++snmpsock.o: snmpsock.C snmpsock.h
+ structfill.o: structfill.C structfill.h session.h ber.h compat.h \
+ 	config.h oidseq.h snmpsock.h
+ 
diff --git a/sysutils/npadmin/files/patch-npadmin.C b/sysutils/npadmin/files/patch-npadmin.C
new file mode 100644
index 00000000000..6574c405623
--- /dev/null
+++ b/sysutils/npadmin/files/patch-npadmin.C
@@ -0,0 +1,10 @@
+--- npadmin.C.orig	Thu Nov 21 17:53:10 2002
++++ npadmin.C	Thu Nov 21 17:53:48 2002
+@@ -11,6 +11,7 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ 
++#define HAVE_DECL_GETOPT 1
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #else
diff --git a/sysutils/npadmin/files/patch-snmpsock.C b/sysutils/npadmin/files/patch-snmpsock.C
new file mode 100644
index 00000000000..50159bba9db
--- /dev/null
+++ b/sysutils/npadmin/files/patch-snmpsock.C
@@ -0,0 +1,10 @@
+--- snmpsock.C.orig	Thu Nov 21 17:55:05 2002
++++ snmpsock.C	Thu Nov 21 17:55:19 2002
+@@ -10,6 +10,7 @@
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #define MAXPACKSIZE 10240
+