Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jan 2014 19:47:13 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r340209 - in branches/2014Q1/graphics/gts: . files
Message-ID:  <201401181947.s0IJlDZS009984@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat Jan 18 19:47:13 2014
New Revision: 340209
URL: http://svnweb.freebsd.org/changeset/ports/340209
QAT: https://qat.redports.org/buildarchive/r340209/

Log:
  MFH: r340194
  
  - Pass -lm when using gts' pkg-config file. [1]
    This is also done in the package's upstream darcs repository.
  - Support staging.
  - Set LICENSE.
  - Use the new OPTIONS/LIB_DEPENDS syntax.
  
  PR:		ports/185263 [1]
  Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com>
  Approved by:	Erik Greenwald <erik@elfga.com> (maintainer)
  Approved by:	portmgr (mat)

Added:
  branches/2014Q1/graphics/gts/files/patch-gts.pc.in
     - copied unchanged from r340194, head/graphics/gts/files/patch-gts.pc.in
Modified:
  branches/2014Q1/graphics/gts/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/gts/Makefile
==============================================================================
--- branches/2014Q1/graphics/gts/Makefile	Sat Jan 18 19:44:47 2014	(r340208)
+++ branches/2014Q1/graphics/gts/Makefile	Sat Jan 18 19:47:13 2014	(r340209)
@@ -3,34 +3,31 @@
 
 PORTNAME=	gts
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	GNU Triangulated Surface Library
 
+LICENSE=	LGPL20
+
 USES=		pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NETPBM
-NETPBM_DESC=	Build with libnetpbm support
+OPTIONS_SUB=	yes
+
+NETPBM_DESC=		Build with libnetpbm support
+NETPBM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNETPBM}
-LIB_DEPENDS+=	netpbm.1:${PORTSDIR}/graphics/netpbm
-PLIST_SUB=	NETPBM=""
-.else
-PLIST_SUB=	NETPBM="@comment "
-.endif
-
 post-extract:
 .if ! ${PORT_OPTIONS:MNETPBM}
 	@${REINPLACE_CMD} -e 's|netpbm="true"|netpbm="false"|' \

Copied: branches/2014Q1/graphics/gts/files/patch-gts.pc.in (from r340194, head/graphics/gts/files/patch-gts.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/graphics/gts/files/patch-gts.pc.in	Sat Jan 18 19:47:13 2014	(r340209, copy of r340194, head/graphics/gts/files/patch-gts.pc.in)
@@ -0,0 +1,10 @@
+--- ./gts.pc.in.orig	2005-01-19 04:48:19.000000000 +0000
++++ ./gts.pc.in	2013-12-29 08:54:18.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: GTS
+ Description: GNU Triangulated Surface Library
+ Version: @VERSION@
+ Requires: glib-2.0,gthread-2.0,gmodule-2.0
+-Libs: -L${libdir} @LIBS@ -lgts
++Libs: -L${libdir} @LIBS@ -lgts -lm
+ Cflags: -I${includedir}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401181947.s0IJlDZS009984>