From owner-svn-ports-head@freebsd.org  Sun Jan 29 16:04:49 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84189CC7F38;
 Sun, 29 Jan 2017 16:04:49 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 536CAD2C;
 Sun, 29 Jan 2017 16:04:49 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0TG4m2E053889;
 Sun, 29 Jan 2017 16:04:48 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0TG4mrt053888;
 Sun, 29 Jan 2017 16:04:48 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201701291604.v0TG4mrt053888@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 29 Jan 2017 16:04:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432764 - head/science/cgribex
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jan 2017 16:04:49 -0000

Author: sunpoet
Date: Sun Jan 29 16:04:48 2017
New Revision: 432764
URL: https://svnweb.freebsd.org/changeset/ports/432764

Log:
  Add JASPER and SZLIB options

Modified:
  head/science/cgribex/Makefile

Modified: head/science/cgribex/Makefile
==============================================================================
--- head/science/cgribex/Makefile	Sun Jan 29 16:04:43 2017	(r432763)
+++ head/science/cgribex/Makefile	Sun Jan 29 16:04:48 2017	(r432764)
@@ -13,17 +13,25 @@ COMMENT=	Lightweight GRIBEX in C with po
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjasper.so:graphics/jasper \
-		libsz.so:science/szip
+OPTIONS_DEFINE=	JASPER SZIP
+OPTIONS_DEFAULT=JASPER SZIP
 
-CONFIGURE_ARGS=	--with-jasper=${LOCALBASE} \
-		--with-szlib=${LOCALBASE}
 CPPFLAGS+=	-DgFortran
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		libtool
 
+JASPER_CONFIGURE_OFF=	--without-jasper
+JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
+SZLIB_CONFIGURE_OFF=	--without-szlib
+SZIP_CONFIGURE_ON=	--with-szlib=${LOCALBASE}
+SZIP_LIB_DEPENDS=	libsz.so:science/szip
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|-Ino/include||; s|-Lno/lib||' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgribex.so.0.0.0