diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2011-05-10 04:46:59 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2011-05-10 04:46:59 +0000 |
| commit | 42e1be91e1d0bcdc36da246739edaa6099b72523 (patch) | |
| tree | 8197598df59d47b888537424f4c6c53c43b16bd5 /graphics/netpbm | |
| parent | 65b9a1fd7546760d327b8ae1a059cc1302a5dc46 (diff) | |
Notes
Diffstat (limited to 'graphics/netpbm')
| -rw-r--r-- | graphics/netpbm/Makefile | 12 | ||||
| -rw-r--r-- | graphics/netpbm/files/Makefile.config.FreeBSD | 5 | ||||
| -rw-r--r-- | graphics/netpbm/pkg-plist | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 976fc4c67853..2109b9b1e17a 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -7,10 +7,9 @@ PORTNAME= netpbm PORTVERSION= 10.35.80 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} -PKGNAMESUFFIX= ${NETPBM_SUFFIX}${PKGNAMESUFFIX2} EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org @@ -27,7 +26,6 @@ MAKE_JOBS_UNSAFE= yes USE_PERL5= yes USE_GMAKE= yes -USE_XORG= x11 CFLAGS+= -DPNG_DEPSTRUCT= -Iutil MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}" MAKEFILE= GNUmakefile @@ -36,6 +34,14 @@ USE_LDCONFIG= yes MAN1= netpbm.1 +.if defined(WITH_X11) +USE_XORG= x11 +MAKE_ENV+= WITH_X11="${WITH_X11}" +PLIST_SUB+= X11='' +.else +PLIST_SUB+= X11='@comment ' +.endif + pre-configure: @if [ -e ${DESTDIR}/${LOCALBASE}/include/pm.h ]; then \ (${ECHO_MSG} "===> Cannot build with netpbm installed, please deinstall first"; exit 1) \ diff --git a/graphics/netpbm/files/Makefile.config.FreeBSD b/graphics/netpbm/files/Makefile.config.FreeBSD index 8aecf913ab5c..202751061c48 100644 --- a/graphics/netpbm/files/Makefile.config.FreeBSD +++ b/graphics/netpbm/files/Makefile.config.FreeBSD @@ -75,8 +75,13 @@ JASPERDEPLIBS = URTLIB = $(BUILDDIR)/urt/librle.a URTHDR_DIR = $(SRCDIR)/urt +ifdef WITH_X11 X11LIB = ${LOCALBASE}/lib/libX11.so X11HDR_DIR = ${LOCALBASE}/include +else +X11LIB = NONE +X11HDR_DIR = +endif LINUXSVGALIB = NONE LINUXSVGAHDR_DIR = diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist index d15d5c9b9211..b38fbcdb734f 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -89,7 +89,7 @@ bin/pamtotga bin/pamtotiff bin/pamtouil bin/pamtoxvmini -bin/pamx +%%X11%%bin/pamx bin/pbmclean bin/pbmlife bin/pbmmake |