diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-11-06 20:09:39 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-11-06 20:09:39 +0000 |
| commit | a75c8d5ebffc64923d55d71ef0c07e29785ed5b2 (patch) | |
| tree | 912fd32138728acb480df737bb38d24a7c58dc1e /graphics/gts | |
| parent | 7c02beadb888072ae8af21ac57aedf20d4b3538b (diff) | |
| download | ports-a75c8d5ebffc64923d55d71ef0c07e29785ed5b2.tar.gz ports-a75c8d5ebffc64923d55d71ef0c07e29785ed5b2.zip | |
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)
Notes
Notes:
svn path=/head/; revision=453643
Diffstat (limited to 'graphics/gts')
| -rw-r--r-- | graphics/gts/Makefile | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile index 769f37a2344c..91cf01887977 100644 --- a/graphics/gts/Makefile +++ b/graphics/gts/Makefile @@ -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> |