Attachment #69430 for bug #101614

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

Lines 6-12 Link Here

(-)emelfm2.new/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= emelfm2	8	PORTNAME= emelfm2
9	PORTVERSION= 0.1.7	9	PORTVERSION= 0.1.8
10	CATEGORIES= x11-fm	10	CATEGORIES= x11-fm
11	MASTER_SITES= http://www.emelfm2.net/rel/ \	11	MASTER_SITES= http://www.emelfm2.net/rel/ \
12	${MASTER_SITE_LOCAL}	12	${MASTER_SITE_LOCAL}
Lines 23-28 Link Here
23	INSTALL_TARGET= install install_i18n	23	INSTALL_TARGET= install install_i18n
24		24
25	MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}"	25	MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}"
		26	MAN1= emelfm2.1
26		27
27	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
28		29
Lines 31-33 Link Here
31	.endif	32	.endif
32		33
33	.include <bsd.port.post.mk>	34	.include <bsd.port.post.mk>
		35

Lines 1-3 Link Here

(-)emelfm2.new/distinfo (-3 / +3 lines)
1	MD5 (emelfm2-0.1.7.tar.gz) = c4d1e2a539e165e8b0e5f9b0f3c3b215	1	MD5 (emelfm2-0.1.8.tar.gz) = 3322a69e378fccb38272d0dd6d7c2f3e
2	SHA256 (emelfm2-0.1.7.tar.gz) = 91d457239464b9f5a441ecda6ebc2f1307cfd08fd1d450af33e9ec7ea7e7d2c1	2	SHA256 (emelfm2-0.1.8.tar.gz) = 5bf8c94eefaa0683eae75278b314f0a469e229e232fbf6c934e170d14ab5faa8
3	SIZE (emelfm2-0.1.7.tar.gz) = 786129	3	SIZE (emelfm2-0.1.8.tar.gz) = 850801




--- Makefile.orig	Thu Jul 27 02:20:13 2006
+++ Makefile	Mon Aug  7 23:26:10 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/
 
 OBJECTS_DIR = objs
 # object directories that have to be created
@@ -148,10 +148,10 @@
 ifeq ($(USE_FAM),1)
 	lLIBS += -lfam
 endif
-ifeq ($(OPSY),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)
+#endif
 
 .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
         clean deps marshals gettext i18n install_i18n uninstall_i18n \
@@ -176,7 +176,6 @@
 	done
 	@install -d $(MAN_DIR)
 	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
-	@bzip2 -f $(MAN_DIR)$(TARGET).1;
 	
 ifeq ($(XGD_INTEGRATION), 1)
 		@install -d $(XGD_DESKTOP_DIR)

Lines 1-11 Link Here

(-)emelfm2.new/files/patch-Makefile.config (-6 / +9 lines)
1	--- Makefile.config.orig Mon Nov 21 15:13:08 2005	1	--- Makefile.config.orig Mon Aug 7 22:58:41 2006
2	+++ Makefile.config Mon Nov 21 15:13:50 2005	2	+++ Makefile.config Mon Aug 7 22:58:54 2006
3	@@ -91,7 +91,7 @@	3	@@ -83,9 +83,9 @@
		4	ifeq ($(strip $(CFLAGS)),)
		5	ifeq ($(DEBUG), 1)
4	#CFLAGS = -Wall -Wextra -Wno-unused -Winline	6	#CFLAGS = -Wall -Wextra -Wno-unused -Winline
5	CFLAGS = -Wall -Winline	7	-CFLAGS = -Wall -Winline
		8	+CFLAGS ?= -Wall -Winline
6	else	9	else
7	-CFLAGS = -O2 -Wall	10	-CFLAGS = -O2 -Wall
8	+CFLAGS ?= -Wall	11	+CFLAGS ?= -O2 -Wall
9	#CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird	12	#CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird
10	#CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4	13	#CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4
11	endif	14	endif

Return to bug 101614

Lines 1-17 Link Here

(-)emelfm2.new/files/patch-Makefile (-6 / +23 lines)
1	--- Makefile.orig Tue Sep 13 02:06:53 2005	1	--- Makefile.orig Thu Jul 27 02:20:13 2006
2	+++ Makefile Wed Sep 14 19:42:41 2005	2	+++ Makefile Mon Aug 7 23:26:10 2006
3	@@ -124,10 +124,10 @@	3	@@ -57,7 +57,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
		10	OBJECTS_DIR = objs
		11	# object directories that have to be created
		12	@@ -148,10 +148,10 @@
4	ifeq ($(USE_FAM),1)	13	ifeq ($(USE_FAM),1)
5	lLDFLAGS += -lfam	14	lLIBS += -lfam
6	endif	15	endif
7	-ifeq ($(OPSY),FreeBSD)	16	-ifeq ($(OPSY),FreeBSD)
8	- OSREL = $(shell sysctl -n kern.osreldate)	17	- OSREL = $(shell sysctl -n kern.osreldate)
9	- lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)	18	- lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
10	-endif	19	-endif
11	+#ifeq ($(OPSY),FreeBSD)	20	+#ifeq ($(OPSY),FreeBSD)
12	+# OSREL = $(shell sysctl -n kern.osreldate)	21	+# OSREL = $(shell sysctl -n kern.osreldate)
13	+# lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)	22	+# lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
14	+#endif	23	+#endif
15		24
16	.PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \	25	.PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
17	clean deps marshals gettext i18n install_i18n uninstall_i18n \	26	clean deps marshals gettext i18n install_i18n uninstall_i18n \
		27	@@ -176,7 +176,6 @@
		28	done
		29	@install -d $(MAN_DIR)
		30	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
		31	- @bzip2 -f $(MAN_DIR)$(TARGET).1;
		32
		33	ifeq ($(XGD_INTEGRATION), 1)
		34	@install -d $(XGD_DESKTOP_DIR)