Date: Thu, 31 Oct 2013 19:40:08 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181071: x11-wm/clementine: Support CXX/CXXFLAGS properly Message-ID: <201310311940.r9VJe8OS065471@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181071; it has been noted by GNATS.
From: KATO Tsuguru <tkato432@yahoo.com>
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 <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 ${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 <bsd.port.mk>
--Multipart=_Fri__1_Nov_2013_04_26_10_+0900_LX8Ck6TeTYb=d1An--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311940.r9VJe8OS065471>