Attachment #237895 for bug #267595

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




PORTNAME=	vcp
PORTVERSION=	2.2
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://freebsdcluster.org/~mich/software/ \
		http://fuz.su/~fuz/distfiles/vcp/

MAINTAINER=	fuz@fuz.su
COMMENT=	Copy files in curses interface
WWW=		http://members.iinet.net.au/~lynx/vcp

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

USES=		ncurses
CFLAGS+=	-L${NCURSESLIB}

CONFLICTS=	p5-VCP \
		p5-VCP-autrijus

USES=		ncurses
LDFLAGS+=	-lncurses

OPTIONS_DEFINE=	DOCS

pre-build:
	@${REINPLACE_CMD} -e 's|/etc/vcp.conf|${PREFIX}/etc/vcp.conf|' ${WRKSRC}/misc.c
	@${REINPLACE_CMD} -e 's|/etc/vcp.conf|${PREFIX}/etc/vcp.conf|g' ${WRKSRC}/vcp.1

do-build:
	cd ${WRKSRC} && \
	${CC} ${CFLAGS} -c main.c && \
	${CC} ${CFLAGS} -c copyall.c && \
	${CC} ${CFLAGS} -c copy.c && \
	${CC} ${CFLAGS} -c screen.c && \
	${CC} ${CFLAGS} -c log.c && \
	${CC} ${CFLAGS} -c path.c && \
	${CC} ${CFLAGS} -c misc.c && \
	${CC} ${CFLAGS} -c color.c && \
	${CC} ${CFLAGS} -o ${PORTNAME} main.o copyall.o copy.o screen.o log.o path.o misc.o color.o ${LDFLAGS}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/vcp.conf.sample ${STAGEDIR}${PREFIX}/etc
	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/share/man/pl/man1
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.pl.1 ${STAGEDIR}${MAN1PREFIX}/share/man/pl/man1/${PORTNAME}.1
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}





--- common.h.orig	2022-11-06 13:00:14 UTC
+++ common.h
@@ -23,8 +23,8 @@
 #define T_DIR  1 /*      -> DIR              */
 #define T_NED  2 /* DIR  -> NON-EXISTENT DIR */
 
