git: da3273f7c3c3 - main - sysutils/vcp: Unbreak and set maintainer
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Nov 2022 16:44:21 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=da3273f7c3c3f577dbaba14c06c689a81113a949
commit da3273f7c3c3f577dbaba14c06c689a81113a949
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-11-07 19:05:30 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-11-08 16:40:20 +0000
sysutils/vcp: Unbreak and set maintainer
* fix build with -fno-common
* simplify Makefile
* remove outdated WWW
* fix plist and install Polish man page
* fix bug when char is unsigned
* mirror distfile on my own site for redundancy
* take maintainership over this unmaintained port
PR: 267595
Reported by: fuz@fuz.su (maintainer)
MFH: 2022Q4 (build fix)
---
sysutils/vcp/Makefile | 33 ++++++++++++---------------------
sysutils/vcp/files/patch-common.h | 13 +++++++++++++
sysutils/vcp/files/patch-copyall.c | 13 +++++++++++++
sysutils/vcp/files/patch-log.c | 11 +++++++++++
sysutils/vcp/files/patch-main.c | 11 +++++++++++
sysutils/vcp/pkg-plist | 5 +++--
6 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/sysutils/vcp/Makefile b/sysutils/vcp/Makefile
index c29b9ded6cb0..7c854b746013 100644
--- a/sysutils/vcp/Makefile
+++ b/sysutils/vcp/Makefile
@@ -1,43 +1,34 @@
PORTNAME= vcp
PORTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://freebsdcluster.org/~mich/software/
+MASTER_SITES= http://freebsdcluster.org/~mich/software/ \
+ http://fuz.su/~fuz/distfiles/vcp/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= fuz@fuz.su
COMMENT= Copy files in curses interface
-WWW= http://members.iinet.net.au/~lynx/vcp
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: logw
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: logw
+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
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${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}
diff --git a/sysutils/vcp/files/patch-common.h b/sysutils/vcp/files/patch-common.h
new file mode 100644
index 000000000000..d002cc52b60f
--- /dev/null
+++ b/sysutils/vcp/files/patch-common.h
@@ -0,0 +1,13 @@
+--- 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;
diff --git a/sysutils/vcp/files/patch-copyall.c b/sysutils/vcp/files/patch-copyall.c
new file mode 100644
index 000000000000..da2650efebf1
--- /dev/null
+++ b/sysutils/vcp/files/patch-copyall.c
@@ -0,0 +1,13 @@
+--- 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;
diff --git a/sysutils/vcp/files/patch-log.c b/sysutils/vcp/files/patch-log.c
new file mode 100644
index 000000000000..be606b5e1f36
--- /dev/null
+++ b/sysutils/vcp/files/patch-log.c
@@ -0,0 +1,11 @@
+--- log.c.orig 2022-11-06 12:59:27 UTC
++++ log.c
+@@ -45,7 +45,7 @@ int logadds(int code, char *base, char *var, char *var
+ }
+
+ int logget(char *name) {
+- char c,decoy;
++ int c,decoy;
+ if(use_curses) {
+ if(Iflag)
+ wprintw(logw, "Overwrite %s ? [Y]/N ",name);
diff --git a/sysutils/vcp/files/patch-main.c b/sysutils/vcp/files/patch-main.c
new file mode 100644
index 000000000000..2d514fc4da25
--- /dev/null
+++ b/sysutils/vcp/files/patch-main.c
@@ -0,0 +1,11 @@
+--- main.c.orig 2022-11-06 13:00:37 UTC
++++ main.c
+@@ -12,6 +12,8 @@
+ #include "screen.h"
+ #include "misc.h"
+
++WINDOW *mainw, *logw;
++
+ struct dest_new dest;
+
+ int use_color = 0;
diff --git a/sysutils/vcp/pkg-plist b/sysutils/vcp/pkg-plist
index b578da94dff0..650e5c99b757 100644
--- a/sysutils/vcp/pkg-plist
+++ b/sysutils/vcp/pkg-plist
@@ -1,4 +1,5 @@
bin/vcp
-etc/vcp.conf.sample
-man/man1/vcp.1.gz
+@sample etc/vcp.conf.sample
+share/man/man1/vcp.1.gz
+share/man/pl/man1/vcp.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README