From ab@peanut.dreadbsd.org  Sun Mar 17 13:49:53 2013
Return-Path: <ab@peanut.dreadbsd.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 35387DF8
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Mar 2013 13:49:53 +0000 (UTC)
	(envelope-from ab@peanut.dreadbsd.org)
Received: from peanut.dreadbsd.org (unknown [IPv6:2a01:e35:243c:4320:20f:b5ff:fe63:d08e])
	by mx1.freebsd.org (Postfix) with ESMTP id A9A3721B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Mar 2013 13:49:51 +0000 (UTC)
Received: from peanut.dreadbsd.org (localhost [127.0.0.1])
	by peanut.dreadbsd.org (8.14.6/8.14.6) with ESMTP id r2HDnnib003238
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Mar 2013 14:49:49 +0100 (CET)
	(envelope-from ab@peanut.dreadbsd.org)
Received: (from ab@localhost)
	by peanut.dreadbsd.org (8.14.6/8.14.6/Submit) id r2HDnh9k003237;
	Sun, 17 Mar 2013 14:49:43 +0100 (CET)
	(envelope-from ab)
Message-Id: <201303171349.r2HDnh9k003237@peanut.dreadbsd.org>
Date: Sun, 17 Mar 2013 14:49:43 +0100 (CET)
From: Antoine Brodin <antoine@freebsd.org>
Reply-To: Antoine Brodin <antoine@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] update devel/libdasm to use PORTEXAMPLES
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         177052
>Category:       ports
>Synopsis:       [maintainer] update devel/libdasm to use PORTEXAMPLES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 17 13:50:00 UTC 2013
>Closed-Date:    Sun Mar 24 18:39:30 UTC 2013
>Last-Modified:  Sun Mar 24 18:39:30 UTC 2013
>Originator:     Antoine Brodin
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD barton.dreadbsd.org. 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r248109M: Sat Mar 9 18:30:15 CET 2013 root@barton.dreadbsd.org.:/usr/obj/usr/src/sys/MYGENERICFAST i386


>Description:
- Use PORTEXAMPLES
- No need to patch examples/Makefile, we don't use it
- Clean up DOCS installation too

>How-To-Repeat:
>Fix:


--- libdasm.diff begins here ---
Index: devel/libdasm/Makefile
===================================================================
--- devel/libdasm/Makefile	(revision 314423)
+++ devel/libdasm/Makefile	(working copy)
@@ -13,15 +13,10 @@
 USE_LDCONFIG=	yes
 
 PORTDOCS=	HISTORY.txt README.txt
+PORTEXAMPLES=	README.txt das.c simple.c
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
-.endif
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC -DPIC
 .endif
@@ -30,21 +25,16 @@
 	@${REINPLACE_CMD} -E 's,^(CC|CFLAGS|PREFIX).*=,\1 ?=,; \
 			      s,libdasm.so.1.0,libdasm.so.1,g; \
 			      s,cp ,${INSTALL_DATA} ,g' \
-		${WRKSRC}/Makefile \
-		${WRKSRC}/examples/Makefile
+		${WRKSRC}/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/README.txt ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/das.c ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/simple.c ${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@for f in ${PORTDOCS}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
-	 done
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: devel/libdasm/pkg-plist
===================================================================
--- devel/libdasm/pkg-plist	(revision 314423)
+++ devel/libdasm/pkg-plist	(working copy)
@@ -2,7 +2,3 @@
 lib/libdasm.a
 lib/libdasm.so
 lib/libdasm.so.1
-%%EXAMPLES%%%%EXAMPLESDIR%%/README.txt
-%%EXAMPLES%%%%EXAMPLESDIR%%/das.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/simple.c
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- libdasm.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->antoine 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 17 13:50:07 UTC 2013 
Responsible-Changed-Why:  
Submitter is maintainer and has GNATS access (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177052 
Responsible-Changed-From-To: antoine->freebsd-ports-bugs 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Sun Mar 17 13:50:39 UTC 2013 
Responsible-Changed-Why:  
Back to freebsd-ports-bugs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177052 
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Sat Mar 23 15:56:45 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177052 

From: antoine@freebsd.org
To: bug-followup@FreeBSD.org, antoine@freebsd.org
Cc:  
Subject: Re: ports/177052: [maintainer] update devel/libdasm to
Date: Sat, 23 Mar 2013 18:09:18 +0100 (CET)

 Hello,
 
 I Noticed that the OPTIONS_DEFINE line is missing too.
 
 Cheers,
 
 Antoine
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177052: commit references a PR
Date: Sun, 24 Mar 2013 17:19:05 +0000 (UTC)

 Author: rm
 Date: Sun Mar 24 17:18:56 2013
 New Revision: 315147
 URL: http://svnweb.freebsd.org/changeset/ports/315147
 
 Log:
   - use PORTEXAMPLES
   - no need to patch examples/Makefile, we don't use it
   - clean up DOCS installation too
   
   PR:		177052
   Submitted by:	antoine (maintainer)
 
 Modified:
   head/devel/libdasm/Makefile
   head/devel/libdasm/pkg-plist
 
 Modified: head/devel/libdasm/Makefile
 ==============================================================================
 --- head/devel/libdasm/Makefile	Sun Mar 24 16:50:27 2013	(r315146)
 +++ head/devel/libdasm/Makefile	Sun Mar 24 17:18:56 2013	(r315147)
 @@ -13,15 +13,10 @@ COMMENT=	Simple x86 disassembly library
  USE_LDCONFIG=	yes
  
  PORTDOCS=	HISTORY.txt README.txt
 +PORTEXAMPLES=	README.txt das.c simple.c
  
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MEXAMPLES}
 -PLIST_SUB+=	EXAMPLES=""
 -.else
 -PLIST_SUB+=	EXAMPLES="@comment "
 -.endif
 -
  .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
  CFLAGS+=	-fPIC -DPIC
  .endif
 @@ -30,21 +25,16 @@ post-patch:
  	@${REINPLACE_CMD} -E 's,^(CC|CFLAGS|PREFIX).*=,\1 ?=,; \
  			      s,libdasm.so.1.0,libdasm.so.1,g; \
  			      s,cp ,${INSTALL_DATA} ,g' \
 -		${WRKSRC}/Makefile \
 -		${WRKSRC}/examples/Makefile
 +		${WRKSRC}/Makefile
  
  post-install:
  .if ${PORT_OPTIONS:MEXAMPLES}
  	@${MKDIR} ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/examples/README.txt ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/examples/das.c ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/examples/simple.c ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${EXAMPLESDIR}
  .endif
  .if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
 -	@for f in ${PORTDOCS}; do \
 -	  ${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
 -	 done
 +	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
  .endif
  
  .include <bsd.port.mk>
 
 Modified: head/devel/libdasm/pkg-plist
 ==============================================================================
 --- head/devel/libdasm/pkg-plist	Sun Mar 24 16:50:27 2013	(r315146)
 +++ head/devel/libdasm/pkg-plist	Sun Mar 24 17:18:56 2013	(r315147)
 @@ -2,7 +2,3 @@ include/libdasm.h
  lib/libdasm.a
  lib/libdasm.so
  lib/libdasm.so.1
 -%%EXAMPLES%%%%EXAMPLESDIR%%/README.txt
 -%%EXAMPLES%%%%EXAMPLESDIR%%/das.c
 -%%EXAMPLES%%%%EXAMPLESDIR%%/simple.c
 -%%EXAMPLES%%@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"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Sun Mar 24 18:39:29 UTC 2013 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177052 
>Unformatted:
