Attachment #80111 for bug #114987

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

Lines 6-13 Link Here

(-)emelfm2.new/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= emelfm2	8	PORTNAME= emelfm2
9	PORTVERSION= 0.3.4	9	PORTVERSION= 0.3.5
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	http://freebsd.unixfreunde.de/sources/	12	http://freebsd.unixfreunde.de/sources/

Lines 1-3 Link Here

(-)emelfm2.new/distinfo (-3 / +3 lines)
1	MD5 (emelfm2-0.3.4.tar.gz) = 08e28e4bb54fc731560402157df63af8	1	MD5 (emelfm2-0.3.5.tar.gz) = 4f5a065a7d35371a920533153f24e362
2	SHA256 (emelfm2-0.3.4.tar.gz) = a0a6e60d54c5ca52b1a6467b79d25b1001d662f5ffb51c8446541826e068f8c8	2	SHA256 (emelfm2-0.3.5.tar.gz) = 8eeacc5dad3fcb562bde6b8817c4beee3ec2354d1f5f38ec4bd656f0bf9d0b0a
3	SIZE (emelfm2-0.3.4.tar.gz) = 992183	3	SIZE (emelfm2-0.3.5.tar.gz) = 1081106




--- Makefile.orig	Sat Jul 28 10:40:12 2007
+++ Makefile	Sat Jul 28 10:42:14 2007
@@ -56,7 +56,7 @@
 
 #these are only used here for installation purposes

 #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)
@@ -203,7 +203,7 @@
 
 lLDFLAGS = $(LDFLAGS)
 # -lrt needed for clock_gettime()

 ifeq ($(USE_FAM),1)
 lLIBS += -lfam
 endif
@@ -221,10 +221,10 @@
 endif
 # should not need translation
 OPSYS := $(shell uname)

 
 #for gvfs development
 ifeq ($(WITH_GVFS),1)
@@ -254,7 +254,6 @@
 	done
 	@install -d $(MAN_DIR)
 	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);




--- 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
-CFLAGS = -Wall -Winline
+CFLAGS ?= -Wall -Winline
 else
-CFLAGS = -O2 -Wall
+CFLAGS ?= -O2 -Wall
 #CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird
 #CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4
 endif

Lines 1-10 Link Here

(-)emelfm2.new/files/patch-e2_fileview.h (-10 lines)
1	--- src/e2_fileview.h.orig Sat Nov 4 14:39:08 2006
2	+++ src/e2_fileview.h Sat Nov 4 14:39:26 2006
3	@@ -21,6 +21,7 @@
4	#ifndef E2_FILEVIEW_H
5	#define E2_FILEVIEW_H
6
7	+#include <pthread.h>
8	#include "emelfm2.h"
9
10	#ifdef E2_VFS




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

Lines 1-5 Link Here

(-)emelfm2.new/files/patch-Makefile (-5 / +5 lines)
1	--- Makefile.orig Sat May 26 16:15:40 2007	1	--- Makefile.orig Sat Jul 28 10:40:12 2007
2	+++ Makefile Sat May 26 16:17:20 2007	2	+++ Makefile Sat Jul 28 10:42:14 2007
3	@@ -56,7 +56,7 @@	3	@@ -56,7 +56,7 @@
4		4
5	#these are only used here for installation purposes	5	#these are only used here for installation purposes
Lines 9-15 Link Here
9	#as well as usage here, all in-code uses of these is assumed localised	9	#as well as usage here, all in-code uses of these is assumed localised
10	ifeq ($(DOCS_VERSION), 1)	10	ifeq ($(DOCS_VERSION), 1)
11	DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)	11	DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
12	@@ -202,7 +202,7 @@	12	@@ -203,7 +203,7 @@
13		13
14	lLDFLAGS = $(LDFLAGS)	14	lLDFLAGS = $(LDFLAGS)
15	# -lrt needed for clock_gettime()	15	# -lrt needed for clock_gettime()
Lines 18-24 Link Here
18	ifeq ($(USE_FAM),1)	18	ifeq ($(USE_FAM),1)
19	lLIBS += -lfam	19	lLIBS += -lfam
20	endif	20	endif
21	@@ -220,10 +220,10 @@	21	@@ -221,10 +221,10 @@
22	endif	22	endif
23	# should not need translation	23	# should not need translation
24	OPSYS := $(shell uname)	24	OPSYS := $(shell uname)
Lines 33-39 Link Here
33		33
34	#for gvfs development	34	#for gvfs development
35	ifeq ($(WITH_GVFS),1)	35	ifeq ($(WITH_GVFS),1)
36	@@ -253,7 +253,6 @@	36	@@ -254,7 +254,6 @@
37	done	37	done
38	@install -d $(MAN_DIR)	38	@install -d $(MAN_DIR)
39	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);	39	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);

Lines 1-14 Link Here

(-)emelfm2.new/files/patch-Makefile.config (-14 lines)
1	--- Makefile.config.orig Sat May 26 16:15:48 2007
2	+++ Makefile.config Sat May 26 16:18:11 2007
3	@@ -137,9 +137,9 @@
4	ifeq ($(DEBUG), 1)
5	#additional CFLAGS -g -O0 will always be added when in debug mode
6	#CFLAGS = -Wall -Wextra -Wno-unused -Winline
7	-CFLAGS = -Wall -Winline
8	+CFLAGS ?= -Wall -Winline
9	else
10	-CFLAGS = -O2 -Wall
11	+CFLAGS ?= -O2 -Wall
12	#CFLAGS = -O3 -Wall -march=athlon-tbird -mtune=athlon-tbird
13	#CFLAGS = -O3 -Wall -march=pentium -mtune=pentium4
14	endif

Lines 1-12 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