Attachment #78599 for bug #113039

View | Details | Raw Unified | Return to bug 113039
Collapse All | Expand All




#

PORTNAME=	emelfm2
PORTVERSION=	0.3.4
PORTREVISION=	1
CATEGORIES=	x11-fm
MASTER_SITES=	http://www.emelfm2.net/rel/ \
		${MASTER_SITE_LOCAL}

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

Lines 1-3 Link Here

(-)emelfm2.new/distinfo (-3 / +3 lines)
1	MD5 (emelfm2-0.3.3.tar.gz) = 6ce56f2d4d0dc9bd2cacd5dabaa49c0a	1	MD5 (emelfm2-0.3.4.tar.gz) = 08e28e4bb54fc731560402157df63af8
2	SHA256 (emelfm2-0.3.3.tar.gz) = 2163ec4596a2731a849e7d44327c65407e2a5e7b64cf5bcd412c91c17cd898ad	2	SHA256 (emelfm2-0.3.4.tar.gz) = a0a6e60d54c5ca52b1a6467b79d25b1001d662f5ffb51c8446541826e068f8c8
3	SIZE (emelfm2-0.3.3.tar.gz) = 960866	3	SIZE (emelfm2-0.3.4.tar.gz) = 992183




--- Makefile.orig	Sat May 26 16:15:40 2007
+++ Makefile	Sat May 26 16:17:20 2007
@@ -56,7 +56,7 @@
 endif
 ICON_DIR ?= $(PREFIX)/share/pixmaps/$(TARGET)/
 LOCALE_DIR ?= $(PREFIX)/share/locale/
-MAN_DIR ?= $(PREFIX)/share/man/man1/
+MAN_DIR ?= $(PREFIX)/man/man1/
 
 #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
 endif
@@ -220,10 +220,10 @@
 	lLIBS += -lgtkspell
 endif
 # 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 ($(OPSYS),FreeBSD)
+#OSREL = $(shell sysctl -n kern.osreldate)
+#lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
+#endif
 
 #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;
 
 ifeq ($(XDG_INTEGRATION), 1)
 		@install -d $(XDG_DESKTOP_DIR)

Lines 1-6 Link Here

(-)emelfm2.new/files/patch-Makefile.config (-3 / +3 lines)
1	--- Makefile.config.orig Fri Nov 3 00:37:10 2006	1	--- Makefile.config.orig Sat May 26 16:15:48 2007
2	+++ Makefile.config Fri Nov 3 00:38:07 2006	2	+++ Makefile.config Sat May 26 16:18:11 2007
3	@@ -84,9 +84,9 @@	3	@@ -137,9 +137,9 @@
4	ifeq ($(DEBUG), 1)	4	ifeq ($(DEBUG), 1)
5	#additional CFLAGS -g -O0 will always be added when in debug mode	5	#additional CFLAGS -g -O0 will always be added when in debug mode
6	#CFLAGS = -Wall -Wextra -Wno-unused -Winline	6	#CFLAGS = -Wall -Wextra -Wno-unused -Winline




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

Return to bug 113039

Lines 6-13 Link Here

(-)emelfm2.new/Makefile (-2 / +43 lines)
6	#	6	#
7		7
8	PORTNAME= emelfm2	8	PORTNAME= emelfm2
9	PORTVERSION= 0.3.3	9	PORTVERSION= 0.3.4
10	PORTREVISION= 1
11	CATEGORIES= x11-fm	10	CATEGORIES= x11-fm
12	MASTER_SITES= http://www.emelfm2.net/rel/ \	11	MASTER_SITES= http://www.emelfm2.net/rel/ \
13	${MASTER_SITE_LOCAL}	12	${MASTER_SITE_LOCAL}
Lines 28-34 Link Here
28	MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"	27	MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"
29	MAN1= emelfm2.1	28	MAN1= emelfm2.1
30		29
		30	OPTIONS= DEBUG "Enable debugging messages" off \
		31	GAMIN "Enable Gamin for file monitoring" off \
		32	FAM "Enable FAM for file monitoring" off \
		33	THUMB "Enable the thumbnail plugin" off \
		34	TRACKER "Enable the tracker plugin" off \
		35	NLS "Enable gettext support" on
		36
