[Midnightbsd-cvs] mports [24956] trunk/net/tsocks: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 9 17:58:46 EST 2019


Revision: 24956
          http://svnweb.midnightbsd.org/mports/?rev=24956
Author:   laffer1
Date:     2019-02-09 17:58:46 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/net/tsocks/Makefile
    trunk/net/tsocks/distinfo
    trunk/net/tsocks/pkg-descr
    trunk/net/tsocks/pkg-plist

Added Paths:
-----------
    trunk/net/tsocks/files/pkg-message.in

Removed Paths:
-------------
    trunk/net/tsocks/pkg-message

Modified: trunk/net/tsocks/Makefile
===================================================================
--- trunk/net/tsocks/Makefile	2019-02-09 22:56:57 UTC (rev 24955)
+++ trunk/net/tsocks/Makefile	2019-02-09 22:58:46 UTC (rev 24956)
@@ -5,7 +5,8 @@
 # $MidnightBSD$
 
 PORTNAME=	tsocks
-PORTVERSION=	1.8.b5
+DISTVERSION=	1.8.b5
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.8%20beta%205 \
 		http://ftp1.sourceforge.net/tsocks/ \
@@ -17,88 +18,42 @@
 LICENSE=	gpl2
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 
-WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//}
 
 CONFIGURE_ARGS=	--with-conf=${PREFIX}/etc/tsocks.conf \
 		--libdir=${PREFIX}/lib
 
-MAN1=		tsocks.1
-MAN5=		tsocks.conf.5
-MAN8=		tsocks.8
+OPTIONS_DEFINE=	DOCS EXAMPLES HOSTNAMES MUTE OLDMETHOD SOCKSDNS
+OPTIONS_DEFAULT=HOSTNAMES
 
-.if defined(WITH_SOCKSDNS)
-CONFIGURE_ARGS+=	--enable-socksdns
-.endif
+HOSTNAMES_DESC=	Enable DNS lookups
+OLDMETHOD_DESC=	Do not use RTLD_NEXT parameter to dlsym
+MUTE_DESC=	Disable all error messages
+SOCKSDNS_DESC=	Intercept DNS requests and attempt to force them to use TCP
 
-.if defined(WITH_OLDMETHOD)
-CONFIGURE_ARGS+=	--enable-oldmethod
-.endif
+HOSTNAMES_CONFIGURE_OFF=	--disable-hostnames
+MUTE_CONFIGURE_ON=	--disable-debug
+OLDMETHOD_CONFIGURE_ON=	--enable-oldmethod
+SOCKSDNS_CONFIGURE_ON=	--enable-socksdns
 
-.if defined(WITH_NODEBUG)
-CONFIGURE_ARGS+=	--disable-debug
-.endif
+SUB_FILES=	pkg-message
 
-.if defined(WITH_NOHOSTNAMES)
-CONFIGURE_ARGS+=	--disable-hostnames
-.endif
-
-.include <bsd.port.pre.mk>
-
-pre-everything::
-.if !defined(WITH_SOCKSDNS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can use the WITH_SOCKSDNS=yes knob."
-	@${ECHO_MSG} "This option causes tsocks to intercept"
-	@${ECHO_MSG} "DNS lookups and attempt to force them"
-	@${ECHO_MSG} "to use TCP instead of UDP and thus"
-	@${ECHO_MSG} "be proxied through the socks server."
-	@${ECHO_MSG}
-.endif
-
-.if !defined(WITH_OLDMETHOD)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can use the make WITH_OLDMETHOD=yes knob."
-	@${ECHO_MSG} "This forces tsocks not to use the"
-	@${ECHO_MSG} "RTLD_NEXT parameter to dlsym to get the"
-	@${ECHO_MSG} "address of the connect() method tsocks"
-	@${ECHO_MSG} "overrides, instead it loads a reference"
-	@${ECHO_MSG} "to the libc shared library and then uses dlsym()."
-	@${ECHO_MSG}
-.endif
-
-.if !defined(WITH_NODEBUG)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can use the make WITH_NODEBUG=yes knob."
-	@${ECHO_MSG} "This configuration option tells tsocks"
-	@${ECHO_MSG} "to never output error messages to stderr."
-	@${ECHO_MSG}
-.endif
-
-.if !defined(WITH_NOHOSTNAMES)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can use the make WITH_NOHOSTNAMES=yes knob."
-	@${ECHO_MSG} "This disables DNS lookups on names"
-	@${ECHO_MSG} "provided as socks servers in the config"
-	@${ECHO_MSG} "file. This option is necessary"
-	@${ECHO_MSG} "if socks dns is enabled since tsocks"
-	@${ECHO_MSG} "can't send a socks dns request to resolve"
-	@${ECHO_MSG} "the location of the socks server."
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|ufds|fds|g' ${WRKSRC}/tsocks.c
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/tsocks
 
-.if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/tsocks
-	${INSTALL_DATA} ${WRKSRC}/*.example ${PREFIX}/share/examples/tsocks
-	${INSTALL_DATA} ${WRKSRC}/tsocks.conf.simple.example ${PREFIX}/etc/tsocks.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/examples/tsocks/README
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/inspectsocks ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/validateconf ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tsocks.conf.simple.example \
+		${STAGEDIR}${PREFIX}/etc/tsocks.conf.sample
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.example ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/README
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/net/tsocks/distinfo
===================================================================
--- trunk/net/tsocks/distinfo	2019-02-09 22:56:57 UTC (rev 24955)
+++ trunk/net/tsocks/distinfo	2019-02-09 22:58:46 UTC (rev 24956)
@@ -1,3 +1,2 @@
 SHA256 (tsocks-1.8beta5.tar.gz) = 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
-RMD160 (tsocks-1.8beta5.tar.gz) = 12e3eeeafaf7f3be21dd8901da38d5890659b09e
 SIZE (tsocks-1.8beta5.tar.gz) = 83928

Copied: trunk/net/tsocks/files/pkg-message.in (from rev 24955, trunk/net/tsocks/pkg-message)
===================================================================
--- trunk/net/tsocks/files/pkg-message.in	                        (rev 0)
+++ trunk/net/tsocks/files/pkg-message.in	2019-02-09 22:58:46 UTC (rev 24956)
@@ -0,0 +1,9 @@
+
+###
+
+Simple setup file was copied to ${PREFIX}/etc/tsocks.conf.sample
+An example of a more complex setup file can be found in
+${PREFIX}/share/examples/tsocks/
+Some more details avaliable in ${PREFIX}/share/examples/tsocks/README
+
+###

Modified: trunk/net/tsocks/pkg-descr
===================================================================
--- trunk/net/tsocks/pkg-descr	2019-02-09 22:56:57 UTC (rev 24955)
+++ trunk/net/tsocks/pkg-descr	2019-02-09 22:58:46 UTC (rev 24956)
@@ -1,19 +1,19 @@
-SOCKS servers are a form of proxy that are commonly used 
-in firewalled LAN environments to allow access between networks, 
-and often to the Internet. 
-The problem is that most applications don't know how to gain 
-access through SOCKS servers. 
-This means that network based applications 
-that don't understand SOCKS are very limited in networks they can reach. 
-An example of this is simple 'telnet'. 
-If you're on a network firewalled from the internet 
-with a SOCKS server for outside access, 
+SOCKS servers are a form of proxy that are commonly used
+in firewalled LAN environments to allow access between networks,
+and often to the Internet.
+The problem is that most applications don't know how to gain
+access through SOCKS servers.
+This means that network based applications
+that don't understand SOCKS are very limited in networks they can reach.
+An example of this is simple 'telnet'.
+If you're on a network firewalled from the internet
+with a SOCKS server for outside access,
 telnet can't use this server and thus can't telnet out to the Internet.
 
-tsocks' role is to allow these non SOCKS aware applications 
-(e.g telnet, ssh, ftp etc) to use SOCKS without any modification. 
-It does this by intercepting the 
-calls that applications make to establish network connections 
+tsocks' role is to allow these non SOCKS aware applications
+(e.g telnet, ssh, ftp etc) to use SOCKS without any modification.
+It does this by intercepting the
+calls that applications make to establish network connections
 and negotating them through a SOCKS server as necessary.
 
 WWW: http://tsocks.sourceforge.net

Deleted: trunk/net/tsocks/pkg-message
===================================================================
--- trunk/net/tsocks/pkg-message	2019-02-09 22:56:57 UTC (rev 24955)
+++ trunk/net/tsocks/pkg-message	2019-02-09 22:58:46 UTC (rev 24956)
@@ -1,9 +0,0 @@
-
-###
-
-Simple setup file was copied to ${PREFIX}/etc/tsocks.conf.sample
-An example of a more complex setup file can be found in
-${PREFIX}/share/examples/tsocks/
-Some more details avaliable in ${PREFIX}/share/examples/tsocks/README
-
-###

Modified: trunk/net/tsocks/pkg-plist
===================================================================
--- trunk/net/tsocks/pkg-plist	2019-02-09 22:56:57 UTC (rev 24955)
+++ trunk/net/tsocks/pkg-plist	2019-02-09 22:58:46 UTC (rev 24956)
@@ -1,8 +1,12 @@
+bin/inspectsocks
 bin/tsocks
+bin/validateconf
 etc/tsocks.conf.sample
+lib/libtsocks.so
 lib/libtsocks.so.1
-lib/libtsocks.so
-%%EXAMPLESDIR%%/tsocks.conf.complex.example
-%%EXAMPLESDIR%%/tsocks.conf.simple.example
-%%EXAMPLESDIR%%/README
- at dirrm %%EXAMPLESDIR%%
+man/man1/tsocks.1.gz
+man/man5/tsocks.conf.5.gz
+man/man8/tsocks.8.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.complex.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.simple.example



More information about the Midnightbsd-cvs mailing list