Date: Fri, 22 Apr 2022 19:39:04 GMT From: "Alfonso S. Siciliano" <asiciliano@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 58b7bd55ba47 - main - ports-mgmt/portconfig: Update to 0.3 Message-ID: <202204221939.23MJd4Ah023734@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by asiciliano (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=58b7bd55ba47f27ca16fe4bfe9f6577392cd620f commit 58b7bd55ba47f27ca16fe4bfe9f6577392cd620f Author: Alfonso S. Siciliano <asiciliano@FreeBSD.org> AuthorDate: 2022-04-22 19:36:19 +0000 Commit: Alfonso S. Siciliano <asiciliano@FreeBSD.org> CommitDate: 2022-04-22 19:38:28 +0000 ports-mgmt/portconfig: Update to 0.3 PR: 263128 Approved by: bapt --- ports-mgmt/portconfig/Makefile | 17 +++++++++----- ports-mgmt/portconfig/distinfo | 6 ++--- ports-mgmt/portconfig/files/patch-Makefile | 37 ++++++++---------------------- 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/ports-mgmt/portconfig/Makefile b/ports-mgmt/portconfig/Makefile index fff16832e520..f7d0c9195289 100644 --- a/ports-mgmt/portconfig/Makefile +++ b/ports-mgmt/portconfig/Makefile @@ -1,5 +1,5 @@ PORTNAME= portconfig -PORTVERSION= 0.2 +PORTVERSION= 0.3 CATEGORIES= ports-mgmt MAINTAINER= bapt@FreeBSD.org @@ -7,14 +7,19 @@ COMMENT= Utility to set up FreeBSD port options LICENSE= BSD2CLAUSE +BUILD_DEPENDS= ${LOCALBASE}/lib/libbsddialog.a:devel/bsddialog + +USES= localbase:ldflags + USE_GITLAB= yes GL_ACCOUNT= alfix -GL_COMMIT= 9103a17b253ead68937bfffdf9135cd6ada8a538 +GL_COMMIT= d8863468ba3f5927a6f27180ec18b21724a24fcf -USES= localbase:ldflags -BUILD_DEPENDS= ${LOCALBASE}/lib/libbsddialog.a:devel/bsddialog +PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz \ -PLIST_FILES= bin/${PORTNAME} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ .include <bsd.port.mk> - diff --git a/ports-mgmt/portconfig/distinfo b/ports-mgmt/portconfig/distinfo index d8f2245468a6..904747bd230f 100644 --- a/ports-mgmt/portconfig/distinfo +++ b/ports-mgmt/portconfig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642434908 -SHA256 (alfix-portconfig-9103a17b253ead68937bfffdf9135cd6ada8a538_GL0.tar.gz) = 5908d23ad0680e2ae38aa3e1f21af265b2b981989333c205c86badb53a27896f -SIZE (alfix-portconfig-9103a17b253ead68937bfffdf9135cd6ada8a538_GL0.tar.gz) = 202379 +TIMESTAMP = 1649368024 +SHA256 (alfix-portconfig-d8863468ba3f5927a6f27180ec18b21724a24fcf_GL0.tar.gz) = 67d758969e970ffc046d332bb8c817d6c5ae9eefb1aecedb2070312cee067431 +SIZE (alfix-portconfig-d8863468ba3f5927a6f27180ec18b21724a24fcf_GL0.tar.gz) = 203339 diff --git a/ports-mgmt/portconfig/files/patch-Makefile b/ports-mgmt/portconfig/files/patch-Makefile index a941e545f7ae..abb28e6bd82b 100644 --- a/ports-mgmt/portconfig/files/patch-Makefile +++ b/ports-mgmt/portconfig/files/patch-Makefile @@ -1,25 +1,17 @@ ---- Makefile.orig 2021-11-20 16:29:49 UTC +--- Makefile.orig 2022-04-07 23:53:42 UTC +++ Makefile -@@ -6,23 +6,22 @@ +@@ -6,21 +6,16 @@ OUTPUT= portconfig SOURCES= portconfig.c OBJECTS= ${SOURCES:.c=.o} -LIBPATH= ${.CURDIR}/bsddialog/lib - LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so +-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so --CFLAGS= -Wall -I${LIBPATH} --LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog -+CFLAGS+= -Wall +-CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra +-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog ++CFLAGS+= -std=gnu99 -Wall -Wextra +LDFLAGS+= -L/usr/lib -Wl,-Bstatic -v -Wl,-whole-archive -lbsddialog -Wl,-no-whole-archive -lformw -lncursesw -ltinfow -Wl,-Bdynamic -Wl,--export-dynamic --BINDIR= /usr/local/bin -+BINDIR= ${PREFIX}/bin - MAN= ${OUTPUT}.1 - GZIP= gzip -cn --MANDIR= /usr/local/share/man/man1 -+MANDIR= ${PREFIX}/share/man/man1 - - INSTALL= install RM= rm -f all : ${OUTPUT} @@ -27,18 +19,9 @@ -${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS} +${OUTPUT}: ${OBJECTS} ${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX} +- +-${LIBBSDDIALOG}: +- make -C ${LIBPATH} - ${LIBBSDDIALOG}: -@@ -36,9 +35,9 @@ ${LIBBSDDIALOG}: + .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - - install: -- ${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR} -- ${GZIP} ${MAN} > ${MAN}.gz -- ${INSTALL} -m 444 ${MAN}.gz ${MANDIR} -+ ${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR} -+ #${GZIP} ${MAN} > ${MAN}.gz -+ #${INSTALL} -m 444 ${MAN}.gz ${MANDIR} - - unistall: - ${RM} ${BINDIR}/${OUTPUT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204221939.23MJd4Ah023734>