31	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
		38
		39	.if defined(WITH_DEBUG)
		40	MAK_ENV+= DEBUG=1
		41	.endif
		42
		43	.if defined(WITH_GAMIN) && defined(WITH_FAM)
		44	BROKEN= "WITH_GAMIN and WITH_FAM cannot be enabled at the same time for this port"
		45	.endif
		46
		47	.if defined(WITH_GAMIN)
		48	USE_FAM= yes
		49	WANT_FAM_SYSTEM=gamin
		50	MAKE_ENV+= USE_GAMIN=1
		51	.endif
		52
		53	.if defined(WITH_FAM)
		54	USE_FAM= yes
		55	WANT_FAM_SYSTEM=fam
		56	MAKE_ENV+= USE_FAM=1
		57	.endif
		58
		59	.if defined(WITH_THUMB)
		60	LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp
		61	MAKE_ENV+= WITH_THUMB=1
		62	PLIST_SUB+= THUMB=""
		63	.else
		64	PLIST_SUB+= THUMB="@comment "
		65	.endif
		66
		67	.if defined(WITH_TRACKER)
		68	MAKE_ENV+= WITH_TRACKER=1
		69	PLIST_SUB+= TRACKER=""
		70	.else
		71	PLIST_SUB+= TRACKER="@comment "
		72	.endif
32		73
33	.if !defined(WITHOUT_NLS)	74	.if !defined(WITHOUT_NLS)
34	USE_GETTEXT= yes	75	USE_GETTEXT= yes

Lines 1-42 Link Here

(-)emelfm2.new/files/patch-Makefile (-26 / +27 lines)
1	--- Makefile.orig Tue Nov 14 23:36:30 2006	1	--- Makefile.orig Sat May 26 16:15:40 2007
2	+++ Makefile Wed Nov 22 12:54:18 2006	2	+++ Makefile Sat May 26 16:17:20 2007
3	@@ -57,7 +57,7 @@	3	@@ -56,7 +56,7 @@
4	endif
5	ICON_DIR ?= $(PREFIX)/share/pixmaps/$(TARGET)/
6	LOCALE_DIR ?= $(PREFIX)/share/locale/
7	-MAN_DIR ?= $(PREFIX)/share/man/man1/
8	+MAN_DIR ?= $(PREFIX)/man/man1/
9		4
10	OBJECTS_DIR = objs	5	#these are only used here for installation purposes
11	# object directories that have to be created	6	BIN_DIR = $(PREFIX)/bin
12	@@ -147,17 +147,17 @@	7	-MAN_DIR = $(PREFIX)/share/man/man1
		8	+MAN_DIR = $(PREFIX)/man/man1
		9	#as well as usage here, all in-code uses of these is assumed localised
		10	ifeq ($(DOCS_VERSION), 1)
		11	DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
		12	@@ -202,7 +202,7 @@
13		13
14	lLDFLAGS = $(LDFLAGS)	14	lLDFLAGS = $(LDFLAGS)
15	# -lrt needed for clock_gettime()	15	# -lrt needed for clock_gettime()
16	-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt	16	-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
17	+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)	17	+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
18	ifeq ($(USE_FAM),1)	18	ifeq ($(USE_FAM),1)
19	lLIBS += -lfam	19	lLIBS += -lfam
20	endif	20	endif
21	ifeq ($(EDITOR_SPELLCHECK),1)	21	@@ -220,10 +220,10 @@
22	lLIBS += -lgtkspell
23	endif	22	endif
24	-ifeq ($(OPSY),FreeBSD)	23	# should not need translation
25	- OSREL = $(shell sysctl -n kern.osreldate)	24	OPSYS := $(shell uname)
26	- lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)	25	-ifeq ($(OPSYS),FreeBSD)
		26	-OSREL = $(shell sysctl -n kern.osreldate)
		27	-lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
