diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-03-09 13:48:05 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-03-09 13:48:05 +0000 |
| commit | 83f00e193754ab436f9dd8175d65e52851470560 (patch) | |
| tree | 507870e11acc04a8c75d79a10fda6607b3c65f61 /graphics/gd | |
| parent | 8f77fcdf2c635356855a1155904f205674abb8a9 (diff) | |
| download | ports-83f00e193754ab436f9dd8175d65e52851470560.tar.gz ports-83f00e193754ab436f9dd8175d65e52851470560.zip | |
- allow option WITH_FONTCONFIG with WITHOUT_X11
PR: 144567
Submitted by: Benjamin Lee
Notes
Notes:
svn path=/head/; revision=250769
Diffstat (limited to 'graphics/gd')
| -rw-r--r-- | graphics/gd/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 5675e60bb7d0..1ddc367518bf 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -41,7 +41,6 @@ OPTIONS= X11 "X11 support" off \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) - .if defined(WITH_XPM) USE_XORG= xpm x11 CPPFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include -DHAVE_LIBXPM @@ -49,6 +48,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lX11 LDFLAGS2+= -L${LOCALBASE}/lib FEATURES+= GD_XPM .endif +.endif .if defined(WITH_FONTCONFIG) LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig @@ -58,8 +58,6 @@ LDFLAGS2+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib FEATURES+= GD_FONTCONFIG .endif -.endif - .if defined(WITH_ICONV) USE_ICONV= yes CPPFLAGS+= -DHAVE_ICONV -DHAVE_ICONV_H -DHAVE_ICONV_T_DEF |