Attachment #89138 for bug #126013

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




#

PORTNAME=	gnome-commander
PORTVERSION=	1.2.6
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	x11-fm gnome
MASTER_SITES=	${MASTER_SITE_GNOME}

USE_BZIP2=	yes
USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool:15 autoconf:262:env
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_OMF=	yes

MAN1=		gnome-commander.1

pre-configure:
	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none

.include <bsd.port.mk>
IGNORE=		Does not run on amd64 and 7.X or greater
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)x11-fm/gnome-commander2/distinfo (-3 / +3 lines)
1	MD5 (gnome2/gnome-commander-1.2.4.tar.bz2) = 9897237e3d297086d88ddf3c7d0dc560	1	MD5 (gnome2/gnome-commander-1.2.6.tar.bz2) = 4a3d3ebd24af3f386fbbf2985acbc786
2	SHA256 (gnome2/gnome-commander-1.2.4.tar.bz2) = a99cd22fc528e70e2a54aa3d1f0cefa04b416eee28a9b2c27bb973509c0459bf	2	SHA256 (gnome2/gnome-commander-1.2.6.tar.bz2) = 0f7272b71ad60eccc08ad70d3eace182786e5eaf38c4cabac5ab693ffc088b33
3	SIZE (gnome2/gnome-commander-1.2.4.tar.bz2) = 1738704	3	SIZE (gnome2/gnome-commander-1.2.6.tar.bz2) = 2281176

Lines 24-42 Link Here

(-)x11-fm/gnome-commander2/pkg-plist (-38 / +38 lines)
24	share/gnome/help/gnome-commander/C/figures/extract_archive.png	24	share/gnome/help/gnome-commander/C/figures/extract_archive.png
25	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_adv_rename.png	25	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_adv_rename.png
26	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_bookmark.png	26	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_bookmark.png
		27	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_metadata.png
27	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_permissions.png	28	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_permissions.png
28	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_properties.png	29	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_properties.png
29	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_ftp.png	30	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_keyboard_shortcuts.png
		31	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_remote_connections.png
		32	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_remote_server.png
30	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_search.png	33	share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_search.png
		34	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_confirmation.png
		35	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_devices.png
		36	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_filters.png
		37	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_format.png
31	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_general.png	38	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_general.png
32	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_layout.png	39	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_layout.png
		40	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_network.png
		41	share/gnome/help/gnome-commander/C/figures/gnome-commander_options_programs.png
33	share/gnome/help/gnome-commander/C/figures/gnome-commander_window.png	42	share/gnome/help/gnome-commander/C/figures/gnome-commander_window.png
34	share/gnome/help/gnome-commander/C/figures/mounting.png	43	share/gnome/help/gnome-commander/C/figures/mounting.png
35	share/gnome/help/gnome-commander/C/gnome-commander.xml	44	share/gnome/help/gnome-commander/C/gnome-commander.xml
36	share/gnome/help/gnome-commander/C/legal.xml	45	share/gnome/help/gnome-commander/C/legal.xml
37	share/omf/gnome-commander/gnome-commander-C.omf	46	share/omf/gnome-commander/gnome-commander-C.omf
38	share/pixmaps/gnome-commander/copy_file_names.xpm
39	share/pixmaps/gnome-commander/desktop.xpm
40	share/pixmaps/gnome-commander/device-icons/bluetooth.xpm	47	share/pixmaps/gnome-commander/device-icons/bluetooth.xpm
41	share/pixmaps/gnome-commander/device-icons/burner.xpm	48	share/pixmaps/gnome-commander/device-icons/burner.xpm
42	share/pixmaps/gnome-commander/device-icons/camera.xpm	49	share/pixmaps/gnome-commander/device-icons/camera.xpm
Lines 52-81 Link Here
52	share/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm	59	share/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm
53	share/pixmaps/gnome-commander/device-icons/wavelan.xpm	60	share/pixmaps/gnome-commander/device-icons/wavelan.xpm
54	share/pixmaps/gnome-commander/device-icons/zip.xpm	61	share/pixmaps/gnome-commander/device-icons/zip.xpm
55	share/pixmaps/gnome-commander/exec.xpm
56	share/pixmaps/gnome-commander/exec_wheel.xpm
57	share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
58	share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
59	share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm	62	share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
60	share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
61	share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
62	share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm	63	share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
		64	share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
		65	share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
