ports/154536: [PATCH] net/ssltunnel-client: avoid CONFLICTS between -client and -server, use ETCDIR

[Sunpoet Po-Chuan Hsieh]

>Number:         154536
>Category:       ports
>Synopsis:       [PATCH] net/ssltunnel-client: avoid CONFLICTS between -client and -server, use ETCDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 05 22:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Fri Jan 14 04:36:31 CST 2011
>Description:
- Avoid CONFLICTS between ssltunnel-client and ssltunnel-server
  Both of them install LISEZ-MOI and README to DOCSDIR.
- Use ETCDIR
- Remove superfluous comments
- Cosmetic changes
- Remove obsolete MD5 checksum

Port maintainer (utisoft at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ssltunnel-client-1.18_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ssltunnel-client/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	22 Jul 2010 13:30:13 -0000	1.9
+++ Makefile	5 Feb 2011 21:52:06 -0000
@@ -1,15 +1,13 @@
-# ex:ts=8
 # Ports collection makefile for:	ssltunnel-client
 # Date created:			June 10, 2003
 # Whom:				at at rominet.net
 #
-# $Id: Makefile,v 1.3 2003/09/21 16:20:44 thivillon Exp $
-#
 # $FreeBSD: ports/net/ssltunnel-client/Makefile,v 1.9 2010/07/22 13:30:13 wxs Exp $
 #
 
 PORTNAME=	ssltunnel
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.hsc.fr/ressources/outils/ssltunnel/download/
 PKGNAMESUFFIX=	-client
@@ -18,6 +16,9 @@
 COMMENT=	PPP over SSL virtual private networking (client part)
 
 LICENSE=	BSD
+
+CONFIGURE_ARGS=	--disable-server --with-iconv=${LOCALBASE}
+GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 
 MAN1=		pppclient.1
@@ -33,26 +34,26 @@
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME=gtk12
-USE_PERL5=yes
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-MAN1+=	gpppclient.1
-BUILD_PERLGTK=yes
+USE_GNOME=	gtk12
+USE_PERL5=	yes
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+MAN1+=		gpppclient.1
+BUILD_PERLGTK=	yes
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-server --with-iconv=${LOCALBASE}
+post-patch:
+	${REINPLACE_CMD} -e 's|with_iconv|with-iconv|g' ${WRKSRC}/configure
 
 post-install:
 .if defined(BUILD_PERLGTK)
-	${ECHO_CMD} "bin/gpppclient" >> ${TMPPLIST};
+	${ECHO_CMD} "bin/gpppclient" >> ${TMPPLIST}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}/client.LISEZ-MOI
+	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/client.README
 .endif
-	@${MKDIR} ${PREFIX}/etc/ssltunnel/
-	${INSTALL_DATA} ${WRKSRC}/client/tunnel.conf ${PREFIX}/etc/ssltunnel/client.conf.sample
+	@${MKDIR} ${ETCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/client/tunnel.conf ${ETCDIR}/client.conf.sample
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/ssltunnel-client/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo	22 Jul 2010 13:30:13 -0000	1.6
+++ distinfo	5 Feb 2011 21:52:06 -0000
@@ -1,3 +1,2 @@
-MD5 (ssltunnel-1.18.tar.gz) = 67365324ec3ef232109c4a565f799604
 SHA256 (ssltunnel-1.18.tar.gz) = 1d2e4bbc935341775e7cc26dae980d6bdd5e8351f5a0cbf4d85363ac5d71081f
 SIZE (ssltunnel-1.18.tar.gz) = 132302
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/ssltunnel-client/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist	22 Jan 2006 02:46:06 -0000	1.2
+++ pkg-plist	5 Feb 2011 21:52:06 -0000
@@ -1,7 +1,7 @@
 bin/pppclient
- at unexec if cmp -s %D/etc/ssltunnel/client.conf %D/etc/ssltunnel/client.conf.sample; then rm -f %D/etc/ssltunnel/client.conf; fi
-etc/ssltunnel/client.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/LISEZ-MOI
-%%PORTDOCS%%%%DOCSDIR%%/README
+ at unexec if cmp -s %D/%%ETCDIR%%/client.conf %D/%%ETCDIR%%/client.conf.sample; then rm -f %D/%%ETCDIR%%/client.conf; fi
+%%ETCDIR%%/client.conf.sample
+%%PORTDOCS%%%%DOCSDIR%%/client.LISEZ-MOI
+%%PORTDOCS%%%%DOCSDIR%%/client.README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry etc/ssltunnel
+ at dirrmtry %%ETCDIR%%
--- ssltunnel-client-1.18_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: