- Respect PORTDOCS

Reported by: IonBot
truenas · Aug 8, 2008 · 24103d5 · 24103d5
1 parent 4a952a9
commit 24103d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFor
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	${MAKE_ENV}
+PORTDOCS=	COPYRIGHT README RELEASE_NOTES
 
 MAN1=		ncdump.1 ncgen.1
 MAN3=		netcdf.3
@@ -44,10 +45,8 @@ post-install:
 	${LN} -fs libnetcdf.so.4 ${PREFIX}/lib/libnetcdf.so
 	${LN} -fs libnetcdf_c++.so.4 ${PREFIX}/lib/libnetcdf_c++.so
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in COPYRIGHT README RELEASE_NOTES
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .else
 CONFIGURE_ARGS+=	--disable-docs-install
 .endif

diff --git a/science/netcdf/pkg-plist b/science/netcdf/pkg-plist
@@ -18,7 +18,3 @@ lib/libnetcdf_c++.so.4
 %%FORTRAN%%lib/libnetcdff.la
 %%FORTRAN%%lib/libnetcdff.so
 %%FORTRAN%%lib/libnetcdff.so.4
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFor
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	${MAKE_ENV}
+PORTDOCS=	COPYRIGHT README RELEASE_NOTES
 
 MAN1=		ncdump.1 ncgen.1
 MAN3=		netcdf.3
@@ -44,10 +45,8 @@ post-install:
 	${LN} -fs libnetcdf.so.4 ${PREFIX}/lib/libnetcdf.so
 	${LN} -fs libnetcdf_c++.so.4 ${PREFIX}/lib/libnetcdf_c++.so
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in COPYRIGHT README RELEASE_NOTES
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .else
 CONFIGURE_ARGS+=	--disable-docs-install
 .endif

diff --git a/science/netcdf4/pkg-plist b/science/netcdf4/pkg-plist
@@ -18,7 +18,3 @@ lib/libnetcdf_c++.so.4
 %%FORTRAN%%lib/libnetcdff.la
 %%FORTRAN%%lib/libnetcdff.so
 %%FORTRAN%%lib/libnetcdff.so.4
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%