Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Mar 2013 17:18:57 +0000 (UTC)
From:      Ruslan Mahmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r315147 - head/devel/libdasm
Message-ID:  <201303241718.r2OHIvRJ054627@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303241718.r2OHIvRJ054627>