- Update to 0.8.2

- Convert to OptionsNG framework
- Trim Makefile headers

3 files changed, 42 insertions, 32 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 2cb6e0dafea7..b9aed29eda35 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:   emelfm2
-# Date created:        01 Novemeber 2003
-# Whom:                Marcus von Appen
-#
 # $FreeBSD$
-#
 
 PORTNAME=	emelfm2
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
@@ -25,29 +19,30 @@ LDFLAGS+=	${PTHREAD_LIBS}
 MAKE_ENV=	DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
 MAN1=		emelfm2.1
 
-OPTIONS=	DEBUG	"Enable debugging messages" off \
-		GAMIN 	"Enable Gamin for file monitoring" off \
-		THUMB	"Enable the thumbnail plugin" off \
-		TRACKER	"Enable the tracker plugin" off \
-		HAL	"Enable HAL support" off \
-		NLS	"Enable gettext support" on
-
 DOCFILES=	ACTIONS CONFIGURATION CREDITS GPL HACKING INSTALL LGPL NEWS \
 		README SPEC TODO USAGE WARNING
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DEBUG DOCS GAMIN THUMB TRACKER HAL NLS
+OPTIONS_DEFAULT=
+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
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 MAK_ENV+=	DEBUG=1
 .endif
 
-.if defined(WITH_GAMIN)
+.if ${PORT_OPTIONS:MGAMIN}
 USE_FAM=	yes
 WANT_FAM_SYSTEM=gamin
 MAKE_ENV+=	USE_GAMIN=1
 .endif
 
-.if defined(WITH_THUMB)
+.if ${PORT_OPTIONS:MTHUMB}
 LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp
 MAKE_ENV+=	WITH_THUMB=1
 PLIST_SUB+=	THUMB=""
@@ -55,14 +50,14 @@ PLIST_SUB+=	THUMB=""
 PLIST_SUB+=	THUMB="@comment "
 .endif
 
-.if defined(WITH_TRACKER)
+.if ${PORT_OPTIONS:MTRACKER}
 MAKE_ENV+=	WITH_TRACKER=1
 PLIST_SUB+=	TRACKER=""
 .else
 PLIST_SUB+=	TRACKER="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 INSTALL_TARGET+=install_i18n
 PLIST_SUB+=	NLS=""
@@ -70,12 +65,12 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined (WITH_HAL)
+.if ${PORT_OPTIONS:MHAL}
 MAKE_ENV+=	WITH_HAL=1
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
@@ -83,4 +78,10 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+# fix cross-arch compiling, which sets ${TARGET}
+.for mfile in Makefile Makefile.config
+	@${REINPLACE_CMD} -e 's|TARGET|BINTARGET|' ${WRKSRC}/${mfile}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/x11-fm/emelfm2/distinfo b/x11-fm/emelfm2/distinfo
index 12c51a1f898a..fb2c450ba473 100644
--- a/x11-fm/emelfm2/distinfo
+++ b/x11-fm/emelfm2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emelfm2-0.8.1.tar.bz2) = d38355628360e6bcdb69ef4affff03dd9f7cc9bd25c999b18b648a23c6f8bba7
-SIZE (emelfm2-0.8.1.tar.bz2) = 1098199
+SHA256 (emelfm2-0.8.2.tar.bz2) = 230bf59f2bbf22d56f434bb9b5e7a2eb9bb7c608fc0b6749dd462a8b6f5fe881
+SIZE (emelfm2-0.8.2.tar.bz2) = 1117651
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index 2a39e01919b1..377189db7f00 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-03-16 09:11:47.000000000 +0100
-+++ Makefile	2012-04-23 08:12:55.000000000 +0200
-@@ -274,7 +274,7 @@
+--- Makefile.orig	2012-12-05 02:03:10.000000000 +0100
++++ Makefile	2012-12-21 10:29:40.000000000 +0100
+@@ -288,7 +288,7 @@
   lLIBS += $(shell pkg-config --libs gmodule-2.0)
  endif
  # -lrt needed for clock_gettime(), explicit -lm, -ldl needed for some arch-linux distros
@@ -9,14 +9,23 @@
  ifeq ($(USE_GAMIN), 1)
  #gamin code is a superset of FAM code, so gamin needs fam as well
  lLIBS += -lfam
-@@ -319,10 +319,6 @@
+@@ -305,7 +305,7 @@
+  ifeq ($(EXTDBUS), 1)
+   lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
+  else
+-  lLIBS += $(shell pkg-config --libs dbus-1 hal hal-storage)
++  lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
+  endif
+ endif
+ endif
+@@ -333,10 +333,6 @@
  	@for file in `ls $(ICONS)/ |grep -v svn`; do \
  		install -m 644 $(ICONS)/$$file $(ICON_DIR); \
  	done
 -	@install -d $(DOC_DIR)
--	@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
+-	@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v emelfm2.1`; do \
 -		install -m 644 $(DOCS)/$$file $(DOC_DIR); \
 -	done
  	@install -d $(MAN_DIR)
- 	@install -m 644 $(DOCS)/$(TARGET).1 $(MAN_DIR);
+ 	@install -m 644 $(DOCS)/emelfm2.1 $(MAN_DIR)/$(TARGET).1;