From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 31 19:40:08 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org 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 ESMTP id BF08C3C9 for ; Thu, 31 Oct 2013 19:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ACB512C12 for ; Thu, 31 Oct 2013 19:40:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VJe8I6065472 for ; Thu, 31 Oct 2013 19:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9VJe8OS065471; Thu, 31 Oct 2013 19:40:08 GMT (envelope-from gnats) Date: Thu, 31 Oct 2013 19:40:08 GMT Message-Id: <201310311940.r9VJe8OS065471@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: KATO Tsuguru Subject: Re: ports/181071: x11-wm/clementine: Support CXX/CXXFLAGS properly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: KATO Tsuguru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 19:40:08 -0000 The following reply was made to PR ports/181071; it has been noted by GNATS. From: KATO Tsuguru To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/181071: x11-wm/clementine: Support CXX/CXXFLAGS properly Date: Fri, 1 Nov 2013 04:26:10 +0900 This is a multi-part message in MIME format. --Multipart=_Fri__1_Nov_2013_04_26_10_+0900_LX8Ck6TeTYb=d1An Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Remake of the patch against current tree. --Multipart=_Fri__1_Nov_2013_04_26_10_+0900_LX8Ck6TeTYb=d1An Content-Type: text/x-diff; name="x11-wm_clementine.diff" Content-Disposition: attachment; filename="x11-wm_clementine.diff" Content-Transfer-Encoding: 7bit diff -urN /usr/ports/x11-wm/clementine/Makefile x11-wm/clementine/Makefile --- /usr/ports/x11-wm/clementine/Makefile 2013-09-22 01:11:13.000000000 +0900 +++ x11-wm/clementine/Makefile 2013-11-01 00:00:00.000000000 +0900 @@ -3,61 +3,67 @@ PORTNAME= clementine PORTVERSION= 0.0.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/Source/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Has title bars, iconizing, and styles (unstable) +LICENSE= GPLv2 MIT +LICENSE_COMB= multi + RUN_DEPENDS= xv:${PORTSDIR}/graphics/xv \ rxvt:${PORTSDIR}/x11/rxvt -PLIST= ${WRKDIR}/pkg-plist -PKGMESSAGE= ${WRKDIR}/pkg-message -USE_GMAKE= yes +OPTIONS_DEFINE= DOCS + +USES= gmake USE_XORG= x11 -DOCS= COPYING HISTORY LICENSE -REINPLACE_ARGS= -i'' -E -NO_STAGE= yes +PKGMESSAGE= ${WRKDIR}/pkg-message + +PORTDOCS= HISTORY LICENSE +PLIST_FILES= bin/clementine \ + %%DATADIR%%/look-black \ + %%DATADIR%%/look-black2 \ + %%DATADIR%%/look-blue \ + %%DATADIR%%/look-celadon \ + %%DATADIR%%/look-grey \ + %%DATADIR%%/look-taupe \ + %%DATADIR%%/look-turq \ + %%DATADIR%%/look-xemacs \ + %%DATADIR%%/keys +PLIST_DIRS= %%DATADIR%% + +.include + post-patch: - ${REINPLACE_CMD} 's:^CFLAGS:IGNORE:g ; s:^DEFINES:IGNORE:g ;\ - s:/usr/X11R6:${LOCALBASE}:g' \ + @${REINPLACE_CMD} -e \ + 's|/usr/X11R6|${LOCALBASE}| ; \ + s|$$(CC)|$$(CXX)| ; \ + s|$$(CFLAGS)|$$(CXXFLAGS)| ; \ + s|$$(DEFINES)||' \ ${WRKSRC}/Makefile - ${REINPLACE_CMD} 's:./clementine:${PREFIX}/bin/clementine:g' \ + @${REINPLACE_CMD} -e \ + 's|./clementine|${PREFIX}/bin/clementine|' \ ${WRKSRC}/windowmanager.cpp -pre-install: - ${ECHO_CMD} bin/clementine > ${PLIST} - for i in `${LS} ${WRKSRC} | ${GREP} look-`; do \ - ${ECHO_CMD} share/clementine/$$i >> ${PLIST}; \ - done - ${ECHO_CMD} share/clementine/keys >> ${PLIST} -.if !defined(NOPORTDOCS) -.for i in ${DOCS} - ${ECHO_CMD} share/doc/clementine/${i} >> ${PLIST} -.endfor - ${ECHO_CMD} @dirrm share/doc/clementine >> ${PLIST} -.endif - ${ECHO_CMD} @dirrm share/clementine >> ${PLIST} - ${ECHO_CMD} "*" > ${PKGMESSAGE} - ${ECHO_CMD} "* To customize clementine, copy the keys file to ~/keys and" >> ${PKGMESSAGE} - ${ECHO_CMD} "* copy one of the look- files to ~/look; edit them as needed." >> ${PKGMESSAGE} - ${ECHO_CMD} "*" >> ${PKGMESSAGE} +pre-build: + @${ECHO_CMD} "*" > ${PKGMESSAGE} + @${ECHO_CMD} "* To customize clementine, copy the keys file to ~/keys and" >> ${PKGMESSAGE} + @${ECHO_CMD} "* copy one of the look- files to ~/look; edit them as needed." >> ${PKGMESSAGE} + @${ECHO_CMD} "*" >> ${PKGMESSAGE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/clementine ${PREFIX}/bin - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/keys ${WRKSRC}/look-* ${DATADIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_PROGRAM} clementine ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} +.for i in look-* keys + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DATADIR}) +.endfor + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} .include --Multipart=_Fri__1_Nov_2013_04_26_10_+0900_LX8Ck6TeTYb=d1An--