diff options
author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:17:31 +0000 |
---|---|---|
committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:17:31 +0000 |
commit | c76cf46929051f9dd322487d888c82f104026e6d (patch) | |
tree | f415aeddadc6782b1474ebd88710bfa86cf08711 /x11 | |
parent | Implement USE_GNOME, part 1. (diff) |
Implement USE_GNOME, part 2.
Notes
Notes:
svn path=/head/; revision=33429
Diffstat (limited to '')
-rw-r--r-- | x11-clocks/sanduhr/Makefile | 17 | ||||
-rw-r--r-- | x11-fm/gnomemc/Makefile | 11 | ||||
-rw-r--r-- | x11-fm/nautilus/Makefile | 15 | ||||
-rw-r--r-- | x11-fm/nautilus2/Makefile | 15 | ||||
-rw-r--r-- | x11-toolkits/bakery/Makefile | 13 | ||||
-rw-r--r-- | x11-toolkits/gnome--/Makefile | 10 | ||||
-rw-r--r-- | x11-toolkits/gnome--/pkg-plist | 2 | ||||
-rw-r--r-- | x11-toolkits/py-gnome/Makefile | 14 | ||||
-rw-r--r-- | x11-toolkits/py-gnome/pkg-plist | 1 | ||||
-rw-r--r-- | x11-toolkits/py-gnome2/Makefile | 14 | ||||
-rw-r--r-- | x11-toolkits/py-gnome2/pkg-plist | 1 | ||||
-rw-r--r-- | x11-wm/gnome2wmaker/Makefile | 12 | ||||
-rw-r--r-- | x11-wm/wmg/Makefile | 11 | ||||
-rw-r--r-- | x11-wm/wmg/files/patch-aa | 34 | ||||
-rw-r--r-- | x11/finder/Makefile | 5 | ||||
-rw-r--r-- | x11/finder/files/patch-ab | 2 | ||||
-rw-r--r-- | x11/finder/files/patch-ac | 2 | ||||
-rw-r--r-- | x11/finder/files/patch-ad | 2 | ||||
-rw-r--r-- | x11/gdm/Makefile | 11 | ||||
-rw-r--r-- | x11/gdm2/Makefile | 11 | ||||
-rw-r--r-- | x11/gnome-applets/Makefile | 11 | ||||
-rw-r--r-- | x11/gnomeapplets/Makefile | 11 | ||||
-rw-r--r-- | x11/gnomeapplets2/Makefile | 11 | ||||
-rw-r--r-- | x11/gnomecore/Makefile | 13 | ||||
-rw-r--r-- | x11/gnomeres_applet/Makefile | 15 | ||||
-rw-r--r-- | x11/powershell/Makefile | 13 |
26 files changed, 79 insertions, 198 deletions
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile index 6e2c9c26c698..998096c691dc 100644 --- a/x11-clocks/sanduhr/Makefile +++ b/x11-clocks/sanduhr/Makefile @@ -12,23 +12,12 @@ MASTER_SITES= http://www.mathematik.uni-kl.de/~wwwstoch/voss/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= sanduhr.1 diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index 75e464a089f5..f9c41264e593 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -14,19 +14,12 @@ DISTNAME= mc-${PORTVERSION} MAINTAINER= reg@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --without-edit -with-ncurses +CONFIGURE_ARGS= --without-edit -with-ncurses CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - MAKE="gmake" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index a532c06cb66f..cc65aeab8355 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -25,16 +25,15 @@ MOZILLA= mozilla-embedded BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .endif -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-pthread -L${LOCALBASE}/lib" \ + LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome .if defined(WITH_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/${MOZILLA} @@ -45,12 +44,6 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - LIBS="-pthread -L${LOCALBASE}/lib" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" - .if !defined(WITH_MOZILLA) pre-extract: @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index a532c06cb66f..cc65aeab8355 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -25,16 +25,15 @@ MOZILLA= mozilla-embedded BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .endif -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-pthread -L${LOCALBASE}/lib" \ + LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome .if defined(WITH_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/${MOZILLA} @@ -45,12 +44,6 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - LIBS="-pthread -L${LOCALBASE}/lib" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" - .if !defined(WITH_MOZILLA) pre-extract: @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index f62ff9698646..ea15d2d0b8e6 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -13,23 +13,16 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \ - gnomemm-1.1.3:${PORTSDIR}/x11-toolkits/gnome-- - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- \ + gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile index 37e6b153624d..145f4a6b049e 100644 --- a/x11-toolkits/gnome--/Makefile +++ b/x11-toolkits/gnome--/Makefile @@ -12,17 +12,15 @@ MASTER_SITES= http://download.sourceforge.net/gtkmm/ MAINTAINER= erich@tacni.net -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- +LIB_DEPENDS= gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- BUILD_DEPENDS= m4:${PORTSDIR}/devel/m4 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+=--enable-static=yes -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" +LIBTOOLFLAGS= --disable-ltlibs --release-ignore INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/gnome--/pkg-plist b/x11-toolkits/gnome--/pkg-plist index 4e2bee137e99..ca525423501f 100644 --- a/x11-toolkits/gnome--/pkg-plist +++ b/x11-toolkits/gnome--/pkg-plist @@ -112,8 +112,8 @@ include/gnome--/procbar.h include/gnome--/propertybox.h include/gnome--/stock.h include/gnome--/types.h -lib/libgnomemm-1.1.so.3 lib/libgnomemm.a lib/libgnomemm.so +lib/libgnomemm.so.3 @dirrm include/gnome--/private @dirrm include/gnome-- diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile index cb480197e7ea..4828e386d5ed 100644 --- a/x11-toolkits/py-gnome/Makefile +++ b/x11-toolkits/py-gnome/Makefile @@ -15,30 +15,22 @@ DISTNAME= gnome-python-${PORTVERSION} MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= ${PYGTK_DEP} -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - panel_applet.4:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= ${PYGTK_DEP} -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_PYTHON= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure pygnome/configure pygtk/configure -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ --with-gnome-config=${X11BASE}/bin/gnome-config EG_SRC_DIR= ${WRKSRC}/pygnome/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gnome PYGTK_DEP= ${PYTHON_LIBDIR}/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk -PLIST_COMPLETE= ${PKGDIR}/PLIST .if !defined(NOPORTDOCS) -PLIST= ${PLIST_COMPLETE} post-install: ${MKDIR} ${EG_DST_DIR} ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf - @@ -50,7 +42,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-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist index f134b3e7f6fb..6b0255a25157 100644 --- a/x11-toolkits/py-gnome/pkg-plist +++ b/x11-toolkits/py-gnome/pkg-plist @@ -1,5 +1,6 @@ lib/%%PYTHON_VERSION%%/site-packages/_appletmodule.so lib/%%PYTHON_VERSION%%/site-packages/_cappletmodule.so +lib/%%PYTHON_VERSION%%/site-packages/_gladegnomemodule.so lib/%%PYTHON_VERSION%%/site-packages/_gnomemodule.so lib/%%PYTHON_VERSION%%/site-packages/_gnomeuimodule.so lib/%%PYTHON_VERSION%%/site-packages/_gtkxmhtmlmodule.so diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index cb480197e7ea..4828e386d5ed 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -15,30 +15,22 @@ DISTNAME= gnome-python-${PORTVERSION} MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= ${PYGTK_DEP} -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - panel_applet.4:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= ${PYGTK_DEP} -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_PYTHON= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure pygnome/configure pygtk/configure -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ --with-gnome-config=${X11BASE}/bin/gnome-config EG_SRC_DIR= ${WRKSRC}/pygnome/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gnome PYGTK_DEP= ${PYTHON_LIBDIR}/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk -PLIST_COMPLETE= ${PKGDIR}/PLIST .if !defined(NOPORTDOCS) -PLIST= ${PLIST_COMPLETE} post-install: ${MKDIR} ${EG_DST_DIR} ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf - @@ -50,7 +42,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-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist index f134b3e7f6fb..6b0255a25157 100644 --- a/x11-toolkits/py-gnome2/pkg-plist +++ b/x11-toolkits/py-gnome2/pkg-plist @@ -1,5 +1,6 @@ lib/%%PYTHON_VERSION%%/site-packages/_appletmodule.so lib/%%PYTHON_VERSION%%/site-packages/_cappletmodule.so +lib/%%PYTHON_VERSION%%/site-packages/_gladegnomemodule.so lib/%%PYTHON_VERSION%%/site-packages/_gnomemodule.so lib/%%PYTHON_VERSION%%/site-packages/_gnomeuimodule.so lib/%%PYTHON_VERSION%%/site-packages/_gtkxmhtmlmodule.so diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile index 5741fb0a75f9..c1c92b6ce58c 100644 --- a/x11-wm/gnome2wmaker/Makefile +++ b/x11-wm/gnome2wmaker/Makefile @@ -12,19 +12,11 @@ MASTER_SITES= http://ulli.linuxbox.com/gnome2wmaker/ MAINTAINER= reg@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - wmaker:${PORTSDIR}/x11-wm/windowmaker -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - wmaker:${PORTSDIR}/x11-wm/windowmaker - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile index 7842a2c982e6..a80e4e5d4bdd 100644 --- a/x11-wm/wmg/Makefile +++ b/x11-wm/wmg/Makefile @@ -14,21 +14,12 @@ DISTNAME= wmG-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound \ - gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -LIBTOOLFILES= configure CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-wm/wmg/files/patch-aa b/x11-wm/wmg/files/patch-aa index 4f3cdab5e12d..cd359eaaefae 100644 --- a/x11-wm/wmg/files/patch-aa +++ b/x11-wm/wmg/files/patch-aa @@ -1,11 +1,29 @@ ---- src/Client.C.orig Sat Feb 5 18:11:15 2000 -+++ src/Client.C Sat Feb 5 18:11:31 2000 -@@ -339,7 +339,7 @@ - p = (unsigned char *)malloc( +--- src/Client.C.orig Tue Nov 23 01:59:43 1999 ++++ src/Client.C Tue Nov 23 02:01:29 1999 +@@ -320,7 +320,7 @@ + + + char *Client::getProperty(Atom a) { +- unsigned char *p; ++ char *p; + + if (a == XA_WM_NAME || XA_WM_ICON_NAME) { + XTextProperty xtp; +@@ -335,7 +335,7 @@ + if (st != 0) { + XmbTextPropertyToTextList(display(), &xtp, &cl, &n); + if(cl){ +- p = (unsigned char *)malloc( ++ p = (char *)malloc( sizeof (unsigned char) * (strlen(cl[0]) + 1) ); -- strcpy(p, cl[0]); -+ strcpy((char *)p, cl[0]); - XFreeStringList(cl); - } + strcpy(p, cl[0]); +@@ -344,7 +344,7 @@ } + } + else{ +- if(getProperty_aux(display(), m_window, a, XA_STRING, 100L, &p) <= 0) { ++ if(getProperty_aux(display(), m_window, a, XA_STRING, 100L, &(unsigned char *)p) <= 0) { + return NULL; + } + } diff --git a/x11/finder/Makefile b/x11/finder/Makefile index 4e57cac9bb18..e03fdcf00e9e 100644 --- a/x11/finder/Makefile +++ b/x11/finder/Makefile @@ -12,12 +12,9 @@ MASTER_SITES= http://lfh.hkcampus.net/~lfh-lck/programs/finder/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes ALL_TARGET= default diff --git a/x11/finder/files/patch-ab b/x11/finder/files/patch-ab index e51b0c5ed9de..8dfaa2d4675d 100644 --- a/x11/finder/files/patch-ab +++ b/x11/finder/files/patch-ab @@ -2,7 +2,7 @@ +++ gwmh/Makefile Mon Sep 4 16:18:43 2000 @@ -1,8 +1,8 @@ -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I. -+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I. ++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I. OBJS=gwmh.o gstc.o diff --git a/x11/finder/files/patch-ac b/x11/finder/files/patch-ac index 85bafefcad69..5c049d8d9453 100644 --- a/x11/finder/files/patch-ac +++ b/x11/finder/files/patch-ac @@ -2,7 +2,7 @@ +++ TaskMenu/Makefile Mon Sep 4 16:18:17 2000 @@ -1,8 +1,8 @@ -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I. -+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I. ++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I. OBJS=task-menu.o task-option.o task-manage.o task-icon.o diff --git a/x11/finder/files/patch-ad b/x11/finder/files/patch-ad index 3dbd9140d753..3890bad67ae2 100644 --- a/x11/finder/files/patch-ad +++ b/x11/finder/files/patch-ad @@ -2,7 +2,7 @@ +++ AboutDialog/Makefile 2000/09/04 13:19:53 @@ -1,8 +1,8 @@ -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I. -+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I. ++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I. OBJS=about-dialog.o diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 7b51bbf77301..2972e943ae11 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -15,20 +15,11 @@ DISTNAME= ${PORTNAME}-2.0beta4 MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnome-session:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-fetch: diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 7b51bbf77301..2972e943ae11 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -15,20 +15,11 @@ DISTNAME= ${PORTNAME}-2.0beta4 MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnome-session:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-fetch: diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 40e39c744c05..0fa2e7312898 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -14,21 +14,14 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - xml.5:${PORTSDIR}/textproc/libxml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - esd.2:${PORTSDIR}/audio/esound \ +LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp \ gtop.1:${PORTSDIR}/devel/libgtop -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile index 40e39c744c05..0fa2e7312898 100644 --- a/x11/gnomeapplets/Makefile +++ b/x11/gnomeapplets/Makefile @@ -14,21 +14,14 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - xml.5:${PORTSDIR}/textproc/libxml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - esd.2:${PORTSDIR}/audio/esound \ +LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp \ gtop.1:${PORTSDIR}/devel/libgtop -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 40e39c744c05..0fa2e7312898 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -14,21 +14,14 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - xml.5:${PORTSDIR}/textproc/libxml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - esd.2:${PORTSDIR}/audio/esound \ +LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp \ gtop.1:${PORTSDIR}/devel/libgtop -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index fd12850700f2..060b5eb01efd 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -14,22 +14,17 @@ DISTNAME= gnome-core-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - xml.5:${PORTSDIR}/textproc/libxml \ +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ bz2.1:${PORTSDIR}/archivers/bzip2 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOMECTRL= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-kde-datadir=${LOCALBASE}/share +CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gnome-session.1 gnome-wm.1 save-session.1 diff --git a/x11/gnomeres_applet/Makefile b/x11/gnomeres_applet/Makefile index 82bdbd1cb950..8239bd47e6a6 100644 --- a/x11/gnomeres_applet/Makefile +++ b/x11/gnomeres_applet/Makefile @@ -12,20 +12,11 @@ MASTER_SITES= http://www.sci.fi/~syrjala/gnomeres/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile index 00d8d1d17329..7950fb51e49e 100644 --- a/x11/powershell/Makefile +++ b/x11/powershell/Makefile @@ -13,19 +13,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= smoberly@xavier.dyndns.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_imlib:${PORTSDIR}/graphics/imlib +ALL_TARGET= powershell USE_X_PREFIX= yes +USE_GNOME= yes USE_AUTOCONF= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome - -ALL_TARGET= powershell - -MAKE_ENV= ${CONFIGURE_ENV} - .include <bsd.port.mk> |