-WINDOW *mainw;
-WINDOW *logw;
+extern WINDOW *mainw;
+extern WINDOW *logw;
 
 struct dest_new {
 	char *opath;




--- copyall.c.orig	2022-11-06 12:59:04 UTC
+++ copyall.c
@@ -16,10 +16,6 @@
 #include "copy.h"
 #include "screen.h"
 
-#ifndef _POSIX_SOURCE
-#define st_mtime st_mtimespec.tv_sec
-#endif
-
 int copyall(char *args[],int fts_opt,int type) {
 	FTS *ftsarg;
 	FTSENT *ftsf;

Added Link Here

(-)b/sysutils/vcp/files/patch-log.c (+11 lines)
1	--- log.c.orig 2022-11-06 12:59:27 UTC
2	+++ log.c
3	@@ -45,7 +45,7 @@ int logadds(int code, char base, char var, char *var
4	}
5
6	int logget(char *name) {
7	- char c,decoy;
8	+ int c,decoy;
9	if(use_curses) {
10	if(Iflag)
11	wprintw(logw, "Overwrite %s ? [Y]/N ",name);

Added Link Here

(-)b/sysutils/vcp/files/patch-main.c (+11 lines)
1	--- main.c.orig 2022-11-06 13:00:37 UTC
2	+++ main.c
3	@@ -12,6 +12,8 @@
4	#include "screen.h"
5	#include "misc.h"
6
7	+WINDOW mainw, logw;
8	+
9	struct dest_new dest;
10
11	int use_color = 0;

Lines 1-4 Link Here

(-)b/sysutils/vcp/pkg-plist (-3 / +3 lines)
1	bin/vcp	1	bin/vcp
2	etc/vcp.conf.sample	2	@sample etc/vcp.conf.sample
3	man/man1/vcp.1.gz	3	share/man/man1/vcp.1.gz
		4	share/man/pl/man1/vcp.1.gz
4	%%PORTDOCS%%%%DOCSDIR%%/README	5	%%PORTDOCS%%%%DOCSDIR%%/README
5	-

Return to bug 267595

Lines 1-43 Link Here

(-)b/sysutils/vcp/Makefile (-21 / +12 lines)
1	PORTNAME= vcp	1	PORTNAME= vcp
2	PORTVERSION= 2.2	2	PORTVERSION= 2.2
		3	PORTREVISION= 1
3	CATEGORIES= sysutils	4	CATEGORIES= sysutils
4	MASTER_SITES= http://freebsdcluster.org/~mich/software/	5	MASTER_SITES= http://freebsdcluster.org/~mich/software/ \
		6	http://fuz.su/~fuz/distfiles/vcp/
5		7
6	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= fuz@fuz.su
7	COMMENT= Copy files in curses interface	9	COMMENT= Copy files in curses interface
8	WWW= http://members.iinet.net.au/~lynx/vcp
9		10
10	BROKEN_FreeBSD_13= ld: error: duplicate symbol: logw	11	LICENSE= BSD3CLAUSE
11	BROKEN_FreeBSD_14= ld: error: duplicate symbol: logw	12	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
		13
		14	USES= ncurses
		15	CFLAGS+= -L${NCURSESLIB}
12		16
13	CONFLICTS= p5-VCP \	17	CONFLICTS= p5-VCP \
14	p5-VCP-autrijus	18	p5-VCP-autrijus
15		19
16	USES= ncurses
17	LDFLAGS+= -lncurses
18
19	OPTIONS_DEFINE= DOCS	20	OPTIONS_DEFINE= DOCS
20		21
21	pre-build:	22	pre-build:
22	@${REINPLACE_CMD} -e 's\|/etc/vcp.conf\|${PREFIX}/etc/vcp.conf\|' ${WRKSRC}/misc.c	23	@${REINPLACE_CMD} -e 's\|/etc/vcp.conf\|${PREFIX}/etc/vcp.conf\|' ${WRKSRC}/misc.c
23	@${REINPLACE_CMD} -e 's\|/etc/vcp.conf\|${PREFIX}/etc/vcp.conf\|g' ${WRKSRC}/vcp.1	24	@${REINPLACE_CMD} -e 's\|/etc/vcp.conf\|${PREFIX}/etc/vcp.conf\|g' ${WRKSRC}/vcp.1
24		25
25	do-build:
26	cd ${WRKSRC} && \
27	${CC} ${CFLAGS} -c main.c && \
28	${CC} ${CFLAGS} -c copyall.c && \
29	${CC} ${CFLAGS} -c copy.c && \
30	${CC} ${CFLAGS} -c screen.c && \
31	${CC} ${CFLAGS} -c log.c && \
32	${CC} ${CFLAGS} -c path.c && \
33	${CC} ${CFLAGS} -c misc.c && \
34	${CC} ${CFLAGS} -c color.c && \
35	${CC} ${CFLAGS} -o ${PORTNAME} main.o copyall.o copy.o screen.o log.o path.o misc.o color.o ${LDFLAGS}
36
37	do-install:	26	do-install:
38	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
39	${INSTALL_DATA} ${WRKSRC}/vcp.conf.sample ${STAGEDIR}${PREFIX}/etc	28	${INSTALL_DATA} ${WRKSRC}/vcp.conf.sample ${STAGEDIR}${PREFIX}/etc
40	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	29	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/share/man/pl/man1
		30	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
		31	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.pl.1 ${STAGEDIR}${MAN1PREFIX}/share/man/pl/man1/${PORTNAME}.1
41	${MKDIR} ${STAGEDIR}${DOCSDIR}	32	${MKDIR} ${STAGEDIR}${DOCSDIR}
42	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}	33	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
43		34

Added Link Here

(-)b/sysutils/vcp/files/patch-common.h (+13 lines)
1	--- common.h.orig 2022-11-06 13:00:14 UTC
2	+++ common.h
3	@@ -23,8 +23,8 @@
4	#define T_DIR 1 /* -> DIR */
5	#define T_NED 2 /* DIR -> NON-EXISTENT DIR */
6
7	-WINDOW *mainw;
8	-WINDOW *logw;
9	+extern WINDOW *mainw;
10	+extern WINDOW *logw;
11
12	struct dest_new {
13	char *opath;

Added Link Here

(-)b/sysutils/vcp/files/patch-copyall.c (+13 lines)
1	--- copyall.c.orig 2022-11-06 12:59:04 UTC
2	+++ copyall.c
3	@@ -16,10 +16,6 @@
4	#include "copy.h"
5	#include "screen.h"
6
7	-#ifndef _POSIX_SOURCE
8	-#define st_mtime st_mtimespec.tv_sec
9	-#endif
10	-
11	int copyall(char *args[],int fts_opt,int type) {
12	FTS *ftsarg;
13	FTSENT *ftsf;