svn commit: r339001 - head/misc/lxde-common

[Rusmir Dusko]

Author: nemysis
Date: Tue Jan  7 11:40:58 2014
New Revision: 339001
URL: http://svnweb.freebsd.org/changeset/ports/339001

Log:
  - USES gmake instead of USE_GMAKE
  - Support STAGEDIR
  - Break lines around 80 characters

Modified:
  head/misc/lxde-common/Makefile
  head/misc/lxde-common/pkg-plist   (contents, props changed)

Modified: head/misc/lxde-common/Makefile
==============================================================================
--- head/misc/lxde-common/Makefile	Tue Jan  7 11:15:59 2014	(r339000)
+++ head/misc/lxde-common/Makefile	Tue Jan  7 11:40:58 2014	(r339001)
@@ -12,7 +12,7 @@ COMMENT=	LXDE Common files
 
 LICENSE=	GPLv2
 
-USES=		iconv
+USES=		gmake iconv
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -21,31 +21,21 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		GMSGFMT="${LOCALBASE}/bin/msgfmt" \
 		--with-xsession-path=${PREFIX}/share/xsessions \
 		--with-xdg-path=${PREFIX}/share/applications
-USE_GMAKE=	yes
 
 DATADIR=	${PREFIX}/share/lxde
 INSTALLS_ICONS=	YES
 
-MAN1=		startlxde.1 lxde-logout.1 openbox-lxde.1
-
 PORTDOCS=	AUTHORS README
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/desktop.conf ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf.sample
-	@[ -f ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/desktop.conf ${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf
-	@[ -f ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf ${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/desktop.conf \
+		${STAGEDIR}${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/pcmanfm/pcmanfm.conf \
+		${STAGEDIR}${PREFIX}/etc/xdg/pcmanfm/LXDE/pcmanfm.conf.sample
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/misc/lxde-common/pkg-plist
==============================================================================
--- head/misc/lxde-common/pkg-plist	Tue Jan  7 11:15:59 2014	(r339000)
+++ head/misc/lxde-common/pkg-plist	Tue Jan  7 11:40:58 2014	(r339001)
@@ -8,6 +8,9 @@ etc/xdg/lxsession/LXDE/desktop.conf.samp
 @unexec if cmp -s %D/etc/xdg/pcmanfm/LXDE/pcmanfm.conf %D/etc/xdg/pcmanfm/LXDE/pcmanfm.conf.sample; then rm -f %D/etc/xdg/pcmanfm/LXDE/pcmanfm.conf; fi
 etc/xdg/pcmanfm/LXDE/pcmanfm.conf.sample
 @exec if [ ! -f %D/etc/xdg/pcmanfm/LXDE/pcmanfm.conf ] ; then cp -p %D/%F %B/pcmanfm.conf; fi
+man/man1/lxde-logout.1.gz
+man/man1/openbox-lxde.1.gz
+man/man1/startlxde.1.gz
 share/applications/lxde-logout.desktop
 share/lxde/images/logout-banner.png
 share/lxde/images/lxde-icon.png