- 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>

2 files changed, 40 insertions, 40 deletions

diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index 36f437bea1e3..fc85e53fcae4 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -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>
diff --git a/x11-wm/clementine/pkg-message b/x11-wm/clementine/pkg-message
new file mode 100644
index 000000000000..1cb3c35e3f66
--- /dev/null
+++ b/x11-wm/clementine/pkg-message
@@ -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.
+*