Date: Tue, 6 Aug 2013 02:55:06 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/181071: x11-wm/clementine: Support CXX/CXXFLAGS properly Message-ID: <20130806025506.088c24d419e9da41b91b8445@yahoo.com> Resent-Message-ID: <201308051810.r75IA5He020259@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
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 <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130806025506.088c24d419e9da41b91b8445>