diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 09:28:53 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 09:28:53 +0000 |
| commit | 8e6ac890ec91c882e7d41b20d718400f86a6fb8d (patch) | |
| tree | 89d764cc0be80a617b59429093b4d2de936f3fb0 /lang | |
| parent | - Depend on USE_XORG=xext (diff) | |
Backout previous commit, since bsd.port.mk rev. 1.584 has been reverted.
Notes
Notes:
svn path=/head/; revision=199480
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile.ext | 9 | ||||
| -rw-r--r-- | lang/php53/Makefile.ext | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index bdb2368337c1..050feae1faf8 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -86,6 +86,9 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +. if !defined(WITHOUT_X11) +USE_XORG= xpm +. endif CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ @@ -99,9 +102,6 @@ CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} OPTIONS= T1LIB "Include T1lib support" on \ TRUETYPE "Enable TrueType string function" on \ JIS "Enable JIS-mapped Japanese font support" off -. if !defined(WITHOUT_X11) -OPTIONS+= XPM "Enable Xpm support" on -. endif PHP_HEADER_DIRS=libgd .endif @@ -560,9 +560,6 @@ CONFIGURE_ARGS+=--enable-gd-native-ttf . if defined(WITH_JIS) CONFIGURE_ARGS+=--enable-gd-jis-conv . endif -. if !defined(WITHOUT_XPM) && !defined(WITHOUT_X11) -USE_XORG= xpm -. endif .endif .if ${PHP_MODNAME} == "mbstring" diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index bdb2368337c1..050feae1faf8 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -86,6 +86,9 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +. if !defined(WITHOUT_X11) +USE_XORG= xpm +. endif CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ @@ -99,9 +102,6 @@ CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} OPTIONS= T1LIB "Include T1lib support" on \ TRUETYPE "Enable TrueType string function" on \ JIS "Enable JIS-mapped Japanese font support" off -. if !defined(WITHOUT_X11) -OPTIONS+= XPM "Enable Xpm support" on -. endif PHP_HEADER_DIRS=libgd .endif @@ -560,9 +560,6 @@ CONFIGURE_ARGS+=--enable-gd-native-ttf . if defined(WITH_JIS) CONFIGURE_ARGS+=--enable-gd-jis-conv . endif -. if !defined(WITHOUT_XPM) && !defined(WITHOUT_X11) -USE_XORG= xpm -. endif .endif .if ${PHP_MODNAME} == "mbstring" |