ports-mgmt/portconfig: Update to 0.3

PR:		263128
Approved by:	bapt
This commit is contained in:
Alfonso S. Siciliano 2022-04-22 21:36:19 +02:00
parent 5df7b7f16a
commit 58b7bd55ba
No known key found for this signature in database
GPG key ID: 3F9EEFACFD371E37
3 changed files with 26 additions and 38 deletions

View file

@ -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
USE_GITLAB= yes
GL_ACCOUNT= alfix
GL_COMMIT= 9103a17b253ead68937bfffdf9135cd6ada8a538
USES= localbase:ldflags
BUILD_DEPENDS= ${LOCALBASE}/lib/libbsddialog.a:devel/bsddialog
PLIST_FILES= bin/${PORTNAME}
USES= localbase:ldflags
USE_GITLAB= yes
GL_ACCOUNT= alfix
GL_COMMIT= d8863468ba3f5927a6f27180ec18b21724a24fcf
PLIST_FILES= bin/${PORTNAME} \
man/man1/${PORTNAME}.1.gz \
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
.include <bsd.port.mk>

View file

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

View file

@ -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}