From owner-svn-ports-all@freebsd.org Mon Nov 6 20:09:41 2017 Return-Path: Delivered-To: svn-ports-all@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 0A40DE66D56; Mon, 6 Nov 2017 20:09:41 +0000 (UTC) (envelope-from tobik@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 CC93881B19; Mon, 6 Nov 2017 20:09:40 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA6K9drd074516; Mon, 6 Nov 2017 20:09:39 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA6K9duD074515; Mon, 6 Nov 2017 20:09:39 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201711062009.vA6K9duD074515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 6 Nov 2017 20:09:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453643 - head/graphics/gts X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/graphics/gts X-SVN-Commit-Revision: 453643 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2017 20:09:41 -0000 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 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 - -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|||' \ + ${WRKSRC}/examples/happrox.c .include