From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 25 18:14:34 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8CD41FD7;
 Mon, 25 Nov 2013 18:14:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7BBA02D42;
 Mon, 25 Nov 2013 18:14:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPIEYfI067987;
 Mon, 25 Nov 2013 18:14:34 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPIEYHb067986;
 Mon, 25 Nov 2013 18:14:34 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311251814.rAPIEYHb067986@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 25 Nov 2013 18:14:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334877 - head/astro/cfitsio
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 18:14:34 -0000

Author: sunpoet
Date: Mon Nov 25 18:14:33 2013
New Revision: 334877
URL: http://svnweb.freebsd.org/changeset/ports/334877

Log:
  - Support STAGEDIR
  - Simplify Makefile

Modified:
  head/astro/cfitsio/Makefile

Modified: head/astro/cfitsio/Makefile
==============================================================================
--- head/astro/cfitsio/Makefile	Mon Nov 25 18:11:02 2013	(r334876)
+++ head/astro/cfitsio/Makefile	Mon Nov 25 18:14:33 2013	(r334877)
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 ALL_TARGET=	shared
 CONFIGURE_ARGS=	ac_cv_prog_FC="f2c"
 GNU_CONFIGURE=	yes
@@ -30,23 +29,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|="\.so"|=".so.0"|g' ${WRKSRC}/configure
 	@${MV} ${WRKSRC}/zlib.h ${WRKSRC}/zlib.h.dist
-	@${GREP} -lR "<malloc.\h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|<malloc\.h>|<stdlib.h>|g'
+	@${GREP} -lR "<malloc.\h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g'
 
 do-install:
-	cd ${WRKSRC}/ && \
-		${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${PREFIX}/include/ && \
-		${INSTALL_LIB} libcfitsio.so.0 ${PREFIX}/lib/ && \
-		${INSTALL_DATA} cfitsio.pc ${PREFIX}/libdata/pkgconfig/
-	${LN} -fs libcfitsio.so.0 ${PREFIX}/lib/libcfitsio.so
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${DOCSDIR}/
-.endif
+	cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/
+	cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.0 ${STAGEDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
+	${LN} -fs libcfitsio.so.0 ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/*.doc ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>