Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Nov 2017 20:09:39 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r453643 - head/graphics/gts
Message-ID:  <201711062009.vA6K9duD074515@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Nov  6 20:09:39 2017
New Revision: 453643
URL: https://svnweb.freebsd.org/changeset/ports/453643

Log:
  graphics/gts: Unbreak build WITH=NETPBM
  
  happrox.c:24:10: fatal error: 'pgm.h' file not found
  
  The netpbm update from r451378 moved netpbm headers from include/ to
  include/netpbm/, but gts looks for them in include/ only.
  
  While here also clean up the port a little bit:
  
  - Remove NETPBM_DESC since it's already in bsd.options.desc.mk
  - Disable netpbm via an autoconf variable instead of patching
    configure
  
  PR:		222958
  Reported by:	Phil Pennock <freebsd@phil.spodhuis.org>
  Approved by:	erik@bz.bzflag.bz (maintainer timeout, 2 weeks)

Modified:
  head/graphics/gts/Makefile

Modified: head/graphics/gts/Makefile
==============================================================================
--- head/graphics/gts/Makefile	Mon Nov  6 19:46:59 2017	(r453642)
+++ head/graphics/gts/Makefile	Mon Nov  6 20:09:39 2017	(r453643)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gts
 PORTVERSION=	0.7.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -16,25 +16,18 @@ CONFLICTS=	pcb-[0-9]*
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool pathfix pkgconfig
+USES=		libtool localbase pathfix pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NETPBM
 OPTIONS_SUB=	yes
 
-NETPBM_DESC=		Build with libnetpbm support
+NETPBM_CONFIGURE_ENV_OFF=	ac_cv_lib_netpbm_pgm_init=no
 NETPBM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ! ${PORT_OPTIONS:MNETPBM}
-	@${REINPLACE_CMD} -e 's|netpbm="true"|netpbm="false"|' \
-		${WRKSRC}/configure
-.endif
+post-patch-NETPBM-on:
+	@${REINPLACE_CMD} -e 's|<pgm.h>|<netpbm/pgm.h>|' \
+		${WRKSRC}/examples/happrox.c
 
 .include <bsd.port.mk>



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