Bug 181071 - x11-wm/clementine: Support CXX/CXXFLAGS properly
Summary: x11-wm/clementine: Support CXX/CXXFLAGS properly
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-08-05 19:10 UTC by tkato432
Modified: 2013-11-02 15:30 UTC (History)
0 users

See Also:


Attachments
file.diff (3.15 KB, patch)
2013-08-05 19:10 UTC, tkato432
no flags Details | Diff
x11-wm_clementine.diff (3.18 KB, patch)
2013-08-16 18:59 UTC, tkato432
no flags Details | Diff
x11-wm_clementine.diff (3.22 KB, patch)
2013-10-31 19:26 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-08-05 19:10:05 UTC
- Support CXX/CXXFLAGS properly
- Support OPTIONS_DEFINE
- Support PLIST_FILES
- Add LICENSE
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-05 19:11:45 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-08-14 09:41:12 UTC
State Changed
From-To: open->feedback

fail to package 
https://po.miwibox.org/latest-per-pkg/clementine/0.0.7_7/
Comment 3 tkato432 2013-08-16 18:59:45 UTC
Here is the corrected patch.
Comment 4 Bryan Drewery freebsd_committer freebsd_triage 2013-09-22 15:13:29 UTC
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Back to the heap due to timeout
Comment 5 tkato432 2013-10-31 19:26:10 UTC
Remake of the patch against current tree.
Comment 6 Pawel Pekala freebsd_committer freebsd_triage 2013-11-02 15:02:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 7 Pawel Pekala freebsd_committer freebsd_triage 2013-11-02 15:20:23 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!
Comment 8 dfilter service freebsd_committer freebsd_triage 2013-11-02 15:20:28 UTC
Author: pawel
Date: Sat Nov  2 15:20:14 2013
New Revision: 332498
URL: http://svnweb.freebsd.org/changeset/ports/332498

Log:
  - Add LICENSE
  - Respect CXX/CXXFLAGS
  - Convert to new options framework
  - Support staging
  
  While here:
  - Make COMMENT more descriptive
  - Use pkg-message instead of echo hacks
  
  PR:		ports/181071
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/x11-wm/clementine/pkg-message   (contents, props changed)
Modified:
  head/x11-wm/clementine/Makefile

Modified: head/x11-wm/clementine/Makefile
==============================================================================
--- head/x11-wm/clementine/Makefile	Sat Nov  2 15:20:14 2013	(r332497)
+++ head/x11-wm/clementine/Makefile	Sat Nov  2 15:20:14 2013	(r332498)
@@ -3,61 +3,57 @@
 
 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)
+COMMENT=	Window manager based on aewm with title bars, iconization, and styles
+
+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
+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%%
+
 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}
-
 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>

Added: head/x11-wm/clementine/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/clementine/pkg-message	Sat Nov  2 15:20:14 2013	(r332498)
@@ -0,0 +1,4 @@
+*
+* To customize clementine, copy the keys file to ~/keys and
+* copy one of the look- files to ~/look; edit them as needed.
+*
_______________________________________________
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"