Attachment #133171 for bug #177589

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




#

PORTNAME=	vifm
PORTVERSION=	0.7.4b
CATEGORIES=	misc
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

OPTIONS=	VIFM_SCREEN "Use vifm with the screen program" off

USE_BZIP2=	yes
USE_NCURSES=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	autoconf
CONFIGURE_ARGS=	--without-gtk
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
		AUTOMAKE="${TRUE}"

MAN1=		vifm.1 \
		vifmrc-converter.1
PLIST_FILES=	bin/vifm \
		bin/vifmrc-converter \
		bin/vifm-pause \
		%%DATADIR%%/startup \
		%%DATADIR%%/vifm-help.txt \
		%%DATADIR%%/vifm.txt \
		%%DATADIR%%/vifm.vim \
		%%DATADIR%%/vifmrc
PLIST_DIRS=	%%DATADIR%%

.include <bsd.port.mk>

.if defined(WITH_VIFM_SCREEN)
RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen
.endif

post-patch:
	@${REINPLACE_CMD} -e 's/resize_term/resizeterm/g' \
		${WRKSRC}/src/ui.c
.if defined(WITH_VIFM_SCREEN)
	@${REINPLACE_CMD} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
		${WRKSRC}/src/config.c
	@${REINPLACE_CMD} -e "s/USE_SCREEN=0/USE_SCREEN=1/" \
		${WRKSRC}/src/vifmrc
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (vifm-0.6.3.tar.bz2) = 7b6ac1056e7fbca46fb8eb1a40f31c92fc5694b19ca4267fc63e9e295d8cb3ec	1	SHA256 (vifm-0.7.4b.tar.bz2) = 90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57
2	SIZE (vifm-0.6.3.tar.bz2) = 386861	2	SIZE (vifm-0.7.4b.tar.bz2) = 562778




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

Lines 1-11 Link Here

(-)files/patch-src__commands.c (-11 lines)
1	--- src/commands.c.orig 2011-06-19 22:52:25.000000000 +0900
2	+++ src/commands.c 2011-06-26 15:19:03.000000000 +0900
3	@@ -27,6 +27,8 @@
4	#include <stdlib.h> /* system() */
5	#include <string.h> /* strncmp() */
6	#include <time.h>
7	+#include <sys/types.h>
8	+#include <sys/wait.h>
9
10	#include "background.h"
11	#include "bookmarks.h"

Lines 1-13 Link Here

(-)files/patch-src__file_magic.c (-13 lines)
1	--- src/file_magic.c.orig 2011-06-19 22:52:25.000000000 +0900
2	+++ src/file_magic.c 2011-06-26 15:30:02.000000000 +0900
3	@@ -9,7 +9,9 @@
4	#include <magic.h>
5	#endif
6
7	-#include <sys/dir.h>
8	+#include <sys/types.h>
9	+#include <dirent.h>
10	+#include <limits.h>
11
12	#include <stdio.h>
13	#include <stdlib.h>

Lines 1-11 Link Here

(-)files/patch-src__fileops.c (-11 lines)
1	--- src/fileops.c.orig 2011-07-21 15:59:01.000000000 +0300
2	+++ src/fileops.c 2011-08-29 22:03:45.000000000 +0300
3	@@ -1255,7 +1255,7 @@
4
5	stat(temp_file, &st_after);
6
7	- if(memcmp(&st_after.st_mtim, &st_before.st_mtim,
8	+ if(memcmp(&st_after.st_mtime, &st_before.st_mtime,
9	sizeof(st_after.st_mtime)) == 0)
10	{
11	unlink(temp_file);

Return to bug 177589

Lines 6-12 Link Here

(-)Makefile (-25 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= vifm	8	PORTNAME= vifm
9	PORTVERSION= 0.6.3	9	PORTVERSION= 0.7.4b
10	CATEGORIES= misc	10	CATEGORIES= misc
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
12		12
Lines 16-54 Link Here
16	LICENSE= GPLv2	16	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/COPYING	17	LICENSE_FILE= ${WRKSRC}/COPYING
18		18
19	OPTIONS= VIFM_SCREEN "Use vifm with the screen program" off
20
21	USE_BZIP2= yes	19	USE_BZIP2= yes
22	USE_NCURSES= yes	20	USE_NCURSES= yes
23	GNU_CONFIGURE= yes	21	USE_GMAKE= yes
		22	USE_AUTOTOOLS= autoconf
24	CONFIGURE_ARGS= --without-gtk	23	CONFIGURE_ARGS= --without-gtk
25	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \	24	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
26	AUTOMAKE="${TRUE}"	25	AUTOMAKE="${TRUE}"
27		26
28	MAN1= vifm.1	27	MAN1= vifm.1 \
		28	vifmrc-converter.1
29	PLIST_FILES= bin/vifm \	29	PLIST_FILES= bin/vifm \
		30	bin/vifmrc-converter \
30	bin/vifm-pause \	31	bin/vifm-pause \
31	%%DATADIR%%/startup \
32	%%DATADIR%%/vifm-help.txt \	32	%%DATADIR%%/vifm-help.txt \
33	%%DATADIR%%/vifm.txt \
34	%%DATADIR%%/vifm.vim \
35	%%DATADIR%%/vifmrc	33	%%DATADIR%%/vifmrc
36	PLIST_DIRS= %%DATADIR%%	34	PLIST_DIRS= %%DATADIR%%
37		35
38	.include <bsd.port.pre.mk>	36	.include <bsd.port.mk>
39
40	.if defined(WITH_VIFM_SCREEN)
41	RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen
42	.endif
43
44	post-patch:
45	@${REINPLACE_CMD} -e 's/resize_term/resizeterm/g' \
46	${WRKSRC}/src/ui.c
47	.if defined(WITH_VIFM_SCREEN)
48	@${REINPLACE_CMD} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
49	${WRKSRC}/src/config.c
50	@${REINPLACE_CMD} -e "s/USE_SCREEN=0/USE_SCREEN=1/" \
51	${WRKSRC}/src/vifmrc
52	.endif
53
54	.include <bsd.port.post.mk>

Line 0 Link Here

(-)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.])])

Line 0 Link Here

(-)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	{

Line 0 Link Here

(-)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;