From tkato432@yahoo.com  Mon Dec 16 18:02:02 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 63EC2296
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:01:22 +0000 (UTC)
Received: from omta02.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 38C421845
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:01:21 +0000 (UTC)
Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106])
	by omta02.auone-net.jp (au one net mail) with ESMTP id 63919156001E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 17 Dec 2013 03:01:20 +0900 (JST)
Message-Id: <20131217024702.a6ee4617b036099177a1e19a@yahoo.com>
Date: Tue, 17 Dec 2013 02:47:02 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: deskutils/tpb: Fix build with clang

>Number:         184889
>Category:       ports
>Synopsis:       deskutils/tpb: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:25 UTC 2013
>Closed-Date:    Fri Dec 20 21:48:27 UTC 2013
>Last-Modified:  Sat Dec 21 10:30:03 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/tpb/Makefile deskutils/tpb/Makefile
--- /usr/ports/deskutils/tpb/Makefile	2013-12-12 07:58:38.000000000 +0900
+++ deskutils/tpb/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -5,45 +5,49 @@
 PORTVERSION=	0.6.4
 PORTREVISION=	10
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
 ONLY_FOR_ARCHS=	i386 amd64
 
+USES=		bison gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
-USES=		bison iconv gmake pkgconfig
-
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 
-MAN1=		tpb.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALABASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
-PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/cfg.h \
-		${WRKSRC}/man/tpb.1
+.for i in man/tpb.1 src/cfg.h
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g ; \
+		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i}
+.endfor
+	@${REINPLACE_CMD} -e \
+		's|void test()||' ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \
+		${STAGEDIR}${PREFIX}/etc/tpbrc.default)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/deskutils/tpb/pkg-plist deskutils/tpb/pkg-plist
--- /usr/ports/deskutils/tpb/pkg-plist	2013-11-06 21:52:37.000000000 +0900
+++ deskutils/tpb/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -1,5 +1,6 @@
 bin/tpb
 etc/tpbrc.default
+man/man1/tpb.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh
 %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo
 %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Dec 20 21:09:41 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184889 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Dec 20 21:48:26 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184889 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184889: commit references a PR
