ports/182413: [maintainer update] [net/gateway6] fix build without gcc/g++

[Michael Scholz]

>Number:         182413
>Category:       ports
>Synopsis:       [maintainer update] [net/gateway6] fix build without gcc/g++
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 26 15:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Michael Scholz
>Release:        FreeBSD 9.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD pumpkin.fth-devel.net 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #0 r255878: Thu Sep 26 14:44:04 CEST 2013 root at pumpkin.fth-devel.net:/usr/obj/usr/src/sys/PUMPKIN amd64

>Description:
$CC and $CXX are hardcoded to gcc and g++.

A similar PR was sent on Sep 19, 2013 (ports/182230).  Because the
result of working through that PR with the committer (jgh) and the
maintainer was deprecation of net/gateway6, the diff was not applied.

>How-To-Repeat:
In src.conf set WITHOUT_GCC=, recompile base and try to build the port.

>Fix:
--- gateway6.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 328353)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gateway6
 PORTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://go6.net/4105/file.asp?file_id=166&foo=/
 MASTER_SITES+=	http://go6.net/4105/file.asp?file_id=166&
@@ -12,41 +12,41 @@
 MAINTAINER=	mike at fth-devel.net
 COMMENT=	Gateway6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
+LICENSE=	HEXAGTO
+LICENSE_NAME=	${LICENSE}
+LICENSE_FILE=	${WRKSRC}/CLIENT-LICENSE.TXT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 CONFLICTS=	freenet6-[0-9]*
 
 DEPRECATED=	Unsupported upstream, consider using net/gogoc
 EXPIRATION_DATE=	2013-12-31
 
+OPTIONS_DEFINE=	DOCS
+
 USE_RC_SUBR=	gateway6
+SUB_FILES=	pkg-message
+
 WRKSRC=		${WRKDIR}/gw6c-6_0_1
 ETCDIR=		${PREFIX}/etc
 
+MAN5=		gw6c.conf.5
 MAN8=		gw6c.8
-MAN5=		gw6c.conf.5
-GW6C_DATA=	\
-		CLIENT-LICENSE.TXT \
-		INSTALL \
+GW6C_DATA=	INSTALL \
 		README \
 		HEX_DC_0005_Gateway6_Client_Guide.pdf \
 		HEX_DC_0007_Gateway6_Client_Release_Notes.pdf
+PORTDOCS=	*
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
-
 USES=		gmake perl5
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=yes
-MAKE_ARGS=	target=freebsd installdir=${PREFIX}
+MAKE_ARGS=	target=freebsd CC="${CC}" CXX="${CXX}" \
+		installdir="${PREFIX}" ETCDIR="${ETCDIR}"
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-post-install:
-.for f in ${GW6C_DATA}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
-.endfor
-	@${CAT} ${PKGMESSAGE}
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|/usr/local/etc/gw6|${PREFIX}|g" \
@@ -69,4 +69,15 @@
 		-e "s|template=linux|template=freebsd|g" \
 		${WRKSRC}/tspc-advanced/man/man5/gw6c.conf.5
 
-.include <bsd.port.post.mk>
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for f in ${GW6C_DATA}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 328353)
+++ pkg-plist	(working copy)
@@ -2,10 +2,5 @@
 @unexec if cmp -s %D/etc/gw6c.conf.sample %D/etc/gw6c.conf; then rm -f %D/etc/gw6c.conf; fi
 etc/gw6c.conf.sample
 @exec if [ ! -f %D/etc/gw6c.conf ] ; then cp -p %D/%F %B/gw6c.conf; fi
-%%DATADIR%%/CLIENT-LICENSE.TXT
-%%DATADIR%%/INSTALL
-%%DATADIR%%/README
-%%DATADIR%%/HEX_DC_0005_Gateway6_Client_Guide.pdf
-%%DATADIR%%/HEX_DC_0007_Gateway6_Client_Release_Notes.pdf
 %%DATADIR%%/freebsd.sh
 @dirrm %%DATADIR%%
--- gateway6.diff ends here ---


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