1 files changed, 23 insertions, 35 deletions

diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile
index c8cf4a93f885..4d507bb18e8f 100644
--- a/net/freenet6/Makefile
+++ b/net/freenet6/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	freenet6
-PORTVERSION=	1.0
+PORTVERSION=	2.1.1
 PORTREVISION=	1
 CATEGORIES=	net ipv6
-MASTER_SITES=	# fetch manually
-DISTNAME=	${PORTNAME}-client-${PORTVERSION}
+MASTER_SITES=	http://www.hexago.com/files/
+DISTNAME=	tspc-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
-RESTRICTED=	"Must Agree to License at http://www.freenet6.net/ on the download page for FreeBSD"
-NO_CDROM=	${RESTRICTED}
-NO_PACKAGE=	${RESTRICTED}
-
 USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/tspc2
 
 MAN8=		tspc.8
 MAN5=		tspc.conf.5
@@ -33,50 +30,41 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 IGNORE=		This program might not be working on FreeBSD version below 4.0
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		May not be automatically fetched due to licensing\
-		restrictions. You MUST manually fetch the version\
-		after reading and agreeing to the license at:\
-		http://www.freenet6.net/cgi-bin/download.cgi?fn=${DISTFILES} \
-		Once it has been downloaded, move it to\
-		${DISTDIR} and then restart this build.\
-		You also can register to use this service at\
-		http://www.freenet6.net/register.shtml
-.endif
-
-.if ${OSVERSION} >= 440000
-MAKE_ARGS=	target=freebsd44 installdir=${PREFIX}
-.else
-MAKE_ARGS=	target=freebsd4 installdir=${PREFIX}
-.endif
+MAKE_ARGS=	target=freebsd installdir=${PREFIX}
 
 do-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf.sample ${EXAMPLESDIR}
+
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/tspc ${PREFIX}/bin/tspc
-	@${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf ${PREFIX}/etc/tspc.conf.sample
 	@${INSTALL_SCRIPT} ${WRKSRC}/template/checktunnel.sh ${PREFIX}/bin/checktunnel.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd44.sh ${PREFIX}/bin/tspc-freebsd44.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd4.sh ${PREFIX}/bin/tspc-freebsd4.sh
+	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd.sh ${PREFIX}/bin/tspc-freebsd.sh
 	@${INSTALL_MAN} ${WRKSRC}/man/man8/tspc.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/man/man5/tspc.conf.5 ${PREFIX}/man/man5
-	@${INSTALL_SCRIPT} ${WRKSRC}/freenet6.sh ${PREFIX}/etc/rc.d/
+	@${INSTALL_SCRIPT} ${WRKDIR}/freenet6.sh ${PREFIX}/etc/rc.d/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|tspc.conf|${PREFIX}/etc/tspc.conf|" \
-		${WRKSRC}/src/tspc.c
-
-	@${CP} ${FILESDIR}/freenet6.sh.in ${WRKSRC}/freenet6.sh
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKSRC}/freenet6.sh
+	@${CP} ${FILESDIR}/freenet6.sh.in ${WRKDIR}/freenet6.sh
+	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKDIR}/freenet6.sh
 
 	@${CP} ${FILESDIR}/pkg-message.in ${WRKDIR}/pkg-message
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKDIR}/pkg-message
+	@${REINPLACE_CMD} \
+		-e "s|@@PREFIX@@|${PREFIX}|g" \
+		-e "s|@@EXAMPLESDIR@@|${EXAMPLESDIR}|g" \
+		${WRKDIR}/pkg-message
 
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" \
+	@${REINPLACE_CMD} \
+		-e "s|/installdir/bin|${PREFIX}/etc|g" \
 		${WRKSRC}/man/man8/tspc.8
 
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" \
+	@${REINPLACE_CMD} \
+		-e "s|/usr/local/tsp|${PREFIX}|g" \
+		-e "s|/install/dir/bin/tspc.conf.sample|${EXAMPLESDIR}/tspc.conf.sample|g" \
+		-e "s|/install/dir/bin/tspc.conf|${PREFIX}/etc/tspc.conf|g" \
+		-e "s|template=linux|template=tspc-freebsd|g" \
 		${WRKSRC}/man/man5/tspc.conf.5
 
 .include <bsd.port.post.mk>