- respect CFLAGS
- don't hardcode /usr/local and the shared lib version
- install scripts with... INSTALL_SCRIPT
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/dsocks/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 1 Jan 2017 18:32:04 -0000 1.13
+++ Makefile 1 Jan 2017 20:16:02 -0000
@@ -2,6 +2,7 @@
COMMENT= SOCKS client wrapper for *BSD
DISTNAME= dsocks-1.7
+REVISION= 0
CATEGORIES= net
SHARED_LIBS= dsocks 1.0
@@ -14,13 +15,17 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=dsocks/}
-MAKE_FLAGS= SHLIB_MAJOR=${LIBdsocks_VERSION:R} \
+MAKE_FLAGS= CFLAGS="-Wall ${CFLAGS}" \
+ SHLIB_MAJOR=${LIBdsocks_VERSION:R} \
SHLIB_MINOR=${LIBdsocks_VERSION:E}
FAKE_FLAGS= DEBUGLIBS=No
+do-configure:
+ ${SUBST_CMD} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh
+
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh \
+ ${INSTALL_SCRIPT} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh \
${PREFIX}/bin
.include <bsd.port.mk>
Index: patches/patch-dsocks-torify_sh
===================================================================
RCS file: patches/patch-dsocks-torify_sh
diff -N patches/patch-dsocks-torify_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dsocks-torify_sh 1 Jan 2017 20:16:02 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- dsocks-torify.sh.orig Sun Jan 1 17:53:30 2017
++++ dsocks-torify.sh Sun Jan 1 17:54:38 2017
+@@ -11,6 +11,6 @@ if [ `uname -s` = "Darwin" ]; then
+ LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+ DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+ else
+- LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
++ LIBDSOCKS=${PREFIX}/lib/libdsocks.so.${LIBdsocks_VERSION}
+ LD_PRELOAD=$LIBDSOCKS exec "$@"
+ fi
Index: patches/patch-dsocks_sh
===================================================================
RCS file: patches/patch-dsocks_sh
diff -N patches/patch-dsocks_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dsocks_sh 1 Jan 2017 20:16:02 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dsocks.sh.orig Sun Jan 1 17:53:33 2017
++++ dsocks.sh Sun Jan 1 17:54:31 2017
+@@ -18,7 +18,7 @@ if [ `uname -s` = "Darwin" ]; then
+ LIBDSOCKS=/usr/local/lib/libdsocks.dylib
+ DYLD_INSERT_LIBRARIES=$LIBDSOCKS DYLD_FORCE_FLAT_NAMESPACE=1 exec "$@"
+ else
+- LIBDSOCKS=/usr/local/lib/libdsocks.so.1.0
++ LIBDSOCKS=${PREFIX}/lib/libdsocks.so.${LIBdsocks_VERSION}
+ LD_PRELOAD=$LIBDSOCKS exec "$@"
+ fi
+
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
