svn commit: r333411 - in head/astro/wcslib: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Nov 10 17:27:16 2013
New Revision: 333411
URL: http://svnweb.freebsd.org/changeset/ports/333411

Log:
  - Support staging, which allows us to simplify the Makefile a bit.
  - Fix a regression introduced in r297435 (ports/167611) that hardcoded
    wcslib.pc's installation path and rendered the sed call in the post-patch
    target useless. This broke automated builds in things like Poudriere.
  
  PR:		ports/183718
  Submitted by:	rakuco@
  Approved by:	Tony Maher <tonymaher at optusnet.com.au> (maintainer)

Modified:
  head/astro/wcslib/Makefile
  head/astro/wcslib/files/patch-GNUmakefile
  head/astro/wcslib/pkg-plist

Modified: head/astro/wcslib/Makefile
==============================================================================
--- head/astro/wcslib/Makefile	Sun Nov 10 16:57:25 2013	(r333410)
+++ head/astro/wcslib/Makefile	Sun Nov 10 17:27:16 2013	(r333411)
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://ftp.atnf.csiro.au/pu
 MAINTAINER=	tonymaher at optusnet.com.au
 COMMENT=	Library for parsing/generating FITS headers
 
-NO_STAGE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake
@@ -17,7 +16,6 @@ MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
-MAN1=		fitshdr.1
 
 # See makedefs.in which describes why you want to set the extra support.
 # For most users it will not be required.
@@ -43,15 +41,13 @@ LIB_DEPENDS+=	pgplot.5:${PORTSDIR}/graph
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${LOCALBASE}/libdata#g' \
+	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${STAGEDIR}${PREFIX}/libdata#g' \
 		${WRKSRC}/GNUmakefile
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README COPYING COPYING.LESSER wcslib.pdf ${DOCSDIR})
-	@${MKDIR} ${DOCSDIR}/html
-	(cd ${WRKSRC}/html && ${INSTALL_DATA} * ${DOCSDIR}/html)
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README COPYING COPYING.LESSER wcslib.pdf ${STAGEDIR}${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	(cd ${WRKSRC}/html && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/html)
 
 .include <bsd.port.mk>

Modified: head/astro/wcslib/files/patch-GNUmakefile
==============================================================================
--- head/astro/wcslib/files/patch-GNUmakefile	Sun Nov 10 16:57:25 2013	(r333410)
+++ head/astro/wcslib/files/patch-GNUmakefile	Sun Nov 10 17:27:16 2013	(r333411)
@@ -22,11 +22,11 @@
 -	   $(INSTALL) -m 444 html/* $(HTMLDIR)/html
 -	   if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
 -	     $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \
-+	   if [ ! -d "/usr/local/libdata/pkgconfig" ] ; then \
-+	     $(INSTALL) -d -m 2775 /usr/local/libdata/pkgconfig ; \
++	   if [ ! -d "%%PKGDIR%%/pkgconfig" ] ; then \
++	     $(INSTALL) -d -m 2775 %%PKGDIR%%/pkgconfig ; \
  	   fi
 -	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
-+	   $(INSTALL) -m 444 wcslib.pc /usr/local/libdata/pkgconfig/wcslib.pc
++	   $(INSTALL) -m 444 wcslib.pc %%PKGDIR%%/pkgconfig/wcslib.pc
  
  clean cleaner :
  	   for DIR in $(SUBDIRS) doxygen ; do \

Modified: head/astro/wcslib/pkg-plist
==============================================================================
--- head/astro/wcslib/pkg-plist	Sun Nov 10 16:57:25 2013	(r333410)
+++ head/astro/wcslib/pkg-plist	Sun Nov 10 17:27:16 2013	(r333411)
@@ -29,6 +29,7 @@ lib/libwcs.so
 lib/libwcs.so.%%VERSION%%
 lib/libwcs.so.4
 libdata/pkgconfig/wcslib.pc
+man/man1/fitshdr.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x73.html
 %%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/html/wcshdr_8h-source.html