- Avoid CONFLICTS between ssltunnel-client and ssltunnel-server

- Use ETCDIR
- Remove superfluous comments
- Cosmetic changes
- Remove obsolete MD5 checksum

PR:		ports/154536
Submitted by:	sunpoet (myself)
Approved by:	Chris Rees <utisoft@gmail.com> (maintainer)
Feature safe:	yes

3 files changed, 21 insertions, 21 deletions

diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index ed35cc3fa742..8747451be74d 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -1,15 +1,13 @@
-# ex:ts=8
 # Ports collection makefile for:	ssltunnel-client
 # Date created:			June 10, 2003
 # Whom:				at@rominet.net
 #
-# $Id: Makefile,v 1.3 2003/09/21 16:20:44 thivillon Exp $
-#
 # $FreeBSD$
 #
 
 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 @@ MAINTAINER=	utisoft@gmail.com
 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 @@ WITHOUT_GNOME=	yes
 .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>
diff --git a/net/ssltunnel-client/distinfo b/net/ssltunnel-client/distinfo
index 02591c54c5ee..225f6e000193 100644
--- a/net/ssltunnel-client/distinfo
+++ b/net/ssltunnel-client/distinfo
@@ -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
diff --git a/net/ssltunnel-client/pkg-plist b/net/ssltunnel-client/pkg-plist
index b76fdea45a5c..f268d9ebd611 100644
--- a/net/ssltunnel-client/pkg-plist
+++ b/net/ssltunnel-client/pkg-plist
@@ -1,7 +1,7 @@
 bin/pppclient
-@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
+@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%%
-@dirrmtry etc/ssltunnel
+@dirrmtry %%ETCDIR%%