aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
commit3707e5b7408ecadb0bda141dd82ec9bbca5d0267 (patch)
treef1d64a9e396a97d08c7dc5b7eed24efc11a3fa10
parent99290b0d61db9bcb3c960f5507a8ccb0126a0cf9 (diff)
downloadports-3707e5b7408ecadb0bda141dd82ec9bbca5d0267.tar.gz
ports-3707e5b7408ecadb0bda141dd82ec9bbca5d0267.zip
Implment WANT_GTK.
Notes
Notes: svn path=/head/; revision=33426
-rw-r--r--audio/aumix/Makefile20
-rw-r--r--audio/lame/Makefile26
-rw-r--r--audio/lame/files/patch-aa2
-rw-r--r--audio/teknap/Makefile45
-rw-r--r--audio/teknap/files/patch-aa9
-rw-r--r--editors/vim/Makefile10
-rw-r--r--editors/vim/files/patch-024
-rw-r--r--editors/vim5/Makefile10
-rw-r--r--editors/vim5/files/patch-024
-rw-r--r--editors/vim6/Makefile10
-rw-r--r--editors/vim6/files/patch-024
-rw-r--r--net-p2p/teknap/Makefile45
-rw-r--r--net-p2p/teknap/files/patch-aa9
-rw-r--r--net/mtr/Makefile15
-rw-r--r--www/asp2php/Makefile29
-rw-r--r--www/asp2php/files/patch-aa10
-rw-r--r--x11/xscreensaver/Makefile15
-rw-r--r--x11/xscreensaver/files/patch-ab20
18 files changed, 145 insertions, 142 deletions
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index bba2065cf6f7..9a2df4de4299 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -16,29 +16,23 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= cpiazza@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-USE_X_PREFIX= yes
-GTK_CONFIG= ${X11BASE}/bin/gtk12-config
-.endif
+WANT_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--enable-own-labels \
--libdir="${LOCALBASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= aumix.1 xaumix.1
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --without-gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
.else
-pre-fetch:
- @${ECHO_MSG} -n "To build this port without X11 (and without the GUI),"
- @${ECHO_MSG} " define \"WITHOUT_X11\"."
+CONFIGURE_ARGS+=--without-gtk
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index d057d7209b25..a3f3762a601e 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -16,35 +16,27 @@ PATCHFILES= lame${PORTVERSION}.patch.gz
MAINTAINER= yoshiaki@kt.rim.or.jp
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
-
PATCH_DIST_STRIP = -p1
WRKSRC= ${WRKDIR}/dist10/lsf/encoder/
-USE_GMAKE= YES
-MAKE_ENV= WITHOUT_X11=${WITHOUT_X11}
+USE_GMAKE= yes
+WANT_GTK= yes
ALL_TARGET= lame
RESTRICTED= Condition is not clear
-.if !defined(WITHOUT_X11)
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
-.endif
-
MAN1= lame.1
-do-install:
- @( cd ${WRKSRC}; ${INSTALL_PROGRAM} lame ${PREFIX}/bin )
- @( cd ${WRKSRC}; ${INSTALL_MAN} doc/man/lame.1 \
- ${PREFIX}/man/man1 )
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+.endif
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/lame
- @${INSTALL_MAN} ${WRKSRC}/doc/html/*.html \
+ ${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \
${WRKSRC}/doc/html/*.css ${PREFIX}/share/doc/lame
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
index 47cbc6de3f76..e04f0d348fed 100644
--- a/audio/lame/files/patch-aa
+++ b/audio/lame/files/patch-aa
@@ -17,7 +17,7 @@
# remove if you do not have GTK or do not want the GTK frame analyzer
- GTK = -DHAVEGTK `gtk12-config --cflags`
- GTKLIBS = `gtk12-config --libs`
-+ifndef WITHOUT_X11
++ifdef HAVE_GTK
+ GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
+ GTKLIBS = `$(GTK_CONFIG) --libs`
+endif
diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile
index 7959f730ac34..54476d48a136 100644
--- a/audio/teknap/Makefile
+++ b/audio/teknap/Makefile
@@ -13,9 +13,6 @@ MASTER_SITES= ftp://ftp.teknap.com/pub/TekNap/ \
MAINTAINER= cj@vallcom.net
-.if defined(WITH_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
.if defined(WITH_MP3)
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
.endif
@@ -23,41 +20,41 @@ BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
.endif
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
WRKSRC= ${WRKDIR}/TekNap
-GNU_CONFIGURE= yes
+
+PLIST_SUB+= PORTVERSION="${PORTVERSION}"
+
USE_GMAKE= yes
+WANT_GTK= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+= --with-gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+CONFIGURE_ARGS+=--with-gtk
+.else
+CONFIGURE_ARGS+=--without-gtk
.endif
+
.if defined(WITH_MP3)
-CONFIGURE_ARGS+= --enable-mp3
+CONFIGURE_ARGS+=--enable-mp3
.endif
+
.if defined(WITH_XMMS)
-CONFIGURE_ARGS+= --enable-xmms
+CONFIGURE_ARGS+=--enable-xmms
.endif
-CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \
- --bindir="${PREFIX}/bin" \
- --datadir="${PREFIX}/share" \
- --libdir="${PREFIX}/share"
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}"
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_DATA="${INSTALL_DATA}"
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
pre-extract:
@${ECHO} "Available switches:"
@${ECHO} "-------------------"
- @${ECHO} "WITH_GTK - Add GTK support"
@${ECHO} "WITH_MP3 - Support MP3 playback"
@${ECHO} "WITH_XMMS - Support XMMS"
+
pre-configure:
- ${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
+ @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
@@ -70,4 +67,4 @@ post-install:
@${ECHO}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/teknap/files/patch-aa b/audio/teknap/files/patch-aa
index fac576d842ec..9ce74dbfd745 100644
--- a/audio/teknap/files/patch-aa
+++ b/audio/teknap/files/patch-aa
@@ -1,5 +1,14 @@
--- Makefile.in.orig Thu Jun 22 11:32:39 2000
+++ Makefile.in Thu Jul 6 01:10:22 2000
+@@ -34,7 +34,7 @@
+ NAPLIB = @NAPLIB@
+
+ CC = @CC@
+-DEFS = -I$$(srcdir)/../include -I$(topdir)/include
++DEFS = -I. -I$(topdir)/include -I-
+ LIBS = @LIBS@
+ INCLUDES = @INCLUDES@
+
@@ -58,8 +58,8 @@
# This command will be used to install the BitchX help files. If you don't
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 82efea7c2629..95199b42cff7 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -45,15 +45,15 @@ PLIST_SUB= VIM_VER=${DISTNAME:S/-//:S/.//}
MAN1= vim.1 vimtutor.1 xxd.1 ectags.1
MLINKS= vim.1 rvim.1 vim.1 rview.1 ectags.1 etags.1
+.include <bsd.port.pre.mk>
+
.if !defined(LITE)
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
-.if defined(HAVE_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+.if defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
@@ -83,4 +83,4 @@ post-install:
@${RM} -f ${PREFIX}/man/man1/etags.1
@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 06b3acdaf84f..c66db00b417c 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -5,12 +5,12 @@
if test "x$gtk_config_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "x$gtk_config_exec_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "X$GTK_CONFIG" = "X"; then
# Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 308f7cf70175..251ce75996ab 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -44,15 +44,15 @@ PLIST_SUB= VIM_VER=${DISTNAME:S/-//:S/.//}
MAN1= vim.1 vimtutor.1 xxd.1 ectags.1
MLINKS= vim.1 rvim.1 vim.1 rview.1 ectags.1 etags.1
+.include <bsd.port.pre.mk>
+
.if !defined(LITE)
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
-.if defined(HAVE_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+.if defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
@@ -82,4 +82,4 @@ post-install:
@${RM} -f ${PREFIX}/man/man1/etags.1
@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index 0b0b26335fdc..b13d649e80b7 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -5,12 +5,12 @@
if test "x$gtk_config_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "x$gtk_config_exec_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "X$GTK_CONFIG" = "X"; then
# Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 82efea7c2629..95199b42cff7 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -45,15 +45,15 @@ PLIST_SUB= VIM_VER=${DISTNAME:S/-//:S/.//}
MAN1= vim.1 vimtutor.1 xxd.1 ectags.1
MLINKS= vim.1 rvim.1 vim.1 rview.1 ectags.1 etags.1
+.include <bsd.port.pre.mk>
+
.if !defined(LITE)
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
-.if defined(HAVE_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+.if defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
@@ -83,4 +83,4 @@ post-install:
@${RM} -f ${PREFIX}/man/man1/etags.1
@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
index 06b3acdaf84f..c66db00b417c 100644
--- a/editors/vim6/files/patch-02
+++ b/editors/vim6/files/patch-02
@@ -5,12 +5,12 @@
if test "x$gtk_config_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "x$gtk_config_exec_prefix" != "x" ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
++ GTK_CONFIG=${GTK_CONFIG}
fi
if test "X$GTK_CONFIG" = "X"; then
# Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
index 7959f730ac34..54476d48a136 100644
--- a/net-p2p/teknap/Makefile
+++ b/net-p2p/teknap/Makefile
@@ -13,9 +13,6 @@ MASTER_SITES= ftp://ftp.teknap.com/pub/TekNap/ \
MAINTAINER= cj@vallcom.net
-.if defined(WITH_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
.if defined(WITH_MP3)
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
.endif
@@ -23,41 +20,41 @@ BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
.endif
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
WRKSRC= ${WRKDIR}/TekNap
-GNU_CONFIGURE= yes
+
+PLIST_SUB+= PORTVERSION="${PORTVERSION}"
+
USE_GMAKE= yes
+WANT_GTK= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+= --with-gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+CONFIGURE_ARGS+=--with-gtk
+.else
+CONFIGURE_ARGS+=--without-gtk
.endif
+
.if defined(WITH_MP3)
-CONFIGURE_ARGS+= --enable-mp3
+CONFIGURE_ARGS+=--enable-mp3
.endif
+
.if defined(WITH_XMMS)
-CONFIGURE_ARGS+= --enable-xmms
+CONFIGURE_ARGS+=--enable-xmms
.endif
-CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \
- --bindir="${PREFIX}/bin" \
- --datadir="${PREFIX}/share" \
- --libdir="${PREFIX}/share"
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}"
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_DATA="${INSTALL_DATA}"
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
pre-extract:
@${ECHO} "Available switches:"
@${ECHO} "-------------------"
- @${ECHO} "WITH_GTK - Add GTK support"
@${ECHO} "WITH_MP3 - Support MP3 playback"
@${ECHO} "WITH_XMMS - Support XMMS"
+
pre-configure:
- ${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
+ @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
@@ -70,4 +67,4 @@ post-install:
@${ECHO}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-p2p/teknap/files/patch-aa b/net-p2p/teknap/files/patch-aa
index fac576d842ec..9ce74dbfd745 100644
--- a/net-p2p/teknap/files/patch-aa
+++ b/net-p2p/teknap/files/patch-aa
@@ -1,5 +1,14 @@
--- Makefile.in.orig Thu Jun 22 11:32:39 2000
+++ Makefile.in Thu Jul 6 01:10:22 2000
+@@ -34,7 +34,7 @@
+ NAPLIB = @NAPLIB@
+
+ CC = @CC@
+-DEFS = -I$$(srcdir)/../include -I$(topdir)/include
++DEFS = -I. -I$(topdir)/include -I-
+ LIBS = @LIBS@
+ INCLUDES = @INCLUDES@
+
@@ -58,8 +58,8 @@
# This command will be used to install the BitchX help files. If you don't
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index ba81a5c08292..8b22b733ddb3 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -15,6 +15,7 @@ MAINTAINER= billf@FreeBSD.org
HAS_CONFIGURE= yes
USE_GMAKE= yes
+WANT_GTK= yes
MAN8= mtr.8
@@ -30,17 +31,11 @@ CONFIGURE_ARGS+=--enable-ipv6
CONFIGURE_ARGS+=--disable-ipv6
.endif
-pre-patch:
-.if !defined(WITH_GTK)
- @${ECHO} ""
- @${ECHO} "If you want to compile with GTK support,"
- @${ECHO} "hit Ctrl-C right now and use \"make WITH_GTK=yes\" "
- @${ECHO} ""
-CONFIGURE_ARGS+=--with-gtk-prefix=/nopath
-.else
+.if defined(HAVE_GTK)
USE_XLIB= yes
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_GTK= yes
+.else
+CONFIGURE_ARGS+=--with-gtk-prefix=/nopath
.endif
do-install:
diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile
index f3c4aa7e5ed9..1f05a8ad5e7b 100644
--- a/www/asp2php/Makefile
+++ b/www/asp2php/Makefile
@@ -13,17 +13,14 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-.if defined(WANT_GTK)
-LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
-ALL_TARGET= all
-INSTALL_TARGET= install
-.if defined(WANT_GTK)
+WANT_GTK= yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
ALL_TARGET+= gtkasp2php
INSTALL_TARGET+=install-gtk
PLIST_SUB+= WANT_GTK=""
@@ -31,16 +28,4 @@ PLIST_SUB+= WANT_GTK=""
PLIST_SUB+= WANT_GTK="@comment "
.endif
-pre-fetch:
- @${ECHO}
-.if !defined(WANT_GTK)
- @${ECHO} "If you want the GTK frontend, define the WANT_GTK variable"
- @${ECHO} "in your make args. For example:"
- @${ECHO}
- @${ECHO} " make -DWANT_GTK"
-.else
- @${ECHO} "Building with GTK frontend."
-.endif
- @${ECHO}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/asp2php/files/patch-aa b/www/asp2php/files/patch-aa
index eb75b86c5b51..8fcc67d2700d 100644
--- a/www/asp2php/files/patch-aa
+++ b/www/asp2php/files/patch-aa
@@ -1,6 +1,6 @@
--- Makefile Fri Jun 30 12:30:49 2000
+++ Makefile.new Thu Jun 29 15:50:22 2000
-@@ -1,24 +1,25 @@
+@@ -1,24 +1,23 @@
-
-default:
- gcc -c general.c
@@ -18,8 +18,6 @@
- gcc -c session.c
- gcc -o asp2php asp2php.c conditionals.o database.o \
+CC ?= cc
-+GTK_CONFIG ?= gtk12-config
-+INSTALL_PROGRAM ?= install -c -s -o root -g wheel -m 755
+
+all:
+ $(CC) -c general.c
@@ -61,8 +59,8 @@
- @echo "gtk2asp2php: Use from current directory"
-
-
-+ $(INSTALL_PROGRAM) asp2php $(PREFIX)/bin
-+ $(INSTALL_PROGRAM) unipiss $(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) asp2php $(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) unipiss $(PREFIX)/bin
+install-gtk:
-+ $(INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) gtkasp2php $(PREFIX)/bin
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index dcf62e58e024..1d0b71ebed93 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 589d1064ebbc..e1135f87ebe8 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