Attachment 233039 Details for Bug 263128 – git diff

[patch] git diff

portconfig-0.3.diff (text/plain), 3.43 KB, created by Alfonso S. Siciliano on 2022-04-08 00:39:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alfonso S. Siciliano

Created: 2022-04-08 00:39:50 UTC

Size: 3.43 KB

patch

obsolete

>diff --git a/ports-mgmt/portconfig/Makefile b/ports-mgmt/portconfig/Makefile
>index fff16832e..f7d0c9195 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 d8f224546..904747bd2 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 a941e545f..abb28e6bd 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}

Actions: View | Diff

Attachments on bug 263128: 233039