Fix wrong lib treatment for Tcl extensions.
Better install dir. Slight Makefile tidy. Separated build.
Maintainer timeout. I can take this one also.


Stu


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/tcl-snmptools/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile    18 Mar 2016 23:12:19 -0000      1.5
+++ Makefile    9 May 2017 13:57:42 -0000
@@ -2,9 +2,9 @@
 
 COMMENT =      Tcl package that provides SNMP tools
 
-DISTNAME =     tcl-snmptools-1.0
-REVISION =     0
-SHARED_LIBS =  snmptools10 1.0
+V =            1.0
+DISTNAME =     tcl-snmptools-${V}
+REVISION =     1
 CATEGORIES =   net
 MAINTAINER =   Matthieu Herrb <matth...@openbsd.org>
 
@@ -19,6 +19,7 @@ LIB_DEPENDS = net/net-snmp
 BUILD_DEPENDS =        ${MODTCL_BUILD_DEPENDS}
 RUN_DEPENDS =  ${MODTCL_RUN_DEPENDS}
 
+SEPARATE_BUILD =       Yes
 CONFIGURE_STYLE =      gnu
 
 CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \
@@ -26,6 +27,10 @@ CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBD
                CPPFLAGS="-I${LOCALBASE}/include" \
                 CFLAGS="${CFLAGS} -pthread"
 
-NO_TEST =    Yes
+FAKE_FLAGS =   PKG_DIR='$$(PACKAGE_NAME)' INSTALL_PROGRAM='$$(INSTALL_DATA)'
+NO_TEST =      Yes
+SUBST_VARS =   VER
+
+VER =          ${V:S/.//g}
 
 .include <bsd.port.mk>
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     9 May 2017 13:57:42 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -8771,7 +8771,7 @@ fi
+ fi
+ 
+           LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
++          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+           { echo "$as_me:$LINENO: checking for ELF" >&5
+ echo $ECHO_N "checking for ELF... $ECHO_C" >&6; }
+ if test "${tcl_cv_ld_elf+set}" = set; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/tcl-snmptools/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   8 Jan 2012 14:56:29 -0000       1.1.1.1
+++ pkg/PLIST   9 May 2017 13:57:42 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/08 14:56:29 matthieu Exp $
-lib/tcl/snmptools1.0/
-@lib lib/tcl/snmptools1.0/libsnmptools10.so.${LIBsnmptools10_VERSION}
-lib/tcl/snmptools1.0/pkgIndex.tcl
+lib/tcl/snmptools/
+lib/tcl/snmptools/libsnmptools${VER}.so
+lib/tcl/snmptools/pkgIndex.tcl
 @man man/mann/tcl-snmptools.n

Reply via email to