- re-organized Makefile.

- added shared library support.
- updated PLIST, and added PFRAG.shared, PFRAG.no-shared for libraries.

net/ucd-snmp/Makefile

@@ -1,9 +1,14 @@
-# $OpenBSD: Makefile,v 1.15 2000/08/05 09:39:20 danh Exp $
+# $OpenBSD: Makefile,v 1.16 2000/08/29 17:49:09 danh Exp $
 
-DISTNAME=	ucd-snmp-4.1.2
+VERSION=	4.1.2
+DISTNAME=	ucd-snmp-${VERSION}
 CATEGORIES=     net
 NEED_VERSION=	1.319
+MASTER_SITES=	ftp://ucd-snmp.ucdavis.edu/	\
+		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/
+
 HOMEPAGE=	http://ucd-snmp.ucdavis.edu/
+
 MAINTAINER=	danh@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	Yes 
@@ -11,14 +16,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes 
 PERMIT_DISTFILES_FTP=	Yes 
 
-MASTER_SITES=	ftp://ucd-snmp.ucdavis.edu/	\
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/
-
 CONFIGURE_STYLE= 	gnu autoconf dest
-CONFIGURE_ARGS+= --with-persistent-directory='/var/ucd-snmp' \
-		 --with-sys-contact='<change_me>' \
-		 --with-sys-location='<change_me>' \
-	 	 --with-logfile='/var/log/snmpd'
+CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
+			--with-persistent-directory='/var/ucd-snmp' \
+	 	 	--with-logfile='/var/log/snmpd' \
+			--with-defaults --with-zlib
 
 BIN=	encode_keychange snmpbulkget snmpbulkwalk snmpdelta \
 	snmpget snmpgetnext snmpnetstat snmpset snmpstatus  \

net/ucd-snmp/patches/patch-configure_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.1 2000/08/05 09:39:21 danh Exp $
+$OpenBSD: patch-configure_in,v 1.2 2000/08/29 17:49:10 danh Exp $
 --- configure.in.orig	Fri May  5 12:46:26 2000
-+++ configure.in	Sat Aug  5 03:54:07 2000
++++ configure.in	Tue Aug 29 13:23:30 2000
 @@ -400,22 +400,10 @@ if test "x$prefix" = "xNONE"; then
    prefix=/usr/local
  fi
@@ -24,6 +24,24 @@ $OpenBSD: patch-configure_in,v 1.1 2000/08/05 09:39:21 danh Exp $
  dnl Set SNMPLIBPATH & SNMPSHAREPATH
  
  SNMPLIBPATH=""
+@@ -460,7 +448,7 @@ if test "x$with_shared" = "xyes"; then
+       SHLIB_CFLAGS="-KPIC"
+     fi
+     SHLIB_EXTENSION="so"
+-    SHLIB_VERSION=
++    SHLIB_VERSION=.41.2
+     SHLIB_LD_CMD="ld -r -o"
+     SHLIB_LDCONFIG_CMD=
+     SHLIB_LD_LIBS=
+@@ -498,7 +486,7 @@ yes
+ 		AC_MSG_RESULT([no])
+ 		SHLIB_LD_CMD="ld -Bshareable -o"
+ 		CC_RUNTIME_ARG="-R$libdir"
+-		SHLIB_LDCONFIG_CMD='PATH="$$PATH:/sbin" ldconfig -m $(libdir)'
++		SHLIB_LDCONFIG_CMD=
+ 	])
+ 	;;
+ 
 @@ -1256,29 +1244,17 @@ AC_CHECK_STRUCT_FOR([
  
  AC_CHECK_STRUCT_FOR([

net/ucd-snmp/pkg/PFRAG.no-shared

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.no-shared,v 1.1 2000/08/29 17:49:10 danh Exp $
+lib/libsnmp.a
+lib/libucdagent.a
+lib/libucdmibs.a

net/ucd-snmp/pkg/PFRAG.shared

@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/08/29 17:49:11 danh Exp $
+lib/libsnmp.so.41.2
+lib/libucdagent.so.41.2
+lib/libucdmibs.so.41.2
+DYNLIBDIR(%D/lib)

net/ucd-snmp/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/05/31 15:35:55 hugh Exp $
+@comment $OpenBSD: PLIST,v 1.4 2000/08/29 17:49:11 danh Exp $
 @unexec find %D/share/snmp/mibs -name '.index' -exec rm -f {} \;
 bin/encode_keychange
 bin/snmpbulkget
@@ -54,9 +54,6 @@ include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/util_funcs.h
 include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
-lib/libsnmp.a
-lib/libucdagent.a
-lib/libucdmibs.a
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
 man/man1/snmpcmd.1
@@ -147,6 +144,8 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt
 share/snmp/mibs/UCD-IPFWACC-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
 share/snmp/mibs/UDP-MIB.txt
+%%!SHARED%%
+%%SHARED%%
 @dirrm share/snmp/mibs
 @dirrm share/snmp
 @dirrm share/examples/ucd-snmp