63	share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm	66	share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
64	share/pixmaps/gnome-commander/flip-horizontal-16.xpm	67	share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
65	share/pixmaps/gnome-commander/flip-vertical-16.xpm	68	share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
66	share/pixmaps/gnome-commander/ftp.xpm
67	share/pixmaps/gnome-commander/ftp_connect.xpm
68	share/pixmaps/gnome-commander/ftp_disconnect.xpm
69	share/pixmaps/gnome-commander/gnome-commander.xpm
70	share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
71	share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
72	share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
73	share/pixmaps/gnome-commander/home.xpm
74	share/pixmaps/gnome-commander/internal-viewer.xpm
75	share/pixmaps/gnome-commander/python-plugin.svg
76	share/pixmaps/gnome-commander/key.xpm
77	share/pixmaps/gnome-commander/lock.xpm
78	share/pixmaps/gnome-commander/menu_bookmark.xpm
79	share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png	69	share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
80	share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png	70	share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
81	share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png	71	share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
Lines 86-91 Link Here
86	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png	76	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
87	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png	77	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
88	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png	78	share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
		79	share/pixmaps/gnome-commander/mime-icons/i-fifo.png
89	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png	80	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
90	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png	81	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
91	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png	82	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
Lines 97-102 Link Here
97	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png	88	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
98	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png	89	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
99	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png	90	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
		91	share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
100	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png	92	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
101	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png	93	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
102	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png	94	share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
Lines 113-149 Link Here
113	share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png	105	share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
114	share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png	106	share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png
115	share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png	107	share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png
116	share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
117	share/pixmaps/gnome-commander/mime-icons/i-chardev.png	108	share/pixmaps/gnome-commander/mime-icons/i-chardev.png
118	share/pixmaps/gnome-commander/mime-icons/i-directory.png	109	share/pixmaps/gnome-commander/mime-icons/i-directory.png
119	share/pixmaps/gnome-commander/mime-icons/i-fifo.png
120	share/pixmaps/gnome-commander/mime-icons/i-music.png	110	share/pixmaps/gnome-commander/mime-icons/i-music.png
121	share/pixmaps/gnome-commander/mime-icons/i-regular.png	111	share/pixmaps/gnome-commander/mime-icons/i-regular.png
122	share/pixmaps/gnome-commander/mime-icons/i-socket.png	112	share/pixmaps/gnome-commander/mime-icons/i-socket.png
123	share/pixmaps/gnome-commander/mime-icons/i-symlink.png	113	share/pixmaps/gnome-commander/mime-icons/i-symlink.png
124	share/pixmaps/gnome-commander/mkdir.xpm	114	share/pixmaps/gnome-commander/copy_file_names.xpm
		115	share/pixmaps/gnome-commander/exec_wheel.xpm
		116	share/pixmaps/gnome-commander/flip-horizontal-16.xpm
		117	share/pixmaps/gnome-commander/flip-vertical-16.xpm
		118	share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
		119	share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
		120	share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
		121	share/pixmaps/gnome-commander/gnome-commander.xpm
		122	share/pixmaps/gnome-commander/internal-viewer.xpm
		123	share/pixmaps/gnome-commander/menu_bookmark.xpm
		124	share/pixmaps/gnome-commander/nautilus.svg
125	share/pixmaps/gnome-commander/overlay_symlink.xpm	125	share/pixmaps/gnome-commander/overlay_symlink.xpm
126	share/pixmaps/gnome-commander/overlay_umount.xpm	126	share/pixmaps/gnome-commander/overlay_umount.xpm
127	share/pixmaps/gnome-commander/parent_dir.xpm	127	share/pixmaps/gnome-commander/parent_dir.xpm
		128	share/pixmaps/gnome-commander/python.svg
128	share/pixmaps/gnome-commander/root_dir.xpm	129	share/pixmaps/gnome-commander/root_dir.xpm
129	share/pixmaps/gnome-commander/rotate-180-16.xpm	130	share/pixmaps/gnome-commander/rotate-180-16.xpm
130	share/pixmaps/gnome-commander/rotate-270-16.xpm	131	share/pixmaps/gnome-commander/rotate-270-16.xpm
131	share/pixmaps/gnome-commander/rotate-90-16.xpm	132	share/pixmaps/gnome-commander/rotate-90-16.xpm
132	share/pixmaps/gnome-commander/server.xpm
133	share/pixmaps/gnome-commander/smb-computer.xpm
134	share/pixmaps/gnome-commander/smb-network.xpm
135	share/pixmaps/gnome-commander/toggle_horizontal.xpm	133	share/pixmaps/gnome-commander/toggle_horizontal.xpm
136	share/pixmaps/gnome-commander/toggle_vertical.xpm	134	share/pixmaps/gnome-commander/toggle_vertical.xpm
		135	share/pixmaps/gnome-commander/terminal.svg
137	share/pixmaps/gnome-commander.png	136	share/pixmaps/gnome-commander.png
138	share/locale/ar/LC_MESSAGES/gnome-commander.mo	137	share/locale/ar/LC_MESSAGES/gnome-commander.mo
139	share/locale/bg/LC_MESSAGES/gnome-commander.mo	138	share/locale/bg/LC_MESSAGES/gnome-commander.mo
140	share/locale/ca/LC_MESSAGES/gnome-commander.mo	139	share/locale/ca/LC_MESSAGES/gnome-commander.mo
141	share/locale/cs/LC_MESSAGES/gnome-commander.mo	140	share/locale/cs/LC_MESSAGES/gnome-commander.mo
142	share/locale/de/LC_MESSAGES/gnome-commander.mo	141	share/locale/de/LC_MESSAGES/gnome-commander.mo
143	share/locale/dz/LC_MESSAGES/gnome-commander.mo
144	share/locale/el/LC_MESSAGES/gnome-commander.mo	142	share/locale/el/LC_MESSAGES/gnome-commander.mo
145	share/locale/en_CA/LC_MESSAGES/gnome-commander.mo	143	share/locale/en_CA/LC_MESSAGES/gnome-commander.mo
146	share/locale/en_GB/LC_MESSAGES/gnome-commander.mo	144	share/locale/en_GB/LC_MESSAGES/gnome-commander.mo
		145	share/locale/eo/LC_MESSAGES/gnome-commander.mo
147	share/locale/es/LC_MESSAGES/gnome-commander.mo	146	share/locale/es/LC_MESSAGES/gnome-commander.mo
148	share/locale/eu/LC_MESSAGES/gnome-commander.mo	147	share/locale/eu/LC_MESSAGES/gnome-commander.mo
149	share/locale/fi/LC_MESSAGES/gnome-commander.mo	148	share/locale/fi/LC_MESSAGES/gnome-commander.mo
Lines 161-167 Link Here
161	share/locale/pt_BR/LC_MESSAGES/gnome-commander.mo	160	share/locale/pt_BR/LC_MESSAGES/gnome-commander.mo
162	share/locale/ro/LC_MESSAGES/gnome-commander.mo	161	share/locale/ro/LC_MESSAGES/gnome-commander.mo
163	share/locale/ru/LC_MESSAGES/gnome-commander.mo	162	share/locale/ru/LC_MESSAGES/gnome-commander.mo
164	share/locale/rw/LC_MESSAGES/gnome-commander.mo
165	share/locale/sk/LC_MESSAGES/gnome-commander.mo	163	share/locale/sk/LC_MESSAGES/gnome-commander.mo
166	share/locale/sl/LC_MESSAGES/gnome-commander.mo	164	share/locale/sl/LC_MESSAGES/gnome-commander.mo
167	share/locale/sq/LC_MESSAGES/gnome-commander.mo	165	share/locale/sq/LC_MESSAGES/gnome-commander.mo
Lines 170-188 Link Here
170	share/locale/sv/LC_MESSAGES/gnome-commander.mo	168	share/locale/sv/LC_MESSAGES/gnome-commander.mo
171	share/locale/uk/LC_MESSAGES/gnome-commander.mo	169	share/locale/uk/LC_MESSAGES/gnome-commander.mo
172	share/locale/vi/LC_MESSAGES/gnome-commander.mo	170	share/locale/vi/LC_MESSAGES/gnome-commander.mo
173	share/locale/oc/LC_MESSAGES/gnome-commander.mo
174	share/locale/zh_CN/LC_MESSAGES/gnome-commander.mo	171	share/locale/zh_CN/LC_MESSAGES/gnome-commander.mo
175	share/locale/zh_TW/LC_MESSAGES/gnome-commander.mo	172	share/locale/zh_TW/LC_MESSAGES/gnome-commander.mo
		173	share/locale/rw/LC_MESSAGES/gnome-commander.mo
		174	share/locale/dz/LC_MESSAGES/gnome-commander.mo
		175	share/locale/oc/LC_MESSAGES/gnome-commander.mo
176	@dirrmtry share/locale/oc/LC_MESSAGES	176	@dirrmtry share/locale/oc/LC_MESSAGES
177	@dirrmtry share/locale/oc	177	@dirrmtry share/locale/oc
178	@dirrm share/pixmaps/gnome-commander/mime-icons
179	@dirrm share/pixmaps/gnome-commander/file-type-icons
180	@dirrm share/pixmaps/gnome-commander/device-icons
181	@dirrm share/pixmaps/gnome-commander
182	@dirrm share/omf/gnome-commander
183	@dirrm share/gnome/help/gnome-commander/C/figures	178	@dirrm share/gnome/help/gnome-commander/C/figures
184	@dirrm share/gnome/help/gnome-commander/C	179	@dirrm share/gnome/help/gnome-commander/C
185	@dirrm share/gnome/help/gnome-commander	180	@dirrm share/gnome/help/gnome-commander
		181	@dirrm share/omf/gnome-commander
		182	@dirrm share/pixmaps/gnome-commander/device-icons
		183	@dirrm share/pixmaps/gnome-commander/file-type-icons
		184	@dirrm share/pixmaps/gnome-commander/mime-icons
		185	@dirrm share/pixmaps/gnome-commander
186	@dirrm lib/gnome-commander/plugins	186	@dirrm lib/gnome-commander/plugins
187	@dirrm lib/gnome-commander	187	@dirrm lib/gnome-commander
188	@dirrmtry share/applications	188	@dirrmtry share/applications




#include "gnome-cmd-includes.h"
#include "filter.h"

#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif

using namespace std;



    filter->fn_exp = g_strdup (exp);
    filter->fn_flags = FNM_NOESCAPE;

#ifdef FNM_CASEFOLD
    if (!case_sens)
        filter->fn_flags |= FNM_CASEFOLD;
#endif




#include "utils.h"
#include "cap.h"

#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <fnmatch.h>

using namespace std;

            for (; files; files = files->next)
            {
                gboolean ok = FALSE;
#ifdef FNM_CASEFOLD
                gint fn_flags = FNM_NOESCAPE | FNM_CASEFOLD;
#else
                gint fn_flags = FNM_NOESCAPE;




#include "gnome-cmd-con-list.h"
#include "gnome-cmd-xfer.h"

#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <fnmatch.h>

using namespace std;

gboolean patlist_matches (GList *pattern_list, const gchar *s)
{
    for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
#ifdef FNM_CASEFOLD
        if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE|FNM_CASEFOLD) == 0)
#else
        if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0)   // omit FNM_CASEFOLD as it is a GNU extension.

Lines 237-243 Link Here

(-)x11-fm/gnome-commander2/work/gnome-commander-1.2.6/configure.in (-1 lines)
237	dnl Checks for library functions	237	dnl Checks for library functions
238	dnl =============================	238	dnl =============================
239		239
240	AC_FUNC_FNMATCH_GNU
241	AC_FUNC_MMAP	240	AC_FUNC_MMAP
242		241
243	dnl ================================================================	242	dnl ================================================================




--- ./src/gnome-cmd-python-plugin.cc.orig       2007-09-10 07:38:08.000000000
+0000
+++ ./src/gnome-cmd-python-plugin.cc    2007-09-11 00:29:03.000000000 +0000
@@ -54,6 +54,11 @@
     }

     long dir_size = pathconf(".", _PC_PATH_MAX);
+    if( -1 == dir_size )
+    {
+        g_warning ( "pathconf(.): %s", strerror(errno) );
+       return;
+    }
     gchar *prev_dir = (gchar *) g_malloc (dir_size);

     if (!prev_dir)




diff -ru gnome-commander-1.2.6/configure.in gnome-commander-1.2.6-patch/configure.in
--- configure.in.orig	2008-06-01 16:44:26.000000000 +0200
+++ configure.in	2008-07-23 10:32:56.474220300 +0200
@@ -237,7 +237,6 @@
 dnl Checks for library functions
 dnl =============================
 
-AC_FUNC_FNMATCH_GNU
 AC_FUNC_MMAP
 
 dnl ================================================================
diff -ru gnome-commander-1.2.6/src/filter.cc gnome-commander-1.2.6-patch/src/filter.cc
--- src/filter.cc,orig	2008-06-01 16:44:26.000000000 +0200
+++ src/filter.cc	2008-07-23 10:32:56.489868100 +0200
@@ -25,10 +25,6 @@
 #include "gnome-cmd-includes.h"
 #include "filter.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 using namespace std;
 
 
@@ -55,7 +51,7 @@
     filter->fn_exp = g_strdup (exp);
     filter->fn_flags = FNM_NOESCAPE;
 
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
     if (!case_sens)
         filter->fn_flags |= FNM_CASEFOLD;
 #endif
diff -ru gnome-commander-1.2.6/src/gnome-cmd-file-popmenu.cc gnome-commander-1.2.6-patch/src/gnome-cmd-file-popmenu.cc
--- src/gnome-cmd-file-popmenu.cc.orig	2008-06-01 16:44:26.000000000 +0200
+++ src/gnome-cmd-file-popmenu.cc	2008-07-23 10:32:56.505515900 +0200
@@ -30,9 +30,6 @@
 #include "utils.h"
 #include "cap.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <fnmatch.h>
 
 using namespace std;
@@ -284,7 +281,7 @@
             for (; files; files = files->next)
             {
                 gboolean ok = FALSE;
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
                 gint fn_flags = FNM_NOESCAPE | FNM_CASEFOLD;
 #else
                 gint fn_flags = FNM_NOESCAPE;
diff -ru gnome-commander-1.2.6/src/utils.cc gnome-commander-1.2.6-patch/src/utils.cc
--- src/utils.cc.orig	2008-06-01 16:44:26.000000000 +0200
+++ src/utils.cc	2008-07-23 10:32:56.521163700 +0200
@@ -33,9 +33,6 @@
 #include "gnome-cmd-con-list.h"
 #include "gnome-cmd-xfer.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <fnmatch.h>
 
 using namespace std;
@@ -1328,7 +1325,7 @@
 gboolean patlist_matches (GList *pattern_list, const gchar *s)
 {
     for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
         if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE|FNM_CASEFOLD) == 0)
 #else
         if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0)   // omit FNM_CASEFOLD as it is a GNU extension.

Return to bug 126013

Lines 6-13 Link Here

(-)x11-fm/gnome-commander2/Makefile (-9 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= gnome-commander	8	PORTNAME= gnome-commander
9	PORTVERSION= 1.2.4	9	PORTVERSION= 1.2.6
10	PORTREVISION= 4
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= x11-fm gnome	11	CATEGORIES= x11-fm gnome
13	MASTER_SITES= ${MASTER_SITE_GNOME}	12	MASTER_SITES= ${MASTER_SITE_GNOME}
Lines 27-43 Link Here
27	USE_BZIP2= yes	26	USE_BZIP2= yes
28	USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui	27	USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
29	USE_GMAKE= yes	28	USE_GMAKE= yes
30	USE_AUTOTOOLS= libtool:15	29	USE_AUTOTOOLS= libtool:15 autoconf:262:env
		30	GNU_CONFIGURE= yes
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
32	LDFLAGS="-L${LOCALBASE}/lib"	32	LDFLAGS="-L${LOCALBASE}/lib"
33	INSTALLS_OMF= yes	33	INSTALLS_OMF= yes
34		34
35	MAN1= gnome-commander.1	35	MAN1= gnome-commander.1
36		36
37	.include <bsd.port.pre.mk>	37	pre-configure:
		38	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none
38		39
39	.if ${OSVERSION} >= 700000 && ${ARCH} == "amd64"	40	.include <bsd.port.mk>
40	IGNORE= Does not run on amd64 and 7.X or greater
41	.endif
42
43	.include <bsd.port.post.mk>

Lines 25-34 Link Here

(-)x11-fm/gnome-commander2/work/gnome-commander-1.2.6/src/filter.cc (-5 / +1 lines)
25	#include "gnome-cmd-includes.h"	25	#include "gnome-cmd-includes.h"
26	#include "filter.h"	26	#include "filter.h"
27		27
28	#ifndef _GNU_SOURCE
29	#define _GNU_SOURCE
30	#endif
31
32	using namespace std;	28	using namespace std;
33		29
34		30
Lines 55-61 Link Here
55	filter->fn_exp = g_strdup (exp);	51	filter->fn_exp = g_strdup (exp);
56	filter->fn_flags = FNM_NOESCAPE;	52	filter->fn_flags = FNM_NOESCAPE;
57		53
58	#ifdef _GNU_SOURCE	54	#ifdef FNM_CASEFOLD
59	if (!case_sens)	55	if (!case_sens)
60	filter->fn_flags \|= FNM_CASEFOLD;	56	filter->fn_flags \|= FNM_CASEFOLD;
61	#endif	57	#endif

Lines 30-38 Link Here

(-)x11-fm/gnome-commander2/work/gnome-commander-1.2.6/src/gnome-cmd-file-popmenu.cc (-4 / +1 lines)
30	#include "utils.h"	30	#include "utils.h"
31	#include "cap.h"	31	#include "cap.h"
32		32
33	#ifndef _GNU_SOURCE
34	#define _GNU_SOURCE
35	#endif
36	#include <fnmatch.h>	33	#include <fnmatch.h>
37		34
38	using namespace std;	35	using namespace std;
Lines 284-290 Link Here
284	for (; files; files = files->next)	281	for (; files; files = files->next)
285	{	282	{
286	gboolean ok = FALSE;	283	gboolean ok = FALSE;
287	#ifdef _GNU_SOURCE	284	#ifdef FNM_CASEFOLD
288	gint fn_flags = FNM_NOESCAPE \| FNM_CASEFOLD;	285	gint fn_flags = FNM_NOESCAPE \| FNM_CASEFOLD;
289	#else	286	#else
290	gint fn_flags = FNM_NOESCAPE;	287	gint fn_flags = FNM_NOESCAPE;

Lines 33-41 Link Here

(-)x11-fm/gnome-commander2/work/gnome-commander-1.2.6/src/utils.cc (-4 / +1 lines)
33	#include "gnome-cmd-con-list.h"	33	#include "gnome-cmd-con-list.h"
34	#include "gnome-cmd-xfer.h"	34	#include "gnome-cmd-xfer.h"
35		35
36	#ifndef _GNU_SOURCE
37	#define _GNU_SOURCE
38	#endif
39	#include <fnmatch.h>	36	#include <fnmatch.h>
40		37
41	using namespace std;	38	using namespace std;
Lines 1328-1334 Link Here
1328	gboolean patlist_matches (GList pattern_list, const gchar s)	1325	gboolean patlist_matches (GList pattern_list, const gchar s)
1329	{	1326	{
1330	for (GList *tmp = pattern_list; tmp; tmp = tmp->next)	1327	for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
1331	#ifdef _GNU_SOURCE	1328	#ifdef FNM_CASEFOLD
1332	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE\|FNM_CASEFOLD) == 0)	1329	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE\|FNM_CASEFOLD) == 0)
1333	#else	1330	#else
1334	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0) // omit FNM_CASEFOLD as it is a GNU extension.	1331	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0) // omit FNM_CASEFOLD as it is a GNU extension.

Removed Link Here

(-)x11-fm/gnome-commander2/files/patch-gnome-cmd-python-plugin.cc (-15 lines)
1	--- ./src/gnome-cmd-python-plugin.cc.orig 2007-09-10 07:38:08.000000000
2	+0000
3	+++ ./src/gnome-cmd-python-plugin.cc 2007-09-11 00:29:03.000000000 +0000
4	@@ -54,6 +54,11 @@
5	}
6
7	long dir_size = pathconf(".", _PC_PATH_MAX);
8	+ if( -1 == dir_size )
9	+ {
10	+ g_warning ( "pathconf(.): %s", strerror(errno) );
11	+ return;
12	+ }
13	gchar prev_dir = (gchar ) g_malloc (dir_size);
14
15	if (!prev_dir)

Added Link Here

(-)x11-fm/gnome-commander2/files/patch-fnmatch (+78 lines)
1	diff -ru gnome-commander-1.2.6/configure.in gnome-commander-1.2.6-patch/configure.in
2	--- configure.in.orig 2008-06-01 16:44:26.000000000 +0200
3	+++ configure.in 2008-07-23 10:32:56.474220300 +0200
4	@@ -237,7 +237,6 @@
5	dnl Checks for library functions
6	dnl =============================
7
8	-AC_FUNC_FNMATCH_GNU
9	AC_FUNC_MMAP
10
11	dnl ================================================================
12	diff -ru gnome-commander-1.2.6/src/filter.cc gnome-commander-1.2.6-patch/src/filter.cc
13	--- src/filter.cc,orig 2008-06-01 16:44:26.000000000 +0200
14	+++ src/filter.cc 2008-07-23 10:32:56.489868100 +0200
15	@@ -25,10 +25,6 @@
16	#include "gnome-cmd-includes.h"
17	#include "filter.h"
18
19	-#ifndef _GNU_SOURCE
20	-#define _GNU_SOURCE
21	-#endif
22	-
23	using namespace std;
24
25
26	@@ -55,7 +51,7 @@
27	filter->fn_exp = g_strdup (exp);
28	filter->fn_flags = FNM_NOESCAPE;
29
30	-#ifdef _GNU_SOURCE
31	+#ifdef FNM_CASEFOLD
32	if (!case_sens)
33	filter->fn_flags \|= FNM_CASEFOLD;
34	#endif
35	diff -ru gnome-commander-1.2.6/src/gnome-cmd-file-popmenu.cc gnome-commander-1.2.6-patch/src/gnome-cmd-file-popmenu.cc
36	--- src/gnome-cmd-file-popmenu.cc.orig 2008-06-01 16:44:26.000000000 +0200
37	+++ src/gnome-cmd-file-popmenu.cc 2008-07-23 10:32:56.505515900 +0200
38	@@ -30,9 +30,6 @@
39	#include "utils.h"
40	#include "cap.h"
41
42	-#ifndef _GNU_SOURCE
43	-#define _GNU_SOURCE
44	-#endif
45	#include <fnmatch.h>
46
47	using namespace std;
48	@@ -284,7 +281,7 @@
49	for (; files; files = files->next)
50	{
51	gboolean ok = FALSE;
52	-#ifdef _GNU_SOURCE
53	+#ifdef FNM_CASEFOLD
54	gint fn_flags = FNM_NOESCAPE \| FNM_CASEFOLD;
55	#else
56	gint fn_flags = FNM_NOESCAPE;
57	diff -ru gnome-commander-1.2.6/src/utils.cc gnome-commander-1.2.6-patch/src/utils.cc
58	--- src/utils.cc.orig 2008-06-01 16:44:26.000000000 +0200
59	+++ src/utils.cc 2008-07-23 10:32:56.521163700 +0200
60	@@ -33,9 +33,6 @@
61	#include "gnome-cmd-con-list.h"
62	#include "gnome-cmd-xfer.h"
63
64	-#ifndef _GNU_SOURCE
65	-#define _GNU_SOURCE
66	-#endif
67	#include <fnmatch.h>
68
69	using namespace std;
70	@@ -1328,7 +1325,7 @@
71	gboolean patlist_matches (GList pattern_list, const gchar s)
72	{
73	for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
74	-#ifdef _GNU_SOURCE
75	+#ifdef FNM_CASEFOLD
76	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE\|FNM_CASEFOLD) == 0)
77	#else
78	if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0) // omit FNM_CASEFOLD as it is a GNU extension.