diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:57:56 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:57:56 +0000 |
| commit | bebd89314e57ff34ea47724c5605a0f32c425dcf (patch) | |
| tree | d991da3f3e4ccc0cc8f9eab35d1891ca59b0fd9a | |
| parent | 3707e5b7408ecadb0bda141dd82ec9bbca5d0267 (diff) | |
| download | ports-bebd89314e57ff34ea47724c5605a0f32c425dcf.tar.gz ports-bebd89314e57ff34ea47724c5605a0f32c425dcf.zip | |
Implement WANT_IMLIB and USE_IMLIB.
Notes
Notes:
svn path=/head/; revision=33427
72 files changed, 337 insertions, 370 deletions
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 8255252b02a9..8b1c80efed54 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -16,20 +16,19 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes +USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-map-extension=jpg -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" -MAKE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ +MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" + MAN1= xplanet.1 xplanetbg.1 tkxplanet.1 tzcoord.pl.1 .include <bsd.port.pre.mk> diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile index 016234e54414..3c7bb4be2b50 100644 --- a/audio/gkrellmms/Makefile +++ b/audio/gkrellmms/Makefile @@ -12,16 +12,13 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" - WRKSRC= ${WRKDIR}/${PORTNAME} +USE_X_PREFIX= yes +USE_IMLIB= yes + .include <bsd.port.mk> diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile index 016234e54414..3c7bb4be2b50 100644 --- a/audio/gkrellmms2/Makefile +++ b/audio/gkrellmms2/Makefile @@ -12,16 +12,13 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" - WRKSRC= ${WRKDIR}/${PORTNAME} +USE_X_PREFIX= yes +USE_IMLIB= yes + .include <bsd.port.mk> diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile index 9fae04f040d0..92771df4da59 100644 --- a/audio/gkrellmvolume/Makefile +++ b/audio/gkrellmvolume/Makefile @@ -13,14 +13,10 @@ DISTNAME= volume-${PORTVERSION} MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_IMLIB= yes .include <bsd.port.mk> diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index 9fae04f040d0..92771df4da59 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -13,14 +13,10 @@ DISTNAME= volume-${PORTVERSION} MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_IMLIB= yes .include <bsd.port.mk> diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index fa88ff0e1de6..e7f3135b9d5c 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -15,9 +15,9 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= nakai@FreeBSD.org RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes +USE_IMLIB= yes ALL_TARGET= gqmpeg .include <bsd.port.mk> diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index fa88ff0e1de6..e7f3135b9d5c 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -15,9 +15,9 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= nakai@FreeBSD.org RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes +USE_IMLIB= yes ALL_TARGET= gqmpeg .include <bsd.port.mk> diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile index a67113f2ae3d..175f2273b078 100644 --- a/games/freeciv-gtk2/Makefile +++ b/games/freeciv-gtk2/Makefile @@ -11,24 +11,20 @@ CATEGORIES= games MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \ ftp://ftp.netc.pt/pub/freeciv/stable/ \ ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/ -.if defined(WITH_GTK) -PKGNAMESUFFIX= -gtk -.endif MAINTAINER= sheldonh@freebsd.org -.if defined(WITH_GTK) -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib -.endif - USE_XPM= yes USE_BZIP2= yes +WANT_IMLIB= yes GNU_CONFIGURE= yes -.if defined(WITH_GTK) -GLIB_CONFIG?= ${LOCALBASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GLIB_CONFIG}" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_IMLIB) +USE_IMLIB= yes .else CONFIGURE_ARGS= --disable-gtktest .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index a67113f2ae3d..175f2273b078 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -11,24 +11,20 @@ CATEGORIES= games MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \ ftp://ftp.netc.pt/pub/freeciv/stable/ \ ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/ -.if defined(WITH_GTK) -PKGNAMESUFFIX= -gtk -.endif MAINTAINER= sheldonh@freebsd.org -.if defined(WITH_GTK) -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib -.endif - USE_XPM= yes USE_BZIP2= yes +WANT_IMLIB= yes GNU_CONFIGURE= yes -.if defined(WITH_GTK) -GLIB_CONFIG?= ${LOCALBASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GLIB_CONFIG}" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_IMLIB) +USE_IMLIB= yes .else CONFIGURE_ARGS= --disable-gtktest .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile index ae5de647e649..33d749ecee91 100644 --- a/games/gtkabale/Makefile +++ b/games/gtkabale/Makefile @@ -12,15 +12,10 @@ MASTER_SITES= ftp://ftp.seindal.dk/pub/rene/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/games/hex/Makefile b/games/hex/Makefile index 27fe809255fd..d711b2175e44 100644 --- a/games/hex/Makefile +++ b/games/hex/Makefile @@ -13,9 +13,8 @@ MASTER_SITES= http://www.nott.ac.uk/~psystrj/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -USE_X_PREFIX= YES +USE_X_PREFIX= yes +USE_IMLIB= yes MAKE_ENV= GRAPHICPATH="${GRAPHICPATH}" LEVELPATH="${LEVELPATH}" GRAPHICPATH= ${PREFIX}/share/hex/graphics diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile index 47656e2d9427..fa3b290aeec0 100644 --- a/games/xphotohunter/Makefile +++ b/games/xphotohunter/Makefile @@ -12,9 +12,9 @@ MASTER_SITES= http://www.oz.nthu.edu.tw/~u860905/Xphotohunter/ MAINTAINER= clive@CirX.ORG -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - USE_X_PREFIX= yes +USE_GMAKE= yes +USE_IMLIB= yes post-install: @${CAT} ${PKGMESSAGE} diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile index 800ca8e3f4ae..bdd242ae1815 100644 --- a/graphics/chbg/Makefile +++ b/graphics/chbg/Makefile @@ -14,12 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= p@dancris.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib - USE_GMAKE= yes +USE_IMLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/graphics/chbg/files/patch-aa b/graphics/chbg/files/patch-aa new file mode 100644 index 000000000000..96f2f273d11f --- /dev/null +++ b/graphics/chbg/files/patch-aa @@ -0,0 +1,20 @@ +--- configure.orig Tue Oct 3 15:37:21 2000 ++++ configure Tue Oct 3 15:39:25 2000 +@@ -2547,7 +2547,7 @@ + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then +- ac_cv_prog_IMLIB_CONFIG=""yes"" ++ ac_cv_prog_IMLIB_CONFIG=""imlib-config"" + break + fi + done +@@ -2562,7 +2562,7 @@ + echo "$ac_t""no" 1>&6 + fi + +-if eval "test x$IMLIB_CONFIG = xyes"; then ++if eval "test x$IMLIB_CONFIG != xno"; then + echo "$ac_t"""checking for gdk_imlib configuration using imlib-config script ..."" 1>&6 + IMLIB_LIBS=`imlib-config --libs-gdk` + echo "$ac_t""" gdk_imlib LDFLAGS=$IMLIB_LIBS"" 1>&6 diff --git a/graphics/chbg/pkg-plist b/graphics/chbg/pkg-plist index 506789aa76d0..6ea5ee1f9777 100644 --- a/graphics/chbg/pkg-plist +++ b/graphics/chbg/pkg-plist @@ -1 +1,4 @@ bin/chbg +share/locale/fr/LC_MESSAGES/chbg.mo +share/locale/sk/LC_MESSAGES/chbg.mo +share/locale/ja/LC_MESSAGES/chbg.mo diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 5ef9b5529583..a77cfc88c8cd 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -15,10 +15,9 @@ MASTER_SITES= http://mirror.nucba.ac.jp/mirror/enlightenment/enlightenment/libs/ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib - USE_X_PREFIX= yes USE_GMAKE= yes +USE_IMLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile index 3fabf1a1fb43..5f51a91709bb 100644 --- a/graphics/gphoto/Makefile +++ b/graphics/gphoto/Makefile @@ -13,19 +13,13 @@ MASTER_SITES= ftp://ftp.gphoto.org/projects/gphoto/pub/tar/stable/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_IMLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest --disable-imlibtest MAN1= gphoto.1 diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 3fabf1a1fb43..5f51a91709bb 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -13,19 +13,13 @@ MASTER_SITES= ftp://ftp.gphoto.org/projects/gphoto/pub/tar/stable/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_IMLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest --disable-imlibtest MAN1= gphoto.1 diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index fcea058fbdb8..713f81a31417 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -12,21 +12,17 @@ MASTER_SITES= http://gtkgraph.linuxave.net/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - intl.1:${PORTSDIR}/devel/gettext \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -USE_GMAKE= yes USE_X_PREFIX= yes +USE_GMAKE= yes +USE_IMLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-x -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - GTK_CONFIG="${GTK_CONFIG}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-configure: - @${PERL} -pi.orig -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; s|-O2|${CFLAGS}| ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile index 2191eb33fe7c..3bd835aa3255 100644 --- a/graphics/gview/Makefile +++ b/graphics/gview/Makefile @@ -14,15 +14,17 @@ MASTER_SITES= http://netpedia.net/hosting/gview/ \ MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${GTK_CONFIG}" + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 68a40a33bb5a..da461530d457 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -13,10 +13,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - USE_X_PREFIX= yes USE_GMAKE= yes +USE_IMLIB= yes + MAN1= qiv.1 do-configure: diff --git a/irc/yagirc/Makefile b/irc/yagirc/Makefile index 749954f7c17c..3dde8c57fc74 100644 --- a/irc/yagirc/Makefile +++ b/irc/yagirc/Makefile @@ -13,18 +13,14 @@ MASTER_SITE_SUBDIR= mph MAINTAINER= mph@freebsd.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_XPM= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --disable-gnome --disable-pthread CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/irc/yagirc/files/patch-ad b/irc/yagirc/files/patch-ad new file mode 100644 index 000000000000..0747b249c375 --- /dev/null +++ b/irc/yagirc/files/patch-ad @@ -0,0 +1,10 @@ +--- src/script.c.orig Sat Sep 9 02:05:15 2000 ++++ src/script.c Sat Sep 9 02:05:28 2000 +@@ -31,6 +31,7 @@ + #define bool char + #endif + ++#define PERL_POLLUTE + #include <EXTERN.h> + #include <XSUB.h> + diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile index e8a8bd7524f0..0928d9aee378 100644 --- a/japanese/eterm/Makefile +++ b/japanese/eterm/Makefile @@ -16,15 +16,16 @@ DISTNAME= Eterm-${PORTVERSION} MAINTAINER= nobutaka@nobutaka.com -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html USE_GMAKE= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lxpg4" +USE_IMLIB= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-trans=imlib --enable-utmp --enable-multi-charset=kanji \ --enable-xim --with-theme-update +CONFIGURE_ENV= LIBS="-lxpg4" + MAN1= Eterm.1 INSTALLS_SHLIB= yes diff --git a/japanese/eterm/pkg-plist b/japanese/eterm/pkg-plist index c75bc2c4cdb5..4b0a9580bffe 100644 --- a/japanese/eterm/pkg-plist +++ b/japanese/eterm/pkg-plist @@ -6,11 +6,9 @@ bin/Ettable bin/Etcolors bin/Etwinop lib/libEterm.a -lib/libEterm.la lib/libEterm.so lib/libEterm.so.9 lib/libmej.a -lib/libmej.la lib/libmej.so lib/libmej.so.9 share/Eterm/pix/014.jpg diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile index 61d923a23ace..d49ddc0b6272 100644 --- a/korean/eterm/Makefile +++ b/korean/eterm/Makefile @@ -18,12 +18,12 @@ DISTNAME= Eterm-${PORTVERSION} MAINTAINER= hollywar@mail.holywar.net -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib RUN_DEPENDS= ${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanyangfonts USE_GMAKE= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes +USE_IMLIB= yes +USE_LIBTOOL= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4" MAN1= Eterm.1 diff --git a/korean/eterm/pkg-plist b/korean/eterm/pkg-plist index 545fd8c5f704..4fd4e922a099 100644 --- a/korean/eterm/pkg-plist +++ b/korean/eterm/pkg-plist @@ -4,11 +4,9 @@ bin/Etcolors.sh bin/Eterm bin/Etmenu.sh lib/libEterm.a -lib/libEterm.la lib/libEterm.so lib/libEterm.so.8 lib/libmej.a -lib/libmej.la lib/libmej.so lib/libmej.so.8 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile index c4a37593d3e8..66143250ed02 100644 --- a/korean/gtkcomm/Makefile +++ b/korean/gtkcomm/Makefile @@ -13,12 +13,13 @@ MASTER_SITES= http://kldp.org/~namsh/tools/gtkcomm/ MAINTAINER= cjh@kr.freebsd.org RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -USE_X_PREFIX= YES -GNU_CONFIGURE= YES -CONFIGURE_ENV= GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \ - GTK_CONFIG=${X11BASE}/bin/gtk12-config +USE_X_PREFIX= yes +USE_IMLIB= yes +GNU_CONFIGURE= yes + +pre-patch: + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile index 09d5ed979d9d..50ca9e567f2a 100644 --- a/mail/gkrellmmailwatch/Makefile +++ b/mail/gkrellmmailwatch/Makefile @@ -13,20 +13,16 @@ DISTNAME= mailwatch-${PORTVERSION} MAINTAINER= treif@mayn.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -USE_X_PREFIX= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -IMLIB_CONFIG?= ${X11BASE}/bin/imlib-config -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" IMLIB_CONFIG="${IMLIB_CONFIG}" - WRKSRC= ${WRKDIR}/mailwatch +USE_X_PREFIX= yes +USE_IMLIB= yes + do-install: - ${MKDIR} ${PREFIX}/libexec/gkrellm/plugins - ${INSTALL_PROGRAM} ${WRKSRC}/mailwatch.so ${PREFIX}/libexec/gkrellm/plugins + ${MKDIR} ${PREFIX}/libexec/gkrellm/plugins + ${INSTALL_PROGRAM} ${WRKSRC}/mailwatch.so ${PREFIX}/libexec/gkrellm/plugins .include <bsd.port.mk> diff --git a/mail/gkrellmmailwatch/files/patch-aa b/mail/gkrellmmailwatch/files/patch-aa index 968e103872ef..40557c670a40 100644 --- a/mail/gkrellmmailwatch/files/patch-aa +++ b/mail/gkrellmmailwatch/files/patch-aa @@ -11,10 +11,8 @@ -GKRELLM_INCLUDE= -I/usr/local/include +GKRELLM_INCLUDE= -I$(PREFIX)/include --IMLIB_INCLUDE = `imlib-config --cflags-gdk` --IMLIB_LIB = `imlib-config --libs-gdk` -+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk` -+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk` + IMLIB_INCLUDE = `imlib-config --cflags-gdk` + IMLIB_LIB = `imlib-config --libs-gdk` INSTALL=install -c -s -m 755 diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index fce7e3c4c0b7..bb77f272de4b 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -12,20 +12,13 @@ MASTER_SITES= http://sylpheed.good-day.net/sylpheed/ MAINTAINER= shigeri@m10.alpha-net.ne.jp -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-glibtest --disable-gtktest --disable-imlibtest \ - --disable-compface --disable-gdk-pixbuf --enable-ipv6 +CONFIGURE_ARGS= --disable-compface --disable-gdk-pixbuf --enable-ipv6 PORTDOCS= ChangeLog ChangeLog.jp INSTALL INSTALL.jp README README.jp \ TODO.jp diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index fce7e3c4c0b7..bb77f272de4b 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -12,20 +12,13 @@ MASTER_SITES= http://sylpheed.good-day.net/sylpheed/ MAINTAINER= shigeri@m10.alpha-net.ne.jp -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-glibtest --disable-gtktest --disable-imlibtest \ - --disable-compface --disable-gdk-pixbuf --enable-ipv6 +CONFIGURE_ARGS= --disable-compface --disable-gdk-pixbuf --enable-ipv6 PORTDOCS= ChangeLog ChangeLog.jp INSTALL INSTALL.jp README README.jp \ TODO.jp diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index fce7e3c4c0b7..bb77f272de4b 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -12,20 +12,13 @@ MASTER_SITES= http://sylpheed.good-day.net/sylpheed/ MAINTAINER= shigeri@m10.alpha-net.ne.jp -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-glibtest --disable-gtktest --disable-imlibtest \ - --disable-compface --disable-gdk-pixbuf --enable-ipv6 +CONFIGURE_ARGS= --disable-compface --disable-gdk-pixbuf --enable-ipv6 PORTDOCS= ChangeLog ChangeLog.jp INSTALL INSTALL.jp README README.jp \ TODO.jp diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index fce7e3c4c0b7..bb77f272de4b 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -12,20 +12,13 @@ MASTER_SITES= http://sylpheed.good-day.net/sylpheed/ MAINTAINER= shigeri@m10.alpha-net.ne.jp -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-glibtest --disable-gtktest --disable-imlibtest \ - --disable-compface --disable-gdk-pixbuf --enable-ipv6 +CONFIGURE_ARGS= --disable-compface --disable-gdk-pixbuf --enable-ipv6 PORTDOCS= ChangeLog ChangeLog.jp INSTALL INSTALL.jp README README.jp \ TODO.jp diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile index f5a85a928bdf..1a0bfed6dc44 100644 --- a/net/gkrellm_snmp/Makefile +++ b/net/gkrellm_snmp/Makefile @@ -12,17 +12,13 @@ MASTER_SITES= http://triq.net/gkrellm/ MAINTAINER= eike.bernhardt@gmx.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - snmp.4:${PORTSDIR}/net/ucd-snmp -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm -RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= snmp.4:${PORTSDIR}/net/ucd-snmp +BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \ +USE_IMLIB= yes +MAKE_ENV= GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \ PLUGIN_DIR="${X11BASE}/libexec/gkrellm/plugins/" .include <bsd.port.mk> diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile index f9635db275f3..639db586335f 100644 --- a/news/PicMonger/Makefile +++ b/news/PicMonger/Makefile @@ -12,16 +12,12 @@ MASTER_SITES= http://download.sourceforge.net/PicMonger/ MAINTAINER= dburr@FreeBSD.ORG -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \ - Imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- RUN_DEPENDS= mpack:${PORTSDIR}/converters/mpack -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_IMLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 3b8de44cbb0d..24784e81f2cc 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -14,14 +14,9 @@ MASTER_SITE_SUBDIR= ume MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_GMAKE= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" INCLUDES= gkrellm.h gkrellm_public_proto.h gkrellm_private_proto.h DOCS= COPYRIGHT README Themes.html diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist index c0246dd401a8..7856db2064d0 100644 --- a/sysutils/gkrellm/pkg-plist +++ b/sysutils/gkrellm/pkg-plist @@ -13,3 +13,4 @@ share/doc/gkrellm/COPYRIGHT share/doc/gkrellm/README share/doc/gkrellm/Themes.html @dirrm share/doc/gkrellm +@dirrm include/gkrellm diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 3b8de44cbb0d..24784e81f2cc 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -14,14 +14,9 @@ MASTER_SITE_SUBDIR= ume MAINTAINER= ume@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_GMAKE= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" INCLUDES= gkrellm.h gkrellm_public_proto.h gkrellm_private_proto.h DOCS= COPYRIGHT README Themes.html diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index c0246dd401a8..7856db2064d0 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -13,3 +13,4 @@ share/doc/gkrellm/COPYRIGHT share/doc/gkrellm/README share/doc/gkrellm/Themes.html @dirrm share/doc/gkrellm +@dirrm include/gkrellm diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 8fc5a106ab19..28ca859841ff 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -14,27 +14,23 @@ MASTER_SITES= http://bluefish.openoffice.nl/download/ \ MAINTAINER= jim@FreeBSD.org RUN_DEPENDS= weblint:${PORTSDIR}/www/weblint -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_BZIP2= yes USE_X_PREFIX= yes +USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-install-location="${X11BASE}/lib/bluefish" \ --disable-nls -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" + MAN1= bluefish.1 post-install: - @strip ${PREFIX}/bin/bluefish .if !defined(NOPORTDOCS) @${ECHO} "===> Installing bluefish docs in ${PREFIX}/share/doc/bluefish" @${ECHO} "===> A manual is available online at http://bluefish.linuxbox.com/manual/" @${MKDIR} ${PREFIX}/share/doc/bluefish && ${CHMOD} a+rx ${PREFIX}/share/doc/bluefish - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bluefish + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bluefish .endif .include <bsd.port.mk> diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile index 16c4fc407c9c..399a109c912a 100644 --- a/x11-fm/dfm/Makefile +++ b/x11-fm/dfm/Makefile @@ -12,20 +12,15 @@ MASTER_SITES= http://dfm.online.de/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME} + USE_X_PREFIX= yes USE_XPM= yes +USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtktest --disable-imlibtest - MAN1= dfm.1x DFM_DOCS= ANNOUNCE BUGS COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR \ diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile index 4929b10b53db..d1e2eb2722e8 100644 --- a/x11-themes/gtk-engines/Makefile +++ b/x11-themes/gtk-engines/Makefile @@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= stable/sources/gtk-engines MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" THEMES= metal notif pixmap redmond95 diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 4929b10b53db..d1e2eb2722e8 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= stable/sources/gtk-engines MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile index 4929b10b53db..d1e2eb2722e8 100644 --- a/x11-toolkits/gtk-engines/Makefile +++ b/x11-toolkits/gtk-engines/Makefile @@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= stable/sources/gtk-engines MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile index 4929b10b53db..d1e2eb2722e8 100644 --- a/x11-toolkits/gtk-engines2/Makefile +++ b/x11-toolkits/gtk-engines2/Makefile @@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= stable/sources/gtk-engines MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile index 669d303a9563..ea9c4bd5d0a4 100644 --- a/x11-toolkits/p5-Gtk/Makefile +++ b/x11-toolkits/p5-Gtk/Makefile @@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - USE_PERL5= yes +USE_IMLIB= yes MAN3= Gtk::GtkColorSelectButton.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ - --with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}" + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ + --with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}" .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index 90fae7927061..82b31e8aaba7 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -14,22 +14,20 @@ DISTNAME= gnome-python-1.0.53 MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade + +WRKSRC= ${WRKDIR}/${DISTNAME}/pygtk -GTK_CONFIG= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes +USE_IMLIB= yes USE_PYTHON= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} PYTHON=${PYTHON_CMD} USE_LIBTOOL= yes -PLIST_COMPLETE= ${PKGDIR}/PLIST +CONFIGURE_ENV= PYTHON=${PYTHON_CMD} -WRKSRC= ${WRKDIR}/${DISTNAME}/pygtk EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gtk .if !defined(NOPORTDOCS) -PLIST= ${PLIST_COMPLETE} post-install: ${MKDIR} ${EG_DST_DIR} ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf - @@ -43,7 +41,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PLIST_COMPLETE} > ${PLIST} + ${PKGDIR}/PLIST > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist index a3b39ddc87a6..0d4f663222cd 100644 --- a/x11-toolkits/py-gtk/pkg-plist +++ b/x11-toolkits/py-gtk/pkg-plist @@ -17,9 +17,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyc lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyo lib/%%PYTHON_VERSION%%/site-packages/_gdkimlibmodule.so lib/%%PYTHON_VERSION%%/site-packages/_gtkmodule.so +lib/%%PYTHON_VERSION%%/site-packages/_libglademodule.so lib/%%PYTHON_VERSION%%/site-packages/gtk.py lib/%%PYTHON_VERSION%%/site-packages/gtk.pyc lib/%%PYTHON_VERSION%%/site-packages/gtk.pyo +lib/%%PYTHON_VERSION%%/site-packages/libglade.py +lib/%%PYTHON_VERSION%%/site-packages/libglade.pyc +lib/%%PYTHON_VERSION%%/site-packages/libglade.pyo lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.py lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyc lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyo @@ -82,14 +86,14 @@ share/examples/py-gtk/testgtk/README share/examples/py-gtk/testgtk/test.xpm share/examples/py-gtk/testgtk/testgtk.py share/examples/py-gtk/testgtk/testgtkrc -@dirrm include/pygtk -@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade -@dirrm share/doc/py-gtk -@dirrm share/examples/py-gtk/gl -@dirrm share/examples/py-gtk/glade -@dirrm share/examples/py-gtk/ide -@dirrm share/examples/py-gtk/imlib -@dirrm share/examples/py-gtk/neil -@dirrm share/examples/py-gtk/simple @dirrm share/examples/py-gtk/testgtk +@dirrm share/examples/py-gtk/simple +@dirrm share/examples/py-gtk/neil +@dirrm share/examples/py-gtk/imlib +@dirrm share/examples/py-gtk/ide +@dirrm share/examples/py-gtk/glade +@dirrm share/examples/py-gtk/gl @dirrm share/examples/py-gtk +@dirrm share/doc/py-gtk +@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade +@dirrm include/pygtk diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 90fae7927061..82b31e8aaba7 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -14,22 +14,20 @@ DISTNAME= gnome-python-1.0.53 MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade + +WRKSRC= ${WRKDIR}/${DISTNAME}/pygtk -GTK_CONFIG= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes +USE_IMLIB= yes USE_PYTHON= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} PYTHON=${PYTHON_CMD} USE_LIBTOOL= yes -PLIST_COMPLETE= ${PKGDIR}/PLIST +CONFIGURE_ENV= PYTHON=${PYTHON_CMD} -WRKSRC= ${WRKDIR}/${DISTNAME}/pygtk EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gtk .if !defined(NOPORTDOCS) -PLIST= ${PLIST_COMPLETE} post-install: ${MKDIR} ${EG_DST_DIR} ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf - @@ -43,7 +41,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PLIST_COMPLETE} > ${PLIST} + ${PKGDIR}/PLIST > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist index a3b39ddc87a6..0d4f663222cd 100644 --- a/x11-toolkits/py-gtk2/pkg-plist +++ b/x11-toolkits/py-gtk2/pkg-plist @@ -17,9 +17,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyc lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyo lib/%%PYTHON_VERSION%%/site-packages/_gdkimlibmodule.so lib/%%PYTHON_VERSION%%/site-packages/_gtkmodule.so +lib/%%PYTHON_VERSION%%/site-packages/_libglademodule.so lib/%%PYTHON_VERSION%%/site-packages/gtk.py lib/%%PYTHON_VERSION%%/site-packages/gtk.pyc lib/%%PYTHON_VERSION%%/site-packages/gtk.pyo +lib/%%PYTHON_VERSION%%/site-packages/libglade.py +lib/%%PYTHON_VERSION%%/site-packages/libglade.pyc +lib/%%PYTHON_VERSION%%/site-packages/libglade.pyo lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.py lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyc lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyo @@ -82,14 +86,14 @@ share/examples/py-gtk/testgtk/README share/examples/py-gtk/testgtk/test.xpm share/examples/py-gtk/testgtk/testgtk.py share/examples/py-gtk/testgtk/testgtkrc -@dirrm include/pygtk -@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade -@dirrm share/doc/py-gtk -@dirrm share/examples/py-gtk/gl -@dirrm share/examples/py-gtk/glade -@dirrm share/examples/py-gtk/ide -@dirrm share/examples/py-gtk/imlib -@dirrm share/examples/py-gtk/neil -@dirrm share/examples/py-gtk/simple @dirrm share/examples/py-gtk/testgtk +@dirrm share/examples/py-gtk/simple +@dirrm share/examples/py-gtk/neil +@dirrm share/examples/py-gtk/imlib +@dirrm share/examples/py-gtk/ide +@dirrm share/examples/py-gtk/glade +@dirrm share/examples/py-gtk/gl @dirrm share/examples/py-gtk +@dirrm share/doc/py-gtk +@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade +@dirrm include/pygtk diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile index e992ce9b8c04..5a21425408b5 100644 --- a/x11-toolkits/ruby-gtk/Makefile +++ b/x11-toolkits/ruby-gtk/Makefile @@ -15,22 +15,24 @@ DIST_SUBDIR= ruby MAINTAINER= yasuf@bsdclub.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_RUBY= yes USE_RUBY_EXTCONF= yes - USE_XLIB= yes +USE_GTK= yes +WANT_IMLIB= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -CONFIGURE_ARGS= ${GTK_CONFIG} INSTALL_TARGET= site-install -.if defined(WITHOUT_IMLIB) -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +.include <bsd.port.pre.mk> + +.if defined(HAVE_IMLIB) +USE_IMLIB= yes .else -LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib -GTK_CONFIG?= ${X11BASE}/bin/imlib-config +PLIST= ${WRKDIR}/PLIST +pre-install: + @${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST} .endif post-configure: @@ -43,7 +45,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/gtk ${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/browser ${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${RUBY_EXAMPLESDIR}/gtk/browser -.if !defined(NO_IMLIB) +.if defined(HAVE_IMLIB) ${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/gdkimlib ${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${RUBY_EXAMPLESDIR}/gtk/gdkimlib .endif @@ -52,4 +54,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index e992ce9b8c04..5a21425408b5 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -15,22 +15,24 @@ DIST_SUBDIR= ruby MAINTAINER= yasuf@bsdclub.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_RUBY= yes USE_RUBY_EXTCONF= yes - USE_XLIB= yes +USE_GTK= yes +WANT_IMLIB= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -CONFIGURE_ARGS= ${GTK_CONFIG} INSTALL_TARGET= site-install -.if defined(WITHOUT_IMLIB) -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +.include <bsd.port.pre.mk> + +.if defined(HAVE_IMLIB) +USE_IMLIB= yes .else -LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib -GTK_CONFIG?= ${X11BASE}/bin/imlib-config +PLIST= ${WRKDIR}/PLIST +pre-install: + @${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST} .endif post-configure: @@ -43,7 +45,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/gtk ${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/browser ${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${RUBY_EXAMPLESDIR}/gtk/browser -.if !defined(NO_IMLIB) +.if defined(HAVE_IMLIB) ${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/gdkimlib ${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${RUBY_EXAMPLESDIR}/gtk/gdkimlib .endif @@ -52,4 +54,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 2f7317afd5d0..40c7c35e8bb2 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -15,14 +15,14 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - Fnlib.0:${PORTSDIR}/graphics/fnlib \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_ESOUND= yes +USE_IMLIB= yes USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile index 2f7317afd5d0..40c7c35e8bb2 100644 --- a/x11-wm/enlightenment-devel/Makefile +++ b/x11-wm/enlightenment-devel/Makefile @@ -15,14 +15,14 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - Fnlib.0:${PORTSDIR}/graphics/fnlib \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_ESOUND= yes +USE_IMLIB= yes USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index 2f7317afd5d0..40c7c35e8bb2 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -15,14 +15,14 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - Fnlib.0:${PORTSDIR}/graphics/fnlib \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_ESOUND= yes +USE_IMLIB= yes USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile index 7a0ff431d83d..3ae836f4ac2e 100644 --- a/x11-wm/qvwm/Makefile +++ b/x11-wm/qvwm/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound - USE_X_PREFIX= yes +USE_ESOUND= yes +USE_IMLIB= yes USE_XPM= yes GNU_CONFIGURE= yes diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile index ad1801db8e44..104ae9e1df02 100644 --- a/x11-wm/scwm/Makefile +++ b/x11-wm/scwm/Makefile @@ -12,33 +12,28 @@ MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -GNU_CONFIGURE= yes +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_XPM= yes +USE_ESOUND= yes +USE_IMLIB= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -.if defined(MULTIBYTE) +.if defined(WITH_I18N) CONFIGURE_ARGS+= --enable-multibyte=yes CONFIGURE_ENV+= LIBS="-L${X11BASE}/lib -lxpg4" .endif -USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes MAN1= scwm.1 scwmexec.1 scwmrepl.1 post-install: - ${RM} -rf ${PREFIX}/share/scwm/ViaVoice + ${RM} -rf ${PREFIX}/share/scwm/ViaVoice .include <bsd.port.mk> diff --git a/x11-wm/scwm/files/patch-ag b/x11-wm/scwm/files/patch-ag new file mode 100644 index 000000000000..f9d4c2e5f06d --- /dev/null +++ b/x11-wm/scwm/files/patch-ag @@ -0,0 +1,12 @@ +--- src/guile-compat.h.orig Tue Sep 12 20:55:56 2000 ++++ src/guile-compat.h Tue Sep 12 20:56:42 2000 +@@ -76,8 +76,7 @@ + + #ifdef HAVE_SCM_THE_LAST_STACK_FLUID + /* from libguile/fluids.h --07/01/98 gjb */ +-SCM scm_fluid_ref SCM_P ((SCM fluid)); +-SCM scm_fluid_set_x SCM_P ((SCM fluid, SCM value)); ++#include <libguile/fluids.h> + #define DEREF_LAST_STACK scm_fluid_ref(gh_cdr(scm_the_last_stack_fluid)) + #define SET_LAST_STACK(X) scm_fluid_set_x (gh_cdr (scm_the_last_stack_fluid), (X)) + diff --git a/x11-wm/scwm/files/patch-ah b/x11-wm/scwm/files/patch-ah new file mode 100644 index 000000000000..e1b590b9eb21 --- /dev/null +++ b/x11-wm/scwm/files/patch-ah @@ -0,0 +1,20 @@ +--- src/scwm.c.orig Wed Sep 13 00:27:42 2000 ++++ src/scwm.c Wed Sep 13 00:55:21 2000 +@@ -1838,7 +1838,7 @@ + { + static SCM sym_arglist = SCM_UNDEFINED; + if (SCM_UNDEFINED == sym_arglist) +- sym_arglist = scm_permanent_object(((scm_cell *)scm_intern0("arglist"))->car); ++ sym_arglist = scm_permanent_object(SCM_CAR(scm_intern0("arglist"))); + { /* scope */ + SCM p = scm_make_gsubr(name,req,opt,var,fcn); + if (fDocumentPrimitiveFormals) { +@@ -1859,7 +1859,7 @@ + since events.c has the SCWM_GLOBAL_SYMBOL definition of it */ + if (SCM_BOOL_F == sym_interactive) + sym_interactive = +- scm_permanent_object(((scm_cell *)scm_intern0("interactive"))->car); ++ scm_permanent_object(SCM_CAR(scm_intern0("interactive"))); + { /* scope */ + SCM p = scwm_make_gsubr(name,req,opt,var,fcn,szArgList); + scm_set_procedure_property_x(p,sym_interactive, diff --git a/x11-wm/scwm/files/patch-ai b/x11-wm/scwm/files/patch-ai new file mode 100644 index 000000000000..ca808d36a20e --- /dev/null +++ b/x11-wm/scwm/files/patch-ai @@ -0,0 +1,11 @@ +--- src/callbacks.h.orig Wed Sep 13 01:06:11 2000 ++++ src/callbacks.h Wed Sep 13 01:03:16 2000 +@@ -32,7 +32,7 @@ + #endif + + #ifdef HAVE_SCM_MAKE_HOOK +-#define SCWM_MAKE_HOOK(name,args) scm_permanent_object(scm_make_named_hook((name),(args))) ++#define SCWM_MAKE_HOOK(name,args) scm_permanent_object(scm_create_hook((name),(args))) + #else + #define SCWM_MAKE_HOOK(name,args) SCM_EOL + #endif diff --git a/x11-wm/scwm/files/patch-aj b/x11-wm/scwm/files/patch-aj new file mode 100644 index 000000000000..8961d82566ab --- /dev/null +++ b/x11-wm/scwm/files/patch-aj @@ -0,0 +1,20 @@ +--- src/scwm-snarf.h.orig Wed Sep 13 01:01:45 2000 ++++ src/scwm-snarf.h Wed Sep 13 01:02:12 2000 +@@ -61,7 +61,7 @@ + + #ifdef HAVE_SCM_MAKE_HOOK + #define SCWM_HOOK(var, name, args, docstring) \ +-%%% do { var = scm_make_named_hook(name,args); } while (0) ++%%% do { var = scm_create_hook(name,args); } while (0) + #else + #define SCWM_HOOK(var, name, args, docstring) \ + %%% do { var = scm_sysintern(name, SCM_EOL); } while (0) +@@ -76,7 +76,7 @@ + + #if HAVE_SCM_MAKE_HOOK + #define SCWM_GLOBAL_HOOK(var, name, args, docstring) \ +-%%% do { var = scm_make_named_hook(name,args); } while (0) ++%%% do { var = scm_create_hook(name,args); } while (0) + #else + #define SCWM_GLOBAL_HOOK(var, name, args, docstring) \ + %%% do { var = scm_sysintern(name, SCM_EOL); } while (0) diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist index 42cae8a4be52..f021e21137e4 100644 --- a/x11-wm/scwm/pkg-plist +++ b/x11-wm/scwm/pkg-plist @@ -8,43 +8,33 @@ bin/startscwm include/scwmexec.h info/scwm.info lib/libscwmexec.a -lib/libscwmexec.la lib/libscwmexec.so lib/libscwmexec.so.0 lib/scwm/modules/app/scwm/libbackground.a -lib/scwm/modules/app/scwm/libbackground.la lib/scwm/modules/app/scwm/libbackground.so lib/scwm/modules/app/scwm/libbackground.so.0 lib/scwm/modules/app/scwm/libc-animation.a -lib/scwm/modules/app/scwm/libc-animation.la lib/scwm/modules/app/scwm/libc-animation.so lib/scwm/modules/app/scwm/libc-animation.so.0 lib/scwm/modules/app/scwm/libesdsound.a -lib/scwm/modules/app/scwm/libesdsound.la lib/scwm/modules/app/scwm/libesdsound.so lib/scwm/modules/app/scwm/libesdsound.so.0 lib/scwm/modules/app/scwm/liboverlay-plane.a -lib/scwm/modules/app/scwm/liboverlay-plane.la lib/scwm/modules/app/scwm/liboverlay-plane.so lib/scwm/modules/app/scwm/liboverlay-plane.so.0 lib/scwm/modules/app/scwm/libpie-menus.a -lib/scwm/modules/app/scwm/libpie-menus.la lib/scwm/modules/app/scwm/libpie-menus.so lib/scwm/modules/app/scwm/libpie-menus.so.0 lib/scwm/modules/app/scwm/libscwmgtkhelper.a -lib/scwm/modules/app/scwm/libscwmgtkhelper.la lib/scwm/modules/app/scwm/libscwmgtkhelper.so lib/scwm/modules/app/scwm/libscwmgtkhelper.so.0 lib/scwm/modules/app/scwm/libscwmxtest.a -lib/scwm/modules/app/scwm/libscwmxtest.la lib/scwm/modules/app/scwm/libscwmxtest.so lib/scwm/modules/app/scwm/libscwmxtest.so.0 lib/scwm/modules/app/scwm/libxlib-drawing.a -lib/scwm/modules/app/scwm/libxlib-drawing.la lib/scwm/modules/app/scwm/libxlib-drawing.so lib/scwm/modules/app/scwm/libxlib-drawing.so.0 lib/scwm/modules/app/scwm/libxpm-menus.a -lib/scwm/modules/app/scwm/libxpm-menus.la lib/scwm/modules/app/scwm/libxpm-menus.so lib/scwm/modules/app/scwm/libxpm-menus.so.0 share/doc/scwm/examples/Xmodmap-win95keyboard diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index 52914c77688b..448092186e3d 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -12,17 +12,12 @@ MASTER_SITES= http://www.xfce.org/archive/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_XPM= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -lxpg4" CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share \ diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 52914c77688b..448092186e3d 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -12,17 +12,12 @@ MASTER_SITES= http://www.xfce.org/archive/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_XPM= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -lxpg4" CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share \ diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 6115a65caa3a..b340fdee1db5 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -18,10 +18,9 @@ DISTNAME= Eterm-${PORTVERSION} MAINTAINER= murray@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib - USE_GMAKE= yes USE_X_PREFIX= yes +USE_IMLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 565e13bc49bd..25604554e90c 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -15,17 +15,14 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - esd.2:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit USE_X_PREFIX= yes USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFILES= configure libart_lgpl/configure @@ -33,8 +30,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-test-gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gnome.1 gnome-config.1 diff --git a/x11/gnome-libs/files/patch-bm b/x11/gnome-libs/files/patch-bm new file mode 100644 index 000000000000..ab6caa847240 --- /dev/null +++ b/x11/gnome-libs/files/patch-bm @@ -0,0 +1,11 @@ +--- zvt/vt.h.orig Sat Sep 9 01:33:07 2000 ++++ zvt/vt.h Sat Sep 9 01:35:18 2000 +@@ -23,7 +23,7 @@ + + #include <unistd.h> + +-#include "lists.h" ++#include <zvt/lists.h> + + /* for utf-8 input support */ + #define ZVT_UTF 1 diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 565e13bc49bd..25604554e90c 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -15,17 +15,14 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - esd.2:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit USE_X_PREFIX= yes USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFILES= configure libart_lgpl/configure @@ -33,8 +30,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-test-gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gnome.1 gnome-config.1 diff --git a/x11/gnomelibs/files/patch-bm b/x11/gnomelibs/files/patch-bm new file mode 100644 index 000000000000..ab6caa847240 --- /dev/null +++ b/x11/gnomelibs/files/patch-bm @@ -0,0 +1,11 @@ +--- zvt/vt.h.orig Sat Sep 9 01:33:07 2000 ++++ zvt/vt.h Sat Sep 9 01:35:18 2000 +@@ -23,7 +23,7 @@ + + #include <unistd.h> + +-#include "lists.h" ++#include <zvt/lists.h> + + /* for utf-8 input support */ + #define ZVT_UTF 1 diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 565e13bc49bd..25604554e90c 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -15,17 +15,14 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - esd.2:${PORTSDIR}/audio/esound - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit USE_X_PREFIX= yes USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes +USE_IMLIB= yes +USE_ESOUND= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFILES= configure libart_lgpl/configure @@ -33,8 +30,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-test-gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gnome.1 gnome-config.1 diff --git a/x11/libgnome/files/patch-bm b/x11/libgnome/files/patch-bm new file mode 100644 index 000000000000..ab6caa847240 --- /dev/null +++ b/x11/libgnome/files/patch-bm @@ -0,0 +1,11 @@ +--- zvt/vt.h.orig Sat Sep 9 01:33:07 2000 ++++ zvt/vt.h Sat Sep 9 01:35:18 2000 +@@ -23,7 +23,7 @@ + + #include <unistd.h> + +-#include "lists.h" ++#include <zvt/lists.h> + + /* for utf-8 input support */ + #define ZVT_UTF 1 |