diff options
| author | reg <reg@FreeBSD.org> | 2000-10-05 06:47:41 +0000 |
|---|---|---|
| committer | reg <reg@FreeBSD.org> | 2000-10-05 06:47:41 +0000 |
| commit | 4495def283d3b8c777e1eb5b958cedb25b1aa16b (patch) | |
| tree | d7741a9f974e1e8c5428027e641c709984c997cf /x11 | |
| parent | 72ce7050d03c812e37966786e11996a90713afea (diff) | |
| download | FreeBSD-ports-4495def283d3b8c777e1eb5b958cedb25b1aa16b.zip FreeBSD-ports-4495def283d3b8c777e1eb5b958cedb25b1aa16b.tar.gz | |
Implment WANT_GTK.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/Makefile | 15 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-ab | 20 |
2 files changed, 31 insertions, 4 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index dcf62e5..1d0b71eb 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -12,11 +12,13 @@ MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= jseger@FreeBSD.org -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm USE_X_PREFIX= yes USE_XPM= yes USE_MESA= yes +WANT_GTK= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm + MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \ bsod.1 bubbles.1 critical.1 decayscreen.1 \ deco.1 distort.1 drift.1 epicycle.1 flag.1 flame.1 \ @@ -31,4 +33,11 @@ MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \ xlyap.1 xmatrix.1 xroger.1 xscreensaver-command.1 \ xscreensaver.1 xsublim.1 xteevee.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GTK) +USE_GTK= yes +CONFIGURE_ARGS+= --with-gtk +.endif + +.include <bsd.port.post.mk> diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab index 589d106..e1135f8 100644 --- a/x11/xscreensaver/files/patch-ab +++ b/x11/xscreensaver/files/patch-ab @@ -18,12 +18,30 @@ fi if test "$have_kerberos" = yes ; then +@@ -6151,7 +6151,7 @@ + gtk_path="$gtk_dir:$gtk_dir:$gtk_path" + fi + +- for ac_prog in glib-config ++ for ac_prog in `basename ${GLIB_CONFIG}` + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -6191,7 +6191,7 @@ + test -n "$glib_config" && break + done + +- for ac_prog in gtk-config ++ for ac_prog in `basename ${GTK_CONFIG}` + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 @@ -6485,7 +6485,7 @@ if eval "test \"`echo '$''{'ac_cv_gtk_version_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_cv_gtk_version_string=`$glib_config --version` -+ ac_cv_gtk_version_string=`$gtk_config --version` ++ ac_cv_gtk_version_string=`${GTK_CONFIG} --version` fi echo "$ac_t""$ac_cv_gtk_version_string" 1>&6 |
