diff options
| author | dinoex <dinoex@FreeBSD.org> | 2010-03-09 21:48:05 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2010-03-09 21:48:05 +0800 |
| commit | 725f10bf3ceefdca6fb174af1834acd23245d12c (patch) | |
| tree | 8ecaca1ef37abbb7599644932d3de45c02321b8d | |
| parent | 16ad276e69ef9a78ba1b6abcac2f39a0eaa5609f (diff) | |
| download | freebsd-ports-gnome-725f10bf3ceefdca6fb174af1834acd23245d12c.tar.gz freebsd-ports-gnome-725f10bf3ceefdca6fb174af1834acd23245d12c.tar.zst freebsd-ports-gnome-725f10bf3ceefdca6fb174af1834acd23245d12c.zip | |
- allow option WITH_FONTCONFIG with WITHOUT_X11
PR: 144567
Submitted by: Benjamin Lee
| -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 |