Bug 189732 - [patch] net/libbgpdump staging support
Summary: [patch] net/libbgpdump staging support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-12 20:00 UTC by mjl
Modified: 2014-05-14 13:10 UTC (History)
0 users

See Also:


Attachments
patch-libbgpdump-staging (1.89 KB, text/plain)
2014-05-12 20:00 UTC, mjl
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description mjl 2014-05-12 20:00:00 UTC
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
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2014-05-14 04:37:15 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 2 Dmitry Marakasov freebsd_committer freebsd_triage 2014-05-14 13:04:15 UTC
State Changed
From-To: open->closed

Committed, with minor changes.  Thanks!  (You missed DOCS/EXAMPLES 
diretory creation, so files were installed instead, not into 
directories, so plist was incorrect).  Please also consider unsilencing 
install target and stripping the library (Warning: 'lib/libbgpdump.so' 
is not stripped consider using ${STRIP_CMD}).
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-05-14 13:04:35 UTC
Author: amdmi3
Date: Wed May 14 12:04:31 2014
New Revision: 354041
URL: http://svnweb.freebsd.org/changeset/ports/354041
QAT: https://qat.redports.org/buildarchive/r354041/

Log:
  - Support staging
  
  PR:		189732
  Submitted by:	Matthew Luckie <mjl@luckie.org.nz> (maintainer)

Modified:
  head/net/libbgpdump/Makefile
  head/net/libbgpdump/pkg-descr
  head/net/libbgpdump/pkg-plist

Modified: head/net/libbgpdump/Makefile
==============================================================================
--- head/net/libbgpdump/Makefile	Wed May 14 12:04:21 2014	(r354040)
+++ head/net/libbgpdump/Makefile	Wed May 14 12:04:31 2014	(r354041)
@@ -15,25 +15,16 @@ LICENSE=	GPLv2
 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
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example.c ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/net/libbgpdump/pkg-descr
==============================================================================
--- head/net/libbgpdump/pkg-descr	Wed May 14 12:04:21 2014	(r354040)
+++ head/net/libbgpdump/pkg-descr	Wed May 14 12:04:31 2014	(r354041)
@@ -12,4 +12,4 @@ Entry formats:
           - BGP messages (OPEN, UPDATE, NOTIFY, KEEPALIVE)
           - BGP state changes
 
-WWW:	http://www.ris.ripe.net/source/
+WWW: http://www.ris.ripe.net/source/

Modified: head/net/libbgpdump/pkg-plist
==============================================================================
--- head/net/libbgpdump/pkg-plist	Wed May 14 12:04:21 2014	(r354040)
+++ head/net/libbgpdump/pkg-plist	Wed May 14 12:04:31 2014	(r354041)
@@ -4,3 +4,7 @@ lib/libbgpdump.so
 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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"