From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 5 18:10:06 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 04EFF43F for ; Mon, 5 Aug 2013 18:10:06 +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 D815E2CF2 for ; Mon, 5 Aug 2013 18:10:05 +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 r75IA5J3020260 for ; Mon, 5 Aug 2013 18:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r75IA5He020259; Mon, 5 Aug 2013 18:10:05 GMT (envelope-from gnats) Resent-Date: Mon, 5 Aug 2013 18:10:05 GMT Resent-Message-Id: <201308051810.r75IA5He020259@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 612CA32E for ; Mon, 5 Aug 2013 18:02:43 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from omta03.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id 091542C71 for ; Mon, 5 Aug 2013 18:02:42 +0000 (UTC) Received: from localhost.localdomain (ZT034070.ppp.dion.ne.jp [59.128.34.70]) by omta03.auone-net.jp (au one net mail) with ESMTP id 736E6188000B for ; Tue, 6 Aug 2013 03:02:40 +0900 (JST) Message-Id: <20130806025506.088c24d419e9da41b91b8445@yahoo.com> Date: Tue, 6 Aug 2013 02:55:06 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/181071: x11-wm/clementine: Support CXX/CXXFLAGS properly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2013 18:10:06 -0000 >Number: 181071 >Category: ports >Synopsis: x11-wm/clementine: Support CXX/CXXFLAGS properly >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 05 18:10:05 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Support CXX/CXXFLAGS properly - Support OPTIONS_DEFINE - Support PLIST_FILES - Add LICENSE >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/clementine/Makefile x11-wm/clementine/Makefile --- /usr/ports/x11-wm/clementine/Makefile 2013-06-21 03:47:55.000000000 +0900 +++ x11-wm/clementine/Makefile 2013-08-06 00:00:00.000000000 +0900 @@ -3,60 +3,69 @@ 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 + +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 + +.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 ${PREFIX}/bin) + @${MKDIR} ${DATADIR} +.for i in look-* keys + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DATADIR}) +.endfor +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) .endfor .endif - -post-install: @${CAT} ${PKGMESSAGE} .include >Release-Note: >Audit-Trail: >Unformatted: