Attachment #141350 for bug #188129

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

Lines 2-8 Link Here

(-)vifm/Makefile (-2 / +4 lines)
2	# $FreeBSD: head/misc/vifm/Makefile 342438 2014-02-03 13:39:30Z miwi $	2	# $FreeBSD: head/misc/vifm/Makefile 342438 2014-02-03 13:39:30Z miwi $
3		3
4	PORTNAME= vifm	4	PORTNAME= vifm
5	PORTVERSION= 0.7.4b	5	PORTVERSION= 0.7.6
6	CATEGORIES= misc	6	CATEGORIES= misc
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
8		8
Lines 26-32 Link Here
26	%%DATADIR%%/vifmrc \	26	%%DATADIR%%/vifmrc \
27	man/man1/vifm-pause.1.gz \	27	man/man1/vifm-pause.1.gz \
28	man/man1/vifm.1.gz \	28	man/man1/vifm.1.gz \
29	man/man1/vifmrc-converter.1.gz	29	man/man1/vifmrc-converter.1.gz \
		30	share/applications/vifm.desktop \
		31	share/pixmaps/vifm.png
30	PLIST_DIRS= %%DATADIR%%	32	PLIST_DIRS= %%DATADIR%%
31		33
32	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)vifm/distinfo (-2 / +2 lines)
1	SHA256 (vifm-0.7.4b.tar.bz2) = 90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57	1	SHA256 (vifm-0.7.6.tar.bz2) = 861798592d6fccc5d330a66e68f1c5a747732b9df587f15d892c6ff72a04650f
2	SIZE (vifm-0.7.4b.tar.bz2) = 562778	2	SIZE (vifm-0.7.6.tar.bz2) = 609855




--- configure.in.orig	2013-04-02 18:52:13.000000000 +0300
+++ configure.in	2013-04-02 18:53:57.000000000 +0300
@@ -24,7 +24,6 @@
 AC_CHECK_HEADER([limits.h], [], [AC_MSG_ERROR([limits.h header not found.])])
 AC_CHECK_HEADER([locale.h], [], [AC_MSG_ERROR([locale.h header not found.])])
 AC_CHECK_HEADER([math.h], [], [AC_MSG_ERROR([math.h header not found.])])
-AC_CHECK_HEADER([mntent.h], [], [AC_MSG_ERROR([mntent.h header not found.])])
 AC_CHECK_HEADER([pwd.h], [], [AC_MSG_ERROR([pwd.h header not found.])])
 AC_CHECK_HEADER([signal.h], [], [AC_MSG_ERROR([signal.h header not found.])])
 AC_CHECK_HEADER([stdarg.h], [], [AC_MSG_ERROR([stdarg.h header not found.])])
@@ -69,7 +68,6 @@
 AC_CHECK_FUNC([closedir], [], [AC_MSG_ERROR([closedir() function not found.])])
 AC_CHECK_FUNC([dup], [], [AC_MSG_ERROR([dup() function not found.])])
 AC_CHECK_FUNC([dup2], [], [AC_MSG_ERROR([dup2() function not found.])])
-AC_CHECK_FUNC([endmntent], [], [AC_MSG_ERROR([endmntent() function not found.])])
 AC_CHECK_FUNC([execve], [], [AC_MSG_ERROR([execve() function not found.])])
 AC_CHECK_FUNC([execvp], [], [AC_MSG_ERROR([execvp() function not found.])])
 AC_CHECK_FUNC([exit], [], [AC_MSG_ERROR([exit() function not found.])])
@@ -91,7 +89,6 @@
 AC_CHECK_FUNC([getgrgid], [], [AC_MSG_ERROR([getgrgid() function not found.])])
 AC_CHECK_FUNC([getgrgid_r], [], [AC_MSG_ERROR([getgrgid_r() function not found.])])
 AC_CHECK_FUNC([getgrnam], [], [AC_MSG_ERROR([getgrnam() function not found.])])
-AC_CHECK_FUNC([getmntent], [], [AC_MSG_ERROR([getmntent() function not found.])])
 AC_CHECK_FUNC([getpid], [], [AC_MSG_ERROR([getpid() function not found.])])
 AC_CHECK_FUNC([getppid], [], [AC_MSG_ERROR([getppid() function not found.])])
 AC_CHECK_FUNC([getpwent], [], [AC_MSG_ERROR([getpwent() function not found.])])
@@ -132,7 +129,6 @@
 AC_CHECK_FUNC([setenv], [], [AC_MSG_ERROR([setenv() function not found.])])
 AC_CHECK_FUNC([setgrent], [], [AC_MSG_ERROR([setgrent() function not found.])])
 AC_CHECK_FUNC([setlocale], [], [AC_MSG_ERROR([setlocale() function not found.])])
-AC_CHECK_FUNC([setmntent], [], [AC_MSG_ERROR([setmntent() function not found.])])
 AC_CHECK_FUNC([setpgid], [], [AC_MSG_ERROR([setpgid() function not found.])])
 AC_CHECK_FUNC([setpwent], [], [AC_MSG_ERROR([setpwent() function not found.])])
 AC_CHECK_FUNC([setsid], [], [AC_MSG_ERROR([setsid() function not found.])])
@@ -164,7 +160,6 @@
 AC_CHECK_FUNC([strtok_r], [], [AC_MSG_ERROR([strtok_r() function not found.])])
 AC_CHECK_FUNC([strtol], [], [AC_MSG_ERROR([strtol() function not found.])])
 AC_CHECK_FUNC([strtoll], [], [AC_MSG_ERROR([strtoll() function not found.])])
-AC_CHECK_FUNC([strverscmp], [], [AC_MSG_ERROR([strverscmp() function not found.])])
 AC_CHECK_FUNC([sysconf], [], [AC_MSG_ERROR([sysconf() function not found.])])
 AC_CHECK_FUNC([time], [], [AC_MSG_ERROR([time() function not found.])])
 AC_CHECK_FUNC([tolower], [], [AC_MSG_ERROR([tolower() function not found.])])




--- src/sort.c.orig	2013-04-02 18:55:08.000000000 +0300
+++ src/sort.c	2013-04-02 18:37:26.000000000 +0300
@@ -46,7 +46,7 @@
 
 static int sort_dir_list(const void *one, const void *two);
 TSTATIC int strnumcmp(const char s[], const char t[]);
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
 static int vercmp(const char s[], const char t[]);
 #else
 static char * skip_leading_zeros(const char str[]);
@@ -106,7 +106,7 @@
 TSTATIC int
 strnumcmp(const char s[], const char t[])
 {
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
 	return vercmp(s, t);
 #else
 	const char *new_s = skip_leading_zeros(s);
@@ -115,7 +115,7 @@
 #endif
 }
 
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
 static int
 vercmp(const char s[], const char t[])
 {




--- src/utils/utils.c.orig	2013-04-02 18:56:49.000000000 +0300
+++ src/utils/utils.c	2013-04-02 18:21:24.000000000 +0300
@@ -34,7 +34,7 @@
 #include <sys/wait.h> /* waitpid() */
 #endif
 
-#if !defined(_WIN32) && !defined(__APPLE__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__)
 #include <mntent.h> /* getmntent() */
 #endif
 
@@ -267,7 +267,7 @@
 int
 is_on_slow_fs(const char *full_path)
 {
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
 	return 0;
 #else
 	FILE *f;

Return to bug 188129

Lines 1-42 Link Here

(-)vifm/files/patch-configure.in (-42 lines)
1	--- configure.in.orig 2013-04-02 18:52:13.000000000 +0300
2	+++ configure.in 2013-04-02 18:53:57.000000000 +0300
3	@@ -24,7 +24,6 @@
4	AC_CHECK_HEADER([limits.h], [], [AC_MSG_ERROR([limits.h header not found.])])
5	AC_CHECK_HEADER([locale.h], [], [AC_MSG_ERROR([locale.h header not found.])])
6	AC_CHECK_HEADER([math.h], [], [AC_MSG_ERROR([math.h header not found.])])
7	-AC_CHECK_HEADER([mntent.h], [], [AC_MSG_ERROR([mntent.h header not found.])])
8	AC_CHECK_HEADER([pwd.h], [], [AC_MSG_ERROR([pwd.h header not found.])])
9	AC_CHECK_HEADER([signal.h], [], [AC_MSG_ERROR([signal.h header not found.])])
10	AC_CHECK_HEADER([stdarg.h], [], [AC_MSG_ERROR([stdarg.h header not found.])])
11	@@ -69,7 +68,6 @@
12	AC_CHECK_FUNC([closedir], [], [AC_MSG_ERROR([closedir() function not found.])])
13	AC_CHECK_FUNC([dup], [], [AC_MSG_ERROR([dup() function not found.])])
14	AC_CHECK_FUNC([dup2], [], [AC_MSG_ERROR([dup2() function not found.])])
15	-AC_CHECK_FUNC([endmntent], [], [AC_MSG_ERROR([endmntent() function not found.])])
16	AC_CHECK_FUNC([execve], [], [AC_MSG_ERROR([execve() function not found.])])
17	AC_CHECK_FUNC([execvp], [], [AC_MSG_ERROR([execvp() function not found.])])
18	AC_CHECK_FUNC([exit], [], [AC_MSG_ERROR([exit() function not found.])])
19	@@ -91,7 +89,6 @@
20	AC_CHECK_FUNC([getgrgid], [], [AC_MSG_ERROR([getgrgid() function not found.])])
21	AC_CHECK_FUNC([getgrgid_r], [], [AC_MSG_ERROR([getgrgid_r() function not found.])])
22	AC_CHECK_FUNC([getgrnam], [], [AC_MSG_ERROR([getgrnam() function not found.])])
23	-AC_CHECK_FUNC([getmntent], [], [AC_MSG_ERROR([getmntent() function not found.])])
24	AC_CHECK_FUNC([getpid], [], [AC_MSG_ERROR([getpid() function not found.])])
25	AC_CHECK_FUNC([getppid], [], [AC_MSG_ERROR([getppid() function not found.])])
26	AC_CHECK_FUNC([getpwent], [], [AC_MSG_ERROR([getpwent() function not found.])])
27	@@ -132,7 +129,6 @@
28	AC_CHECK_FUNC([setenv], [], [AC_MSG_ERROR([setenv() function not found.])])
29	AC_CHECK_FUNC([setgrent], [], [AC_MSG_ERROR([setgrent() function not found.])])
30	AC_CHECK_FUNC([setlocale], [], [AC_MSG_ERROR([setlocale() function not found.])])
31	-AC_CHECK_FUNC([setmntent], [], [AC_MSG_ERROR([setmntent() function not found.])])
32	AC_CHECK_FUNC([setpgid], [], [AC_MSG_ERROR([setpgid() function not found.])])
33	AC_CHECK_FUNC([setpwent], [], [AC_MSG_ERROR([setpwent() function not found.])])
34	AC_CHECK_FUNC([setsid], [], [AC_MSG_ERROR([setsid() function not found.])])
35	@@ -164,7 +160,6 @@
36	AC_CHECK_FUNC([strtok_r], [], [AC_MSG_ERROR([strtok_r() function not found.])])
37	AC_CHECK_FUNC([strtol], [], [AC_MSG_ERROR([strtol() function not found.])])
38	AC_CHECK_FUNC([strtoll], [], [AC_MSG_ERROR([strtoll() function not found.])])
39	-AC_CHECK_FUNC([strverscmp], [], [AC_MSG_ERROR([strverscmp() function not found.])])
40	AC_CHECK_FUNC([sysconf], [], [AC_MSG_ERROR([sysconf() function not found.])])
41	AC_CHECK_FUNC([time], [], [AC_MSG_ERROR([time() function not found.])])
42	AC_CHECK_FUNC([tolower], [], [AC_MSG_ERROR([tolower() function not found.])])

Lines 1-29 Link Here

(-)vifm/files/patch-src-sort.c (-29 lines)
1	--- src/sort.c.orig 2013-04-02 18:55:08.000000000 +0300
2	+++ src/sort.c 2013-04-02 18:37:26.000000000 +0300
3	@@ -46,7 +46,7 @@
4
5	static int sort_dir_list(const void one, const void two);
6	TSTATIC int strnumcmp(const char s[], const char t[]);
7	-#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__)
8	+#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
9	static int vercmp(const char s[], const char t[]);
10	#else
11	static char * skip_leading_zeros(const char str[]);
12	@@ -106,7 +106,7 @@
13	TSTATIC int
14	strnumcmp(const char s[], const char t[])
15	{
16	-#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__)
17	+#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
18	return vercmp(s, t);
19	#else
20	const char *new_s = skip_leading_zeros(s);
21	@@ -115,7 +115,7 @@
22	#endif
23	}
24
25	-#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__)
26	+#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
27	static int
28	vercmp(const char s[], const char t[])
29	{

Lines 1-20 Link Here

(-)vifm/files/patch-src-utils-utils.c (-20 lines)
1	--- src/utils/utils.c.orig 2013-04-02 18:56:49.000000000 +0300
2	+++ src/utils/utils.c 2013-04-02 18:21:24.000000000 +0300
3	@@ -34,7 +34,7 @@
4	#include <sys/wait.h> /* waitpid() */
5	#endif
6
7	-#if !defined(_WIN32) && !defined(__APPLE__)
8	+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__)
9	#include <mntent.h> /* getmntent() */
10	#endif
11
12	@@ -267,7 +267,7 @@
13	int
14	is_on_slow_fs(const char *full_path)
15	{
16	-#if defined(_WIN32) \|\| defined(__APPLE__)
17	+#if defined(_WIN32) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
18	return 0;
19	#else
20	FILE *f;