Date: Mon, 12 May 2014 11:52:58 -0700 From: Matthew Luckie <mjl@luckie.org.nz> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/189732: [patch] net/libbgpdump staging support Message-ID: <E1WjvLO-000HVv-DM@sorcerer.caida.org> Resent-Message-ID: <201405121900.s4CJ00Af063585@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189732
>Category: ports
>Synopsis: [patch] net/libbgpdump staging support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 12 19:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Matthew Luckie
>Release: FreeBSD 9.2-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD sorcerer.caida.org 9.2-RELEASE-p5 FreeBSD 9.2-RELEASE-p5 #0: Tue Apr 29 18:53:19 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Add staging support to libbgpdump. Note, the patch is unfinished and
will need someone with clue to finish the job. I got as far as:
$ sudo make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%
Error: Orphaned: %%PORTEXAMPLES%%%%EXAMPLESDIR%%
===> Checking for directories owned by MTREEs
===> Checking for directories handled by dependencies
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%PORTDOCS%%%%DOCSDIR%%/README
Error: Missing: %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
Error: Missing: %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
Error: Missing: %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
===> Error: Plist issues found.
*** [check-plist] Error code 1
and I'm not sure what's wrong. I have PORTDOCS%%%%DOCSDIR%%
in the plist, but I'm obviously missing something else.
>How-To-Repeat:
N/A
>Fix:
--- patch-libbgpdump-staging begins here ---
diff -uNr libbgpdump/Makefile libbgpdump-new/Makefile
--- libbgpdump/Makefile 2014-01-22 09:00:46.000000000 -0800
+++ libbgpdump-new/Makefile 2014-05-12 11:35:30.000000000 -0700
@@ -15,25 +15,15 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-PORTDOCS= README
-PORTEXAMPLES= example.c
+OPTIONS_DEFINE= DOCS EXAMPLES
-NO_STAGE= yes
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/bgpdump ${PREFIX}/bin
- @${INSTALL_DATA} ${WRKSRC}/libbgpdump.* ${PREFIX}/lib
+ @${INSTALL_PROGRAM} ${WRKSRC}/bgpdump ${STAGEDIR}${PREFIX}/bin
+ @${INSTALL_DATA} ${WRKSRC}/libbgpdump.* ${STAGEDIR}${PREFIX}/lib
.for i in bgpdump_attr.h bgpdump_formats.h bgpdump_lib.h
- @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include
.endfor
-
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
- ${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/example.c ${EXAMPLESDIR}
-.endif
+ @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/example.c ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.mk>
diff -uNr libbgpdump/pkg-descr libbgpdump-new/pkg-descr
--- libbgpdump/pkg-descr 2014-01-22 07:44:51.000000000 -0800
+++ libbgpdump-new/pkg-descr 2014-05-12 11:26:18.000000000 -0700
@@ -12,4 +12,4 @@
- BGP messages (OPEN, UPDATE, NOTIFY, KEEPALIVE)
- BGP state changes
-WWW: http://www.ris.ripe.net/source/
+WWW: http://www.ris.ripe.net/source/
diff -uNr libbgpdump/pkg-plist libbgpdump-new/pkg-plist
--- libbgpdump/pkg-plist 2014-01-22 07:16:56.000000000 -0800
+++ libbgpdump-new/pkg-plist 2014-05-12 11:46:51.000000000 -0700
@@ -4,3 +4,7 @@
include/bgpdump_attr.h
include/bgpdump_formats.h
include/bgpdump_lib.h
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- patch-libbgpdump-staging ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1WjvLO-000HVv-DM>