ports/183718: [PATCH] astro/wcslib: Support staging, fix .pc file installation path.

[Raphael Kubo da Costa]

>Number:         183718
>Category:       ports
>Synopsis:       [PATCH] astro/wcslib: Support staging, fix .pc file installation path.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 06 15:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Raphael Kubo da Costa
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD orwell 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r256429: Sun Oct 13 19:04:57 EEST
>Description:
- 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.

Port maintainer (tonymaher at optusnet.com.au) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- wcslib-4.13.4.patch begins here ---
diff -ruN /usr/ports/astro/wcslib/Makefile ./Makefile
--- /usr/ports/astro/wcslib/Makefile	2013-09-20 16:14:04.000000000 +0300
+++ ./Makefile	2013-11-06 17:15:15.000000000 +0200
@@ -1,5 +1,5 @@
 # Created by: Tony Maher <tonymaher at optusnet.com.au>
-# $FreeBSD: astro/wcslib/Makefile 327701 2013-09-20 13:14:04Z bapt $
+# $FreeBSD: head/astro/wcslib/Makefile 327701 2013-09-20 13:14:04Z bapt $
 
 PORTNAME=	wcslib
 PORTVERSION=	4.13.4
@@ -9,7 +9,6 @@
 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 @@
 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 @@
 .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>
diff -ruN /usr/ports/astro/wcslib/files/patch-GNUmakefile ./files/patch-GNUmakefile
--- /usr/ports/astro/wcslib/files/patch-GNUmakefile	2012-07-14 15:56:14.000000000 +0300
+++ ./files/patch-GNUmakefile	2013-11-06 17:08:55.000000000 +0200
@@ -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 \
diff -ruN /usr/ports/astro/wcslib/pkg-plist ./pkg-plist
--- /usr/ports/astro/wcslib/pkg-plist	2012-07-14 15:56:14.000000000 +0300
+++ ./pkg-plist	2013-11-06 17:01:10.000000000 +0200
@@ -29,6 +29,7 @@
 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
--- wcslib-4.13.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: