svn commit: r340196 - head/x11-fm/emelfm2

[Marcus von Appen]

Author: mva
Date: Sat Jan 18 16:45:55 2014
New Revision: 340196
URL: http://svnweb.freebsd.org/changeset/ports/340196
QAT: https://qat.redports.org/buildarchive/r340196/

Log:
  - Enable stagedir support
  - Add LICENSE
  - Simplify OPTIONS

Modified:
  head/x11-fm/emelfm2/Makefile
  head/x11-fm/emelfm2/pkg-plist

Modified: head/x11-fm/emelfm2/Makefile
==============================================================================
--- head/x11-fm/emelfm2/Makefile	Sat Jan 18 16:44:11 2014	(r340195)
+++ head/x11-fm/emelfm2/Makefile	Sat Jan 18 16:45:55 2014	(r340196)
@@ -8,6 +8,8 @@ MASTER_SITES=	http://emelfm2.net/rel/
 MAINTAINER=	mva at FreeBSD.org
 COMMENT=	The gtk2 port of emelfm, a fast graphical filemanager
 
+LICENSE=	GPLv3
+
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig
@@ -16,67 +18,31 @@ INSTALL_TARGET=	install
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-MAKE_ENV=	DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
-MAN1=		emelfm2.1
+MAKE_ENV=	DOC_DIR="${DOCSDIR}/"
 
 DOCFILES=	ACTIONS CONFIGURATION CREDITS GPL HACKING INSTALL LGPL NEWS \
 		README SPEC TODO USAGE WARNING
 
 OPTIONS_DEFINE=	DEBUG DOCS GAMIN THUMB TRACKER HAL NLS
 OPTIONS_DEFAULT=
+OPTIONS_SUB=	yes
+
 DEBUG_DESC=	Debugging messages
 GAMIN_DESC=	Use Gamin for file monitoring
 THUMB_DESC=	Thumbnail plugin
 TRACKER_DESC=	Tracker-UI plugin
 HAL_DESC=	Use HAL for automated device detection
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-MAK_ENV+=	DEBUG=1
-.endif
-
-.if ${PORT_OPTIONS:MGAMIN}
-USES+=		fam:gamin
-MAKE_ENV+=	USE_GAMIN=1
-.endif
-
-.if ${PORT_OPTIONS:MTHUMB}
-LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp
-MAKE_ENV+=	WITH_THUMB=1
-PLIST_SUB+=	THUMB=""
-.else
-PLIST_SUB+=	THUMB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTRACKER}
-MAKE_ENV+=	WITH_TRACKER=1
-PLIST_SUB+=	TRACKER=""
-.else
-PLIST_SUB+=	TRACKER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-INSTALL_TARGET+=install_i18n
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-MAKE_ENV+=	WITH_HAL=1
-LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
-.endfor
-.endif
+DEBUG_MAKE_ENV=		DEBUG=1
+GAMIN_USES=		fam:gamin
+GAMIN_MAKE_ENV=		USE_GAMIN=1
+THUMB_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
+THUMB_MAKE_ENV=		WITH_THUMB=1
+TRACKER_MAKE_ENV=	WITH_TRACKER=1
+NLS_USES=		gettext
+NLS_INSTALL_TARGET=	install_i18n
+HAL_MAKE_ENV=		WITH_HAL=1
+HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
 
 post-patch:
 # fix cross-arch compiling, which sets ${TARGET}
@@ -84,4 +50,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|TARGET|BINTARGET|' ${WRKSRC}/${mfile}
 .endfor
 
+do-install:
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		PREFIX="${STAGEDIR}/${PREFIX}" \
+		MAN_DIR="${STAGEDIR}${MAN1PREFIX}/man/man1" \
+		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>

Modified: head/x11-fm/emelfm2/pkg-plist
==============================================================================
--- head/x11-fm/emelfm2/pkg-plist	Sat Jan 18 16:44:11 2014	(r340195)
+++ head/x11-fm/emelfm2/pkg-plist	Sat Jan 18 16:45:55 2014	(r340196)
@@ -21,6 +21,7 @@ lib/emelfm2/plugins/e2p_times.so
 lib/emelfm2/plugins/e2p_unpack.so
 lib/emelfm2/plugins/e2p_upgrade.so
 lib/emelfm2/plugins/e2p_view.so
+man/man1/emelfm2.1.gz
 share/application-registry/emelfm2.applications
 share/applications/emelfm2.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ACTIONS