Date: Fri, 20 Dec 2013 21:48:22 +0000 (UTC)

 Author: pawel
 Date: Fri Dec 20 21:48:14 2013
 New Revision: 337092
 URL: http://svnweb.freebsd.org/changeset/ports/337092
 
 Log:
   - Fix build with clang
   - Add LICENSE
   - Define OPTIONS, use options subs and helpers
   - Support staging
   
   PR:		ports/184889
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Modified:
   head/deskutils/tpb/Makefile
   head/deskutils/tpb/pkg-plist   (contents, props changed)
 
 Modified: head/deskutils/tpb/Makefile
 ==============================================================================
 --- head/deskutils/tpb/Makefile	Fri Dec 20 21:17:13 2013	(r337091)
 +++ head/deskutils/tpb/Makefile	Fri Dec 20 21:48:14 2013	(r337092)
 @@ -5,45 +5,44 @@ PORTNAME=	tpb
  PORTVERSION=	0.6.4
  PORTREVISION=	10
  CATEGORIES=	deskutils
 -MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 -MASTER_SITE_SUBDIR=	${PORTNAME}
 +MASTER_SITES=	SAVANNAH
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
  
 +LICENSE=	GPLv2
 +
  LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
  
 +OPTIONS_DEFINE=	DOCS NLS
 +OPTIONS_SUB=	yes
 +
  ONLY_FOR_ARCHS=	i386 amd64
  
 +USES=		bison gmake iconv pkgconfig
  GNU_CONFIGURE=	yes
 -USES=		bison iconv gmake pkgconfig
 -
  CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
  
 -MAN1=		tpb.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALABASE}/lib
  
 -.if ${PORT_OPTIONS:MNLS}
 -USES+=		gettext
 -PLIST_SUB+=	NLS=""
 -.else
 -CONFIGURE_ARGS+=--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 -.endif
 +NLS_USES=		gettext
 +NLS_CONFIGURE_OFF=	--disable-nls
  
  post-patch:
 -	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
 -		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 -		${WRKSRC}/src/cfg.h \
 -		${WRKSRC}/man/tpb.1
 +.for i in man/tpb.1 src/cfg.h
 +	@${REINPLACE_CMD} -e \
 +		's|%%PREFIX%%|${PREFIX}|g ; \
 +		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i}
 +.endfor
 +	@${REINPLACE_CMD} -e \
 +		's|void test()||' ${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default
 -.if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR}
 -.endif
 +	(cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \
 +		${STAGEDIR}${PREFIX}/etc/tpbrc.default)
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \
 +		${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 
 Modified: head/deskutils/tpb/pkg-plist
 ==============================================================================
 --- head/deskutils/tpb/pkg-plist	Fri Dec 20 21:17:13 2013	(r337091)
 +++ head/deskutils/tpb/pkg-plist	Fri Dec 20 21:48:14 2013	(r337092)
 @@ -1,5 +1,6 @@
  bin/tpb
  etc/tpbrc.default
 +man/man1/tpb.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh
  %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo
  %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184889: commit references a PR
Date: Sat, 21 Dec 2013 10:26:33 +0000 (UTC)

 Author: mat
 Date: Sat Dec 21 10:26:24 2013
 New Revision: 337126
 URL: http://svnweb.freebsd.org/changeset/ports/337126
 
 Log:
   MFH: r337092
   
   - Fix build with clang
   - Add LICENSE
   - Define OPTIONS, use options subs and helpers
   - Support staging
   
   PR:		ports/184889
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
   Approved by:	portmgr (implicit)
 
 Modified:
   branches/2014Q1/deskutils/tpb/Makefile
   branches/2014Q1/deskutils/tpb/pkg-plist   (contents, props changed)
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/deskutils/tpb/Makefile
 ==============================================================================
 --- branches/2014Q1/deskutils/tpb/Makefile	Sat Dec 21 10:25:23 2013	(r337125)
 +++ branches/2014Q1/deskutils/tpb/Makefile	Sat Dec 21 10:26:24 2013	(r337126)
 @@ -5,45 +5,44 @@ PORTNAME=	tpb
  PORTVERSION=	0.6.4
  PORTREVISION=	10
  CATEGORIES=	deskutils
 -MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 -MASTER_SITE_SUBDIR=	${PORTNAME}
 +MASTER_SITES=	SAVANNAH
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
  
 +LICENSE=	GPLv2
 +
  LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
  
 +OPTIONS_DEFINE=	DOCS NLS
 +OPTIONS_SUB=	yes
 +
  ONLY_FOR_ARCHS=	i386 amd64
  
 +USES=		bison gmake iconv pkgconfig
  GNU_CONFIGURE=	yes
 -USES=		bison iconv gmake pkgconfig
 -
  CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
  
 -MAN1=		tpb.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALABASE}/lib
  
 -.if ${PORT_OPTIONS:MNLS}
 -USES+=		gettext
 -PLIST_SUB+=	NLS=""
 -.else
 -CONFIGURE_ARGS+=--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 -.endif
 +NLS_USES=		gettext
 +NLS_CONFIGURE_OFF=	--disable-nls
  
  post-patch:
 -	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
 -		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 -		${WRKSRC}/src/cfg.h \
 -		${WRKSRC}/man/tpb.1
 +.for i in man/tpb.1 src/cfg.h
 +	@${REINPLACE_CMD} -e \
 +		's|%%PREFIX%%|${PREFIX}|g ; \
 +		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i}
 +.endfor
 +	@${REINPLACE_CMD} -e \
 +		's|void test()||' ${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default
 -.if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR}
 -.endif
 +	(cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \
 +		${STAGEDIR}${PREFIX}/etc/tpbrc.default)
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \
 +		${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 
 Modified: branches/2014Q1/deskutils/tpb/pkg-plist
 ==============================================================================
 --- branches/2014Q1/deskutils/tpb/pkg-plist	Sat Dec 21 10:25:23 2013	(r337125)
 +++ branches/2014Q1/deskutils/tpb/pkg-plist	Sat Dec 21 10:26:24 2013	(r337126)
 @@ -1,5 +1,6 @@
  bin/tpb
  etc/tpbrc.default
 +man/man1/tpb.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh
  %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo
  %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
