ports/113039: [Maintainer-update]: x11-fm/emelfm2 version update to 0.3.4
Marcus von Appen
mva at sysfault.org
Sat May 26 21:30:04 UTC 2007
>Number: 113039
>Category: ports
>Synopsis: [Maintainer-update]: x11-fm/emelfm2 version update to 0.3.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat May 26 21:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Marcus von Appen
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD magenta.linden.home 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat May 26 00:04:44 CEST 2007 root at magenta.linden.home:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Version update to 0.3.4
OPTIONize and add feature support.
Note to committer: A new file files/patch-e2_fs.c has to be added to CVS.
>How-To-Repeat:
>Fix:
diff -Nur emelfm2/Makefile emelfm2.new/Makefile
--- emelfm2/Makefile Sat May 19 22:28:53 2007
+++ emelfm2.new/Makefile Sat May 26 17:57:48 2007
@@ -6,8 +6,7 @@
#
PORTNAME= emelfm2
-PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.4
CATEGORIES= x11-fm
MASTER_SITES= http://www.emelfm2.net/rel/ \
${MASTER_SITE_LOCAL}
@@ -28,7 +27,49 @@
MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"
MAN1= emelfm2.1
+OPTIONS= DEBUG "Enable debugging messages" off \
+ GAMIN "Enable Gamin for file monitoring" off \
+ FAM "Enable FAM for file monitoring" off \
+ THUMB "Enable the thumbnail plugin" off \
+ TRACKER "Enable the tracker plugin" off \
+ NLS "Enable gettext support" on
+
.include <bsd.port.pre.mk>
+
+.if defined(WITH_DEBUG)
+MAK_ENV+= DEBUG=1
+.endif
+
+.if defined(WITH_GAMIN) && defined(WITH_FAM)
+BROKEN= "WITH_GAMIN and WITH_FAM cannot be enabled at the same time for this port"
+.endif
+
+.if defined(WITH_GAMIN)
+USE_FAM= yes
+WANT_FAM_SYSTEM=gamin
+MAKE_ENV+= USE_GAMIN=1
+.endif
+
+.if defined(WITH_FAM)
+USE_FAM= yes
+WANT_FAM_SYSTEM=fam
+MAKE_ENV+= USE_FAM=1
+.endif
+
+.if defined(WITH_THUMB)
+LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp
+MAKE_ENV+= WITH_THUMB=1
+PLIST_SUB+= THUMB=""
+.else
+PLIST_SUB+= THUMB="@comment "
+.endif
+
+.if defined(WITH_TRACKER)
+MAKE_ENV+= WITH_TRACKER=1
+PLIST_SUB+= TRACKER=""
+.else
+PLIST_SUB+= TRACKER="@comment "
+.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff -Nur emelfm2/distinfo emelfm2.new/distinfo
--- emelfm2/distinfo Sat Mar 24 15:42:35 2007
+++ emelfm2.new/distinfo Sat May 26 16:14:50 2007
@@ -1,3 +1,3 @@
-MD5 (emelfm2-0.3.3.tar.gz) = 6ce56f2d4d0dc9bd2cacd5dabaa49c0a
-SHA256 (emelfm2-0.3.3.tar.gz) = 2163ec4596a2731a849e7d44327c65407e2a5e7b64cf5bcd412c91c17cd898ad
-SIZE (emelfm2-0.3.3.tar.gz) = 960866
+MD5 (emelfm2-0.3.4.tar.gz) = 08e28e4bb54fc731560402157df63af8
+SHA256 (emelfm2-0.3.4.tar.gz) = a0a6e60d54c5ca52b1a6467b79d25b1001d662f5ffb51c8446541826e068f8c8
+SIZE (emelfm2-0.3.4.tar.gz) = 992183
diff -Nur emelfm2/files/patch-Makefile emelfm2.new/files/patch-Makefile
--- emelfm2/files/patch-Makefile Wed Nov 22 16:42:17 2006
+++ emelfm2.new/files/patch-Makefile Sat May 26 16:17:40 2007
@@ -1,42 +1,43 @@
---- Makefile.orig Tue Nov 14 23:36:30 2006
-+++ Makefile Wed Nov 22 12:54:18 2006
-@@ -57,7 +57,7 @@
- endif
- ICON_DIR ?= $(PREFIX)/share/pixmaps/$(TARGET)/
- LOCALE_DIR ?= $(PREFIX)/share/locale/
--MAN_DIR ?= $(PREFIX)/share/man/man1/
-+MAN_DIR ?= $(PREFIX)/man/man1/
+--- Makefile.orig Sat May 26 16:15:40 2007
++++ Makefile Sat May 26 16:17:20 2007
+@@ -56,7 +56,7 @@
- OBJECTS_DIR = objs
- # object directories that have to be created
-@@ -147,17 +147,17 @@
+ #these are only used here for installation purposes
+ BIN_DIR = $(PREFIX)/bin
+-MAN_DIR = $(PREFIX)/share/man/man1
++MAN_DIR = $(PREFIX)/man/man1
+ #as well as usage here, all in-code uses of these is assumed localised
+ ifeq ($(DOCS_VERSION), 1)
+ DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
+@@ -202,7 +202,7 @@
lLDFLAGS = $(LDFLAGS)
# -lrt needed for clock_gettime()
-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
ifeq ($(USE_FAM),1)
- lLIBS += -lfam
+ lLIBS += -lfam
endif
- ifeq ($(EDITOR_SPELLCHECK),1)
- lLIBS += -lgtkspell
+@@ -220,10 +220,10 @@
endif
--ifeq ($(OPSY),FreeBSD)
-- OSREL = $(shell sysctl -n kern.osreldate)
-- lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
+ # should not need translation
+ OPSYS := $(shell uname)
+-ifeq ($(OPSYS),FreeBSD)
+-OSREL = $(shell sysctl -n kern.osreldate)
+-lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
-endif
-+#ifeq ($(OPSY),FreeBSD)
-+# OSREL = $(shell sysctl -n kern.osreldate)
-+# lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
++#ifeq ($(OPSYS),FreeBSD)
++#OSREL = $(shell sysctl -n kern.osreldate)
++#lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
+#endif
- .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
- clean deps marshals gettext i18n install_i18n uninstall_i18n \
-@@ -182,7 +182,6 @@
+ #for gvfs development
+ ifeq ($(WITH_GVFS),1)
+@@ -253,7 +253,6 @@
done
@install -d $(MAN_DIR)
@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
-- @bzip2 -f $(MAN_DIR)$(TARGET).1;
+- @bzip2 -f $(MAN_DIR)/$(TARGET).1;
- ifeq ($(XGD_INTEGRATION), 1)
- @install -d $(XGD_DESKTOP_DIR)
+ ifeq ($(XDG_INTEGRATION), 1)
+ @install -d $(XDG_DESKTOP_DIR)
diff -Nur emelfm2/files/patch-Makefile.config emelfm2.new/files/patch-Makefile.config
--- emelfm2/files/patch-Makefile.config Sun Nov 5 11:09:23 2006
+++ emelfm2.new/files/patch-Makefile.config Sat May 26 16:18:43 2007
@@ -1,6 +1,6 @@
---- Makefile.config.orig Fri Nov 3 00:37:10 2006
-+++ Makefile.config Fri Nov 3 00:38:07 2006
-@@ -84,9 +84,9 @@
+--- Makefile.config.orig Sat May 26 16:15:48 2007
++++ Makefile.config Sat May 26 16:18:11 2007
+@@ -137,9 +137,9 @@
ifeq ($(DEBUG), 1)
#additional CFLAGS -g -O0 will always be added when in debug mode
#CFLAGS = -Wall -Wextra -Wno-unused -Winline
diff -Nur emelfm2/files/patch-e2_fs.c emelfm2.new/files/patch-e2_fs.c
--- emelfm2/files/patch-e2_fs.c Thu Jan 1 01:00:00 1970
+++ emelfm2.new/files/patch-e2_fs.c Sat May 26 16:20:51 2007
@@ -0,0 +1,12 @@
+--- src/filesystem/e2_fs.c.orig Sat May 26 16:19:06 2007
++++ src/filesystem/e2_fs.c Sat May 26 16:20:08 2007
+@@ -40,7 +40,8 @@
+ #include <langinfo.h>
+ #include <pwd.h>
+ #include <grp.h>
+-#include <sys/statfs.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+ #ifndef MNT_LOCAL
+ # include <sys/statvfs.h>
+ #endif
diff -Nur emelfm2/pkg-plist emelfm2.new/pkg-plist
--- emelfm2/pkg-plist Tue Jan 23 17:32:37 2007
+++ emelfm2.new/pkg-plist Sat May 26 16:54:56 2007
@@ -13,7 +13,7 @@
lib/emelfm2/plugins/e2p_rename_ext.so
lib/emelfm2/plugins/e2p_sort_by_ext.so
lib/emelfm2/plugins/e2p_times.so
-lib/emelfm2/plugins/e2p_track.so
+%%TRACKER%%lib/emelfm2/plugins/e2p_track.so
lib/emelfm2/plugins/e2p_unpack.so
lib/emelfm2/plugins/e2p_upgrade.so
lib/emelfm2/plugins/e2p_view.so
@@ -77,7 +77,7 @@
share/pixmaps/emelfm2/plugin_pack_48.png
share/pixmaps/emelfm2/plugin_rename_48.png
share/pixmaps/emelfm2/plugin_timeset_48.png
-share/pixmaps/emelfm2/plugin_track_48.png
+%%TRACKER%%share/pixmaps/emelfm2/plugin_track_48.png
share/pixmaps/emelfm2/plugin_unpack_48.png
share/pixmaps/emelfm2/ps_48.png
share/pixmaps/emelfm2/save_selection_48.png
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list