From nobody Tue Nov 08 16:45:12 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N6DVJ2NJ0z4YVYK; Tue, 8 Nov 2022 16:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N6DVJ1x95z40Ly; Tue, 8 Nov 2022 16:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667925912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12n6I458anAfvCuVCpF/N+GJVuIM61A3s3NeWVuUJpI=; b=MG29NKhHkFojJdxcP0mobyn2BZr6PrAHVjMVC3ZB2M9LJ7zFFO2HxeKQLV9rTWpPTVOXRM 4ldMs4ULvHG4hvSLNQBG20mDCI3P7kUfmRUhNXZl2Oeb43WbXg7/A2PgGv0V3WDKPEdYmg yMs5ggbgg/GNTeuphm+QS9Ch30VxzoqnWUIY24lfx6a5FYXrQwTSSichibOzxp+eMgDWnK Ksjb1CthNyExPtOYxmJ6CejxkrHOk0tIQsFpUSiOqKQA9eX67JlWk+5Qd3EaZ9KtFi6DlX fTggIPeQ6EjswCDRUcuzGQOu1bTeYtvBWOJgNhLUhJqrq9esABzoeDYWVkgTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667925912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12n6I458anAfvCuVCpF/N+GJVuIM61A3s3NeWVuUJpI=; b=lS2U8olKVcQrv2xRwhku7y6Vm43x79d6vfl/P1EpjV9fkzQYcnqhgOrvJwtkGkxHaTHKG1 bv19XrPt0bm9ZMbJ8/eYAMqUH7JXdtIB6ClMzaxAr0vCFr0oC8SSHQsmHJwlcEMJwdHGyK N1HPakcLeyzaEd8GxGf+T9XrjAUHaU7HVFHnhjhUC53BgpxkYpx2pTP4MMoSTAg86YK9Ry Bwd5HvwvLue6ZqEtRVWsg9f7G6hlJG+Bxl307HWzEKCD71allDgG0NUJkuj0XR03XVqdPU UsdBmit26MNvrUx1l/MBu1ZXHRAL+gbSc3BrNpW1yClLysuoGpfoiYZuongtgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667925912; a=rsa-sha256; cv=none; b=Ge1LxfvjQtgNDJwgaRq/YxN11yJFl7vL37kMyJ+TUNB9k17bo/im7c0WFq31W5EIDy6az6 7xmbCVAt5mRQHBJS5miO2OAMCpHwKj74u438pgX6HnJQ8qXqhRSyUyD8LaUjx2jJ7rra42 Iu3rA+Px9rfeJ1i856uZiAmmL9l06kqMgQcM28I05MsNnW5cua9uQTNKxErreZSljJkJQl AseToZJ/Svd7rX8zUvidHPIX14uUPC4i/+Xqas+WhTNLPgBshUy49nhPXccW56LLtxq+gU fUqPGFdJhv/WNql+GKxUeAF6nrpRMEbaBUNbSJyxWIr4sNBF/j1qTR+bR3kfRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N6DVJ107fzq35; Tue, 8 Nov 2022 16:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A8GjCXB000415; Tue, 8 Nov 2022 16:45:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8GjCSL000414; Tue, 8 Nov 2022 16:45:12 GMT (envelope-from git) Date: Tue, 8 Nov 2022 16:45:12 GMT Message-Id: <202211081645.2A8GjCSL000414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 30e3bc1832df - 2022Q4 - sysutils/vcp: Unbreak and set maintainer List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 30e3bc1832df3e9388cdffcb7bbc6397bde8d236 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=30e3bc1832df3e9388cdffcb7bbc6397bde8d236 commit 30e3bc1832df3e9388cdffcb7bbc6397bde8d236 Author: Robert Clausecker AuthorDate: 2022-11-07 19:05:30 +0000 Commit: Fernando Apesteguía CommitDate: 2022-11-08 16:41:25 +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) (cherry picked from commit da3273f7c3c3f577dbaba14c06c689a81113a949) --- 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