27	-endif	28	-endif
28	+#ifeq ($(OPSY),FreeBSD)	29	+#ifeq ($(OPSYS),FreeBSD)
29	+# OSREL = $(shell sysctl -n kern.osreldate)	30	+#OSREL = $(shell sysctl -n kern.osreldate)
30	+# lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)	31	+#lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
31	+#endif	32	+#endif
32		33
33	.PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \	34	#for gvfs development
34	clean deps marshals gettext i18n install_i18n uninstall_i18n \	35	ifeq ($(WITH_GVFS),1)
35	@@ -182,7 +182,6 @@	36	@@ -253,7 +253,6 @@
36	done	37	done
37	@install -d $(MAN_DIR)	38	@install -d $(MAN_DIR)
38	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);	39	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
39	- @bzip2 -f $(MAN_DIR)$(TARGET).1;	40	- @bzip2 -f $(MAN_DIR)/$(TARGET).1;
40		41
41	ifeq ($(XGD_INTEGRATION), 1)	42	ifeq ($(XDG_INTEGRATION), 1)
42	@install -d $(XGD_DESKTOP_DIR)	43	@install -d $(XDG_DESKTOP_DIR)

Line 0 Link Here

(-)emelfm2.new/files/patch-e2_fs.c (+12 lines)
	1	--- src/filesystem/e2_fs.c.orig Sat May 26 16:19:06 2007
	2	+++ src/filesystem/e2_fs.c Sat May 26 16:20:08 2007
	3	@@ -40,7 +40,8 @@
	4	#include <langinfo.h>
	5	#include <pwd.h>
	6	#include <grp.h>
	7	-#include <sys/statfs.h>
	8	+#include <sys/param.h>
	9	+#include <sys/mount.h>
	10	#ifndef MNT_LOCAL
	11	# include <sys/statvfs.h>
	12	#endif

Lines 13-19 Link Here

(-)emelfm2.new/pkg-plist (-2 / +2 lines)
13	lib/emelfm2/plugins/e2p_rename_ext.so	13	lib/emelfm2/plugins/e2p_rename_ext.so
14	lib/emelfm2/plugins/e2p_sort_by_ext.so	14	lib/emelfm2/plugins/e2p_sort_by_ext.so
15	lib/emelfm2/plugins/e2p_times.so	15	lib/emelfm2/plugins/e2p_times.so
16	lib/emelfm2/plugins/e2p_track.so	16	%%TRACKER%%lib/emelfm2/plugins/e2p_track.so
17	lib/emelfm2/plugins/e2p_unpack.so	17	lib/emelfm2/plugins/e2p_unpack.so
18	lib/emelfm2/plugins/e2p_upgrade.so	18	lib/emelfm2/plugins/e2p_upgrade.so
19	lib/emelfm2/plugins/e2p_view.so	19	lib/emelfm2/plugins/e2p_view.so
Lines 77-83 Link Here
77	share/pixmaps/emelfm2/plugin_pack_48.png	77	share/pixmaps/emelfm2/plugin_pack_48.png
78	share/pixmaps/emelfm2/plugin_rename_48.png	78	share/pixmaps/emelfm2/plugin_rename_48.png
79	share/pixmaps/emelfm2/plugin_timeset_48.png	79	share/pixmaps/emelfm2/plugin_timeset_48.png
80	share/pixmaps/emelfm2/plugin_track_48.png	80	%%TRACKER%%share/pixmaps/emelfm2/plugin_track_48.png
81	share/pixmaps/emelfm2/plugin_unpack_48.png	81	share/pixmaps/emelfm2/plugin_unpack_48.png
82	share/pixmaps/emelfm2/ps_48.png	82	share/pixmaps/emelfm2/ps_48.png
83	share/pixmaps/emelfm2/save_selection_48.png	83	share/pixmaps/emelfm2/save_selection_48.png