Attachment #233039 for bug #263128

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

Lines 1-5 Link Here

(-)b/ports-mgmt/portconfig/Makefile (-6 / +11 lines)
1	PORTNAME= portconfig	1	PORTNAME= portconfig
2	PORTVERSION= 0.2	2	PORTVERSION= 0.3
3	CATEGORIES= ports-mgmt	3	CATEGORIES= ports-mgmt
4		4
5	MAINTAINER= bapt@FreeBSD.org	5	MAINTAINER= bapt@FreeBSD.org
Lines 7-20 COMMENT= Utility to set up FreeBSD port options Link Here
7		7
8	LICENSE= BSD2CLAUSE	8	LICENSE= BSD2CLAUSE
9		9
		10	BUILD_DEPENDS= ${LOCALBASE}/lib/libbsddialog.a:devel/bsddialog
		11
		12	USES= localbase:ldflags
		13
10	USE_GITLAB= yes	14	USE_GITLAB= yes
11	GL_ACCOUNT= alfix	15	GL_ACCOUNT= alfix
12	GL_COMMIT= 9103a17b253ead68937bfffdf9135cd6ada8a538	16	GL_COMMIT= d8863468ba3f5927a6f27180ec18b21724a24fcf
13		17
14	USES= localbase:ldflags	18	PLIST_FILES= bin/${PORTNAME} \
15	BUILD_DEPENDS= ${LOCALBASE}/lib/libbsddialog.a:devel/bsddialog	19	man/man1/${PORTNAME}.1.gz \
16		20
17	PLIST_FILES= bin/${PORTNAME}	21	do-install:
		22	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
		23	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
18		24
19	.include <bsd.port.mk>	25	.include <bsd.port.mk>
20

Lines 1-3 Link Here

(-)b/ports-mgmt/portconfig/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1642434908	1	TIMESTAMP = 1649368024
2	SHA256 (alfix-portconfig-9103a17b253ead68937bfffdf9135cd6ada8a538_GL0.tar.gz) = 5908d23ad0680e2ae38aa3e1f21af265b2b981989333c205c86badb53a27896f	2	SHA256 (alfix-portconfig-d8863468ba3f5927a6f27180ec18b21724a24fcf_GL0.tar.gz) = 67d758969e970ffc046d332bb8c817d6c5ae9eefb1aecedb2070312cee067431
3	SIZE (alfix-portconfig-9103a17b253ead68937bfffdf9135cd6ada8a538_GL0.tar.gz) = 202379	3	SIZE (alfix-portconfig-d8863468ba3f5927a6f27180ec18b21724a24fcf_GL0.tar.gz) = 203339




--- Makefile.orig	2022-04-07 23:53:42 UTC
+++ Makefile
@@ -6,21 +6,16 @@
 OUTPUT=  portconfig
 SOURCES= portconfig.c
 OBJECTS= ${SOURCES:.c=.o}
-LIBPATH= ${.CURDIR}/bsddialog/lib
-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
 
-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}

-${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}
+${OUTPUT}: ${OBJECTS}
 	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
-
-${LIBBSDDIALOG}:
-	make -C ${LIBPATH}
 
 .c.o:
@@ -36,9 +35,9 @@ ${LIBBSDDIALOG}:
 	${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}

Return to bug 263128

Lines 1-25 Link Here

(-)b/ports-mgmt/portconfig/files/patch-Makefile (-27 / +10 lines)
1	--- Makefile.orig 2021-11-20 16:29:49 UTC	1	--- Makefile.orig 2022-04-07 23:53:42 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -6,23 +6,22 @@	3	@@ -6,21 +6,16 @@
4	OUTPUT= portconfig	4	OUTPUT= portconfig
5	SOURCES= portconfig.c	5	SOURCES= portconfig.c
6	OBJECTS= ${SOURCES:.c=.o}	6	OBJECTS= ${SOURCES:.c=.o}
7	-LIBPATH= ${.CURDIR}/bsddialog/lib	7	-LIBPATH= ${.CURDIR}/bsddialog/lib
8	LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so	8	-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
9		9
10	-CFLAGS= -Wall -I${LIBPATH}	10	-CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra
11	-LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog	11	-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
12	+CFLAGS+= -Wall	12	+CFLAGS+= -std=gnu99 -Wall -Wextra
13	+LDFLAGS+= -L/usr/lib -Wl,-Bstatic -v -Wl,-whole-archive -lbsddialog -Wl,-no-whole-archive -lformw -lncursesw -ltinfow -Wl,-Bdynamic -Wl,--export-dynamic	13	+LDFLAGS+= -L/usr/lib -Wl,-Bstatic -v -Wl,-whole-archive -lbsddialog -Wl,-no-whole-archive -lformw -lncursesw -ltinfow -Wl,-Bdynamic -Wl,--export-dynamic
14		14
15	-BINDIR= /usr/local/bin
16	+BINDIR= ${PREFIX}/bin
17	MAN= ${OUTPUT}.1
18	GZIP= gzip -cn
19	-MANDIR= /usr/local/share/man/man1
20	+MANDIR= ${PREFIX}/share/man/man1
21
22	INSTALL= install
23	RM= rm -f	15	RM= rm -f
24		16
25	all : ${OUTPUT}	17	all : ${OUTPUT}
Lines 27-44 Link Here
27	-${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}	19	-${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}
28	+${OUTPUT}: ${OBJECTS}	20	+${OUTPUT}: ${OBJECTS}
29	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}	21	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
		22	-
		23	-${LIBBSDDIALOG}:
		24	- make -C ${LIBPATH}
30		25
31	${LIBBSDDIALOG}:	26	.c.o:
32	@@ -36,9 +35,9 @@ ${LIBBSDDIALOG}:
33	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}	27	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
34
35	install:
36	- ${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
37	- ${GZIP} ${MAN} > ${MAN}.gz
38	- ${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
39	+ ${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR}
40	+ #${GZIP} ${MAN} > ${MAN}.gz
41	+ #${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
42
43	unistall:
44	${RM} ${BINDIR}/${OUTPUT}