Attachment #233040 for bug #263127




PORTNAME=	bsddialog
PORTVERSION=	0.2
CATEGORIES=	devel

MAINTAINER=	bapt@FreeBSD.org


USE_GITLAB=	yes
GL_ACCOUNT=	alfix
GL_COMMIT=	c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c

LIBDIR=	${WRKSRC}/lib
HEADERS=	${LIBDIR}/bsddialog.h \
		${LIBDIR}/bsddialog_progressview.h \
		${LIBDIR}/bsddialog_theme.h

do-install:
	${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include
	${INSTALL_LIB} ${LIBDIR}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/
	${INSTALL} -l rs ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
	${INSTALL_DATA} ${LIBDIR}/lib${PORTNAME}.a ${STAGEDIR}/${PREFIX}/lib
	${INSTALL_MAN} ${LIBDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/bsddialog/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1642434705	1	TIMESTAMP = 1649359564
2	SHA256 (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 9e1e64137b9c93e1c305e8a9f17e5fc16984fe797a0c90b036a3bbbdf4583b67	2	SHA256 (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = af5fd0a4cca5f109e6bdcc0d7a6ac73e4f959c50056e6f331c52899036cc2bc7
3	SIZE (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 51722	3	SIZE (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = 60929




--- Makefile.orig	2022-04-07 21:39:48 UTC
+++ Makefile
@@ -15,7 +15,7 @@ CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
 CFLAGS= -g -Wall -I${LIBPATH}
 LIBDEBUG= -DDEBUG
 .endif
-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+LIBBSDDIALOG= ${LIBPATH}/libbsddialog.a
 
-CFLAGS= -Wall -I${LIBPATH}
-LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+CFLAGS+= -Wall -I${LIBPATH}
+LDFLAGS+= -L${LIBPATH} -lbsddialog
 
 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
@@ -36,9 +36,10 @@ ${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}
+	${MAKE} -C ${LIBPATH} install
+	#${GZIP} ${MAN} > ${MAN}.gz
+	#${INSTALL} -m 444 ${MAN}.gz ${DESTDIR}${MANDIR}
 
 unistall:
 	${RM} ${BINDIR}/${OUTPUT}




--- lib/Makefile.orig	2021-11-22 01:09:04 UTC
+++ lib/Makefile
@@ -6,6 +6,7 @@
 VERSION = 0.1
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
+LIBRARY_A = lib${LIBRARY:=.a}
 HEADERS = bsddialog.h bsddialog_theme.h
 SOURCES = barbox.c editorbox.c formbox.c lib_util.c menubox.c textbox.c \
 	timebox.c commandbox.c filebox.c infobox.c libbsddialog.c messagebox.c \
@@ -13,8 +14,8 @@ SOURCES = barbox.c editorbox.c formbox.c lib_util.c me
 OBJECTS= ${SOURCES:.c=.o}
 FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
 	-fstack-protector-strong -Qunused-arguments
-CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra ${FBSDFLAGS}
-LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
+CFLAGS += -fPIC -Wall -Wextra ${FBSDFLAGS}
+LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
 	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} 
 
 INSTALL_PREFIX=/usr/local
@@ -43,11 +44,18 @@ RM= rm -f
 #all : man ${LIBRARY}
 all : ${LIBRARY}
 
-${LIBRARY}: ${OBJECTS}
+${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
+
+${LIBRARY_SO}.${VERSION}: ${OBJECTS}
 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
-	# LN for devel
+
+${LIBRARY_SO}: ${LIBRARY_SO}.${VERSION}
 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
 
+${LIBRARY_A}: ${OBJECTS}
+	${AR} cr ${.TARGET} ${OBJECTS}
+	${RANLIB} ${.TARGET}
+
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
@@ -59,11 +67,12 @@ clean:
 
 
 install:
-	${CP} ${LIBRARY}.h ${INSTALL_PREFIX}/include
-	${CP} ${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/
-	${LN} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
-	${LDCONFIG} ${INSTALL_PREFIX}/lib
-	${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
+	${INSTALL} -m 644 ${HEADERS} ${DESTDIR}${INSTALL_PREFIX}/include
+	${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/
+	${INSTALL} -l rs ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}
+	${INSTALL} -m 644 ${LIBRARY_A} ${DESTDIR}/${INSTALL_PREFIX}/lib
+	#${LDCONFIG} ${INSTALL_PREFIX}/lib
+	#${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
 
 unistall:
 	${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h

Lines 1-6 Link Here

(-)b/devel/bsddialog/pkg-plist (-1 / +4 lines)
1	bin/bsddialog	1	bin/bsddialog
2	include/bsddialog.h	2	include/bsddialog.h
		3	include/bsddialog_progressview.h
3	include/bsddialog_theme.h	4	include/bsddialog_theme.h
4	lib/libbsddialog.a	5	lib/libbsddialog.a
5	lib/libbsddialog.so	6	lib/libbsddialog.so
6	lib/libbsddialog.so.0.0.1	7	lib/libbsddialog.so.0.2
		8	man/man1/bsddialog.1.gz
		9	man/man3/bsddialog.3.gz

Return to bug 263127

Lines 1-5 Link Here

(-)b/devel/bsddialog/Makefile (-3 / +16 lines)
1	PORTNAME= bsddialog	1	PORTNAME= bsddialog
2	PORTVERSION= 0.0.0.g20211213	2	PORTVERSION= 0.2
3	CATEGORIES= devel	3	CATEGORIES= devel
4		4
5	MAINTAINER= bapt@FreeBSD.org	5	MAINTAINER= bapt@FreeBSD.org
Lines 9-15 LICENSE= BSD2CLAUSE Link Here
9		9
10	USE_GITLAB= yes	10	USE_GITLAB= yes
11	GL_ACCOUNT= alfix	11	GL_ACCOUNT= alfix
12	GL_COMMIT= 98afee468ccd515c9082dc668f80092ca4553825	12	GL_COMMIT= c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c
13		13
14	.include <bsd.port.mk>	14	LIBDIR= ${WRKSRC}/lib
		15	HEADERS= ${LIBDIR}/bsddialog.h \
		16	${LIBDIR}/bsddialog_progressview.h \
		17	${LIBDIR}/bsddialog_theme.h
		18
		19	do-install:
		20	${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include
		21	${INSTALL_LIB} ${LIBDIR}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/
		22	${INSTALL} -l rs ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
		23	${INSTALL_DATA} ${LIBDIR}/lib${PORTNAME}.a ${STAGEDIR}/${PREFIX}/lib
		24	${INSTALL_MAN} ${LIBDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
		25	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
		26	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
15		27
		28	.include <bsd.port.mk>

Lines 1-37 Link Here

(-)b/devel/bsddialog/files/patch-Makefile (-33 / +7 lines)
1	--- Makefile.orig 2021-11-22 01:09:04 UTC	1	--- Makefile.orig 2022-04-07 21:39:48 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -7,15 +7,15 @@ OUTPUT= bsddialog	3	@@ -15,7 +15,7 @@ CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
4	SOURCES= bsddialog.c	4	CFLAGS= -g -Wall -I${LIBPATH}
5	OBJECTS= ${SOURCES:.c=.o}	5	LIBDEBUG= -DDEBUG
6	LIBPATH= ${.CURDIR}/lib	6	.endif
7	-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so	7	-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
8	+LIBBSDDIALOG= ${LIBPATH}/libbsddialog.a
9
10	-CFLAGS= -Wall -I${LIBPATH}
11	-LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
12	+CFLAGS+= -Wall -I${LIBPATH}
13	+LDFLAGS+= -L${LIBPATH} -lbsddialog	8	+LDFLAGS+= -L${LIBPATH} -lbsddialog
14		9
15	-BINDIR= /usr/local/bin	10	BINDIR= /usr/local/bin
16	+BINDIR= ${PREFIX}/bin
17	MAN= ${OUTPUT}.1	11	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
24	@@ -36,9 +36,10 @@ ${LIBBSDDIALOG}:
25	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
26
27	install:
28	- ${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
29	- ${GZIP} ${MAN} > ${MAN}.gz
30	- ${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
31	+ ${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR}
32	+ ${MAKE} -C ${LIBPATH} install
33	+ #${GZIP} ${MAN} > ${MAN}.gz
34	+ #${INSTALL} -m 444 ${MAN}.gz ${DESTDIR}${MANDIR}
35
36	unistall:
37	${RM} ${BINDIR}/${OUTPUT}

Removed Link Here

(-)a/devel/bsddialog/files/patch-lib_Makefile (-60 lines)
1	--- lib/Makefile.orig 2021-11-22 01:09:04 UTC
2	+++ lib/Makefile
3	@@ -6,6 +6,7 @@
4	VERSION = 0.1
5	LIBRARY = bsddialog
6	LIBRARY_SO = lib${LIBRARY:=.so}
7	+LIBRARY_A = lib${LIBRARY:=.a}
8	HEADERS = bsddialog.h bsddialog_theme.h
9	SOURCES = barbox.c editorbox.c formbox.c lib_util.c menubox.c textbox.c \
10	timebox.c commandbox.c filebox.c infobox.c libbsddialog.c messagebox.c \
11	@@ -13,8 +14,8 @@ SOURCES = barbox.c editorbox.c formbox.c lib_util.c me
12	OBJECTS= ${SOURCES:.c=.o}
13	FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
14	-fstack-protector-strong -Qunused-arguments
15	-CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra ${FBSDFLAGS}
16	-LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
17	+CFLAGS += -fPIC -Wall -Wextra ${FBSDFLAGS}
18	+LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
19	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION}
20
21	INSTALL_PREFIX=/usr/local
22	@@ -43,11 +44,18 @@ RM= rm -f
23	#all : man ${LIBRARY}
24	all : ${LIBRARY}
25
26	-${LIBRARY}: ${OBJECTS}
27	+${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
28	+
29	+${LIBRARY_SO}.${VERSION}: ${OBJECTS}
30	${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
31	- # LN for devel
32	+
33	+${LIBRARY_SO}: ${LIBRARY_SO}.${VERSION}
34	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
35
36	+${LIBRARY_A}: ${OBJECTS}
37	+ ${AR} cr ${.TARGET} ${OBJECTS}
38	+ ${RANLIB} ${.TARGET}
39	+
40	.c.o:
41	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
42
43	@@ -59,11 +67,12 @@ clean:
44
45
46	install:
47	- ${CP} ${LIBRARY}.h ${INSTALL_PREFIX}/include
48	- ${CP} ${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/
49	- ${LN} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
50	- ${LDCONFIG} ${INSTALL_PREFIX}/lib
51	- ${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
52	+ ${INSTALL} -m 644 ${HEADERS} ${DESTDIR}${INSTALL_PREFIX}/include
53	+ ${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/
54	+ ${INSTALL} -l rs ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}
55	+ ${INSTALL} -m 644 ${LIBRARY_A} ${DESTDIR}/${INSTALL_PREFIX}/lib
56	+ #${LDCONFIG} ${INSTALL_PREFIX}/lib
57	+ #${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
58
59	unistall:
60	${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h