svn commit: r322555 - in head/net/freenet6: . files

[Alexey Dokuchaev]

Author: danfe
Date: Tue Jul  9 12:14:41 2013
New Revision: 322555
URL: http://svnweb.freebsd.org/changeset/ports/322555

Log:
  - Add targets' missing prerequisites to allow parallel builds
  - Cleanup Makefile (trim header, sort the knobs, respect CC/CXX)
  - Pet portlint(1) by shortening overly long port description
  
  Approved by:	edwin (maintainer)

Modified:
  head/net/freenet6/Makefile
  head/net/freenet6/files/patch-Makefiles-etcdir.patch
  head/net/freenet6/pkg-descr

Modified: head/net/freenet6/Makefile
==============================================================================
--- head/net/freenet6/Makefile	Tue Jul  9 09:14:53 2013	(r322554)
+++ head/net/freenet6/Makefile	Tue Jul  9 12:14:41 2013	(r322555)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   freenet6
-# Date created:        11 Oct 2001
-# Whom:                Edwin Groothuis (edwin at mavetju.org)
-#
+# Created by: Edwin Groothuis <edwin at mavetju.org>
 # $FreeBSD$
-#
 
 PORTNAME=	freenet6
-PORTVERSION=	6.0.1
+DISTVERSION=	6_0_1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://go6.net/4105/file.asp?file_id=166&
 DISTNAME=	tspc-${PORTVERSION}-src
@@ -15,27 +11,27 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	edwin at mavetju.org
 COMMENT=	Hexago Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
-USE_RC_SUBR=	yes
-WRKSRC=		${WRKDIR}/gw6c-6_0_1/tspc-advanced
+USES=		gmake
+MAKE_ARGS=	target=freebsd CC="${CC}" CXX="${CXX}" \
+		installdir="${PREFIX}" ETCDIR="${ETCDIR}"
 
-MAN8=		gw6c.8
-MAN5=		gw6c.conf.5
+WRKSRC=		${WRKDIR}/gw6c-${DISTVERSION}/tspc-advanced
 
 USE_RC_SUBR=	freenet6
 SUB_FILES=	pkg-message
 
-USE_GMAKE=	yes
-MAKE_ARGS=	target=freebsd installdir=${PREFIX} ETCDIR=${ETCDIR}
-
-.include <bsd.port.pre.mk>
+MAN5=		gw6c.conf.5
+MAN8=		gw6c.8
 
 post-fetch:
-	if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
+	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
 		${MV} ${DISTDIR}/file.asp*file_id*166* \
-		    ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
+			${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
 	fi
 
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/freenet6/files/patch-Makefiles-etcdir.patch
==============================================================================
--- head/net/freenet6/files/patch-Makefiles-etcdir.patch	Tue Jul  9 09:14:53 2013	(r322554)
+++ head/net/freenet6/files/patch-Makefiles-etcdir.patch	Tue Jul  9 12:14:41 2013	(r322555)
@@ -15,6 +15,42 @@
  clean: 
 --- Makefile.orig	2009-11-15 19:50:40.000000000 +0100
 +++ Makefile	2009-11-15 19:50:57.000000000 +0100
+@@ -74,7 +74,7 @@
+ #
+ .PHONY: all platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c check-gw6c-install install clean cleanall
+ 
+-all: platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c
++all: platform-check check-gw6c-config check-gw6c-messaging build-gw6c
+ 
+ 
+ # This makefile target will check the platform.
+@@ -117,7 +117,7 @@
+ # This makefile target will check and build the Gateway6 Client Configuration
+ # Subsystem if it is not built.
+ #
+-check-gw6c-config:
++check-gw6c-config:	check-gw6c-pal
+ 	@[ -d ${GW6CCFG_DIR} ] || { \
+ 	    echo "Gateway6 Client Configuration Subsystem module is not found. (${GW6CCFG_DIR})"; \
+ 	    exit 1 ; \
+@@ -131,7 +131,7 @@
+ # This makefile target will check and build the Gateway6 Client Messaging
+ # Subsystem if it is not built.
+ #
+-check-gw6c-messaging:
++check-gw6c-messaging:	check-gw6c-pal
+ 	@[ -d ${GW6CMSG_DIR} ] || { \
+ 	    echo "Gateway6 Client Messaging Subsystem module is not found. (${GW6CMSG_DIR})"; \
+ 	    exit 1 ; \
+@@ -144,7 +144,7 @@
+ 
+ # This makefile target will build the Gateway6 Client.
+ #
+-build-gw6c:
++build-gw6c:	check-gw6c-pal
+ 	mkdir -p $(OBJS_DIR)
+ 	mkdir -p $(BIN_DIR)
+ 	@for dir in ${SUBDIRS}; do \
 @@ -167,17 +167,14 @@
  	@mkdir -p $(INSTALL_DIR)
  	@mkdir -p $(INSTALL_BIN)

Modified: head/net/freenet6/pkg-descr
==============================================================================
--- head/net/freenet6/pkg-descr	Tue Jul  9 09:14:53 2013	(r322554)
+++ head/net/freenet6/pkg-descr	Tue Jul  9 12:14:41 2013	(r322555)
@@ -1,5 +1,3 @@
-What is Freenet6?
-
 Freenet6 is an IPv6 access service offered for free to the community.
 This service enables thousands of people from all over the world
 to experience the best solution for a smooth and incremental