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 | |
| parent | b7bdcd418e7aca3dd98409e16a4c4ae9bc289d02 (diff) | |
| download | ports-c76cf46929051f9dd322487d888c82f104026e6d.tar.gz ports-c76cf46929051f9dd322487d888c82f104026e6d.zip | |
Notes
117 files changed, 672 insertions, 1053 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 2b18eb0ab01b..0200e1f452ff 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -14,21 +14,15 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop \ +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -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/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 2b18eb0ab01b..0200e1f452ff 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -14,21 +14,15 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop \ +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -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/finance/gnomepm/Makefile b/finance/gnomepm/Makefile index f1fe86b9808e..f36637a30e1e 100644 --- a/finance/gnomepm/Makefile +++ b/finance/gnomepm/Makefile @@ -13,22 +13,13 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - ghttp.1:${PORTSDIR}/www/libghttp -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp 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" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile index e80523b45ee3..4db82a09e2d7 100644 --- a/japanese/balsa/Makefile +++ b/japanese/balsa/Makefile @@ -13,28 +13,19 @@ DISTNAME= balsa-0.8.0-ja MAINTAINER= yatt@msc.biglobe.ne.jp -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - PropList.2:${PORTSDIR}/devel/libPropList +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +WRKSRC= ${WRKDIR}/balsa-0.8.0ja USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes USE_GMAKE= yes LIBTOOLFILES= configure libmutt/configure -CONFIGURE_ENV= GTK_CONFIG='${GTK_CONFIG}' \ - GLIB_CONFIG='${GLIB_CONFIG}' \ - CPPFLAGS='-I${LOCALBASE}/include' \ +CONFIGURE_ARGS= --enable-system-install --enable-threads +CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \ LIBS='-L${LOCALBASE}/lib' -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} \ - --enable-system-install --enable-threads -WRKSRC= ${WRKDIR}/balsa-0.8.0ja - MAN1= balsa.1 pre-configure: diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile index ff48bc2877e6..70281f04a7b8 100644 --- a/lang/gnomebasic/Makefile +++ b/lang/gnomebasic/Makefile @@ -14,18 +14,12 @@ DISTNAME= gb-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index b74df71d4142..6a23fdd00e40 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -14,29 +14,18 @@ MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - PropList.2:${PORTSDIR}/devel/libPropList \ +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ pspell.2:${PORTSDIR}/textproc/pspell \ gnomeprint.12:${PORTSDIR}/print/gnomeprint -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libmutt/configure -CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \ - GTK_CONFIG='${GTK_CONFIG}' \ - GLIB_CONFIG='${GLIB_CONFIG}' \ - LIBS='-L${LOCALBASE}/lib' -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} \ - --enable-threads \ +CONFIGURE_ARGS= --enable-threads \ --disable-more-warnings +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= balsa.1 diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index b74df71d4142..6a23fdd00e40 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -14,29 +14,18 @@ MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - PropList.2:${PORTSDIR}/devel/libPropList \ +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ pspell.2:${PORTSDIR}/textproc/pspell \ gnomeprint.12:${PORTSDIR}/print/gnomeprint -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libmutt/configure -CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \ - GTK_CONFIG='${GTK_CONFIG}' \ - GLIB_CONFIG='${GLIB_CONFIG}' \ - LIBS='-L${LOCALBASE}/lib' -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} \ - --enable-threads \ +CONFIGURE_ARGS= --enable-threads \ --disable-more-warnings +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= balsa.1 diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index feae138d8876..30e9dfb045b8 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= unstable/sources/evolution MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml \ +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ gnomeprint.12:${PORTSDIR}/print/gnomeprint \ @@ -25,22 +24,15 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ unicode.0:${PORTSDIR}/devel/libunicode \ gtkhtml.4:${PORTSDIR}/www/gtkhtml \ ldap.1:${PORTSDIR}/net/openldap \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot -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 LIBTOOLFILES= configure libical/configure -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-pisock=${LOCALBASE}/pilot +CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index feae138d8876..30e9dfb045b8 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= unstable/sources/evolution MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml \ +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ gnomeprint.12:${PORTSDIR}/print/gnomeprint \ @@ -25,22 +24,15 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ unicode.0:${PORTSDIR}/devel/libunicode \ gtkhtml.4:${PORTSDIR}/www/gtkhtml \ ldap.1:${PORTSDIR}/net/openldap \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot -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 LIBTOOLFILES= configure libical/configure -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-pisock=${LOCALBASE}/pilot +CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile index 8aefdf5a9eae..af7d88902a40 100644 --- a/mail/glacier/Makefile +++ b/mail/glacier/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://glacier.linuxave.net/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} -CONFIGURE_ARGS+=--datadir=${PREFIX}/share USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes + +pre-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' .include <bsd.port.mk> diff --git a/mail/glacier/files/patch-aa b/mail/glacier/files/patch-aa new file mode 100644 index 000000000000..988f80154cd2 --- /dev/null +++ b/mail/glacier/files/patch-aa @@ -0,0 +1,11 @@ +--- configure.orig Sun Feb 27 16:05:09 2000 ++++ configure Sun Feb 27 16:05:59 2000 +@@ -1333,7 +1333,7 @@ + echo "configure:1334: checking for Gnome compile flags" >&5 + GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` + GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //'` +- GNOME_MINOR=`echo $GNOME_VER |$sedpath 's/\([0-9]**\).\([0-9]**\).\([0-9]**\)/\2/'` ++ GNOME_MINOR=`echo $GNOME_VER |$sedpath 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + + if test "_$GNOME_MINOR" = "_20"; then + gnome=no diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile index c5068004a167..6081cf7d345e 100644 --- a/mail/mmc/Makefile +++ b/mail/mmc/Makefile @@ -14,19 +14,19 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//} USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile index f12c47d538e6..d13506635b68 100644 --- a/mail/pmail/Makefile +++ b/mail/pmail/Makefile @@ -16,16 +16,12 @@ BUILD_DEPENDS= ${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-to LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= ${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome +USE_X_PREFIX= yes USE_GMAKE= yes USE_PYTHON= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -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" .include <bsd.port.mk> diff --git a/mail/pmail/pkg-plist b/mail/pmail/pkg-plist index 71f0dca9f63d..c1e42fe7968b 100644 --- a/mail/pmail/pkg-plist +++ b/mail/pmail/pkg-plist @@ -1,157 +1,157 @@ bin/pmail -share/pmail/Base.py -share/pmail/Base.pyc -share/pmail/Base.pyo -share/pmail/MessageList.py -share/pmail/MessageList.pyc -share/pmail/MessageList.pyo -share/pmail/MimeWriter.py -share/pmail/MimeWriter.pyc -share/pmail/MimeWriter.pyo -share/pmail/PmailGtkXmHTML.py -share/pmail/PmailGtkXmHTML.pyc -share/pmail/PmailGtkXmHTML.pyo -share/pmail/_pmailextensionsmodule.so -share/pmail/config/Config.py -share/pmail/config/Config.pyc -share/pmail/config/Config.pyo -share/pmail/config/__init__.py -share/pmail/config/__init__.pyc -share/pmail/config/__init__.pyo -share/pmail/config/paths.py -share/pmail/config/paths.pyc -share/pmail/config/paths.pyo -share/pmail/dumpconfig.py -share/pmail/dumpconfig.pyc -share/pmail/dumpconfig.pyo -share/pmail/gtkf/Compose.py -share/pmail/gtkf/Compose.pyc -share/pmail/gtkf/Compose.pyo -share/pmail/gtkf/FrontEnd.py -share/pmail/gtkf/FrontEnd.pyc -share/pmail/gtkf/FrontEnd.pyo -share/pmail/gtkf/GladeWindow.py -share/pmail/gtkf/GladeWindow.pyc -share/pmail/gtkf/GladeWindow.pyo -share/pmail/gtkf/MainWindow.py -share/pmail/gtkf/MainWindow.pyc -share/pmail/gtkf/MainWindow.pyo -share/pmail/gtkf/MessageList.py -share/pmail/gtkf/MessageList.pyc -share/pmail/gtkf/MessageList.pyo -share/pmail/gtkf/MozillaMsgWindow.py -share/pmail/gtkf/MozillaMsgWindow.pyc -share/pmail/gtkf/MozillaMsgWindow.pyo -share/pmail/gtkf/MsgWindow.py -share/pmail/gtkf/MsgWindow.pyc -share/pmail/gtkf/MsgWindow.pyo -share/pmail/gtkf/Preferences.py -share/pmail/gtkf/Preferences.pyc -share/pmail/gtkf/Preferences.pyo -share/pmail/gtkf/ProgressBar.py -share/pmail/gtkf/ProgressBar.pyc -share/pmail/gtkf/ProgressBar.pyo -share/pmail/gtkf/SMessageWindow.py -share/pmail/gtkf/SMessageWindow.pyc -share/pmail/gtkf/SMessageWindow.pyo -share/pmail/gtkf/SearchMessages.py -share/pmail/gtkf/SearchMessages.pyc -share/pmail/gtkf/SearchMessages.pyo -share/pmail/gtkf/Spell.py -share/pmail/gtkf/Spell.pyc -share/pmail/gtkf/Spell.pyo -share/pmail/gtkf/TextMsgWindow.py -share/pmail/gtkf/TextMsgWindow.pyc -share/pmail/gtkf/TextMsgWindow.pyo -share/pmail/gtkf/TreeWindow.py -share/pmail/gtkf/TreeWindow.pyc -share/pmail/gtkf/TreeWindow.pyo -share/pmail/gtkf/XmHTMLMsgWindow.py -share/pmail/gtkf/XmHTMLMsgWindow.pyc -share/pmail/gtkf/XmHTMLMsgWindow.pyo -share/pmail/gtkf/__init__.py -share/pmail/gtkf/__init__.pyc -share/pmail/gtkf/__init__.pyo -share/pmail/gtkf/all.glade -share/pmail/gtkf/gnomeapp.glade -share/pmail/gtkf/gutil.py -share/pmail/gtkf/gutil.pyc -share/pmail/gtkf/gutil.pyo -share/pmail/gtkf/mygnome.py -share/pmail/gtkf/mygnome.pyc -share/pmail/gtkf/mygnome.pyo -share/pmail/gtkf/update.py -share/pmail/gtkf/update.pyc -share/pmail/gtkf/update.pyo -share/pmail/imaplib.py -share/pmail/imaplib.pyc -share/pmail/imaplib.pyo -share/pmail/mail/IMAP.py -share/pmail/mail/IMAP.pyc -share/pmail/mail/IMAP.pyo -share/pmail/mail/MH.py -share/pmail/mail/MH.pyc -share/pmail/mail/MH.pyo -share/pmail/mail/Mailbox.py -share/pmail/mail/Mailbox.pyc -share/pmail/mail/Mailbox.pyo -share/pmail/mail/Message.py -share/pmail/mail/Message.pyc -share/pmail/mail/Message.pyo -share/pmail/mail/NewMessage.py -share/pmail/mail/NewMessage.pyc -share/pmail/mail/NewMessage.pyo -share/pmail/mail/POP.py -share/pmail/mail/POP.pyc -share/pmail/mail/POP.pyo -share/pmail/mail/Plugin.py -share/pmail/mail/Plugin.pyc -share/pmail/mail/Plugin.pyo -share/pmail/mail/SearchCriteria.py -share/pmail/mail/SearchCriteria.pyc -share/pmail/mail/SearchCriteria.pyo -share/pmail/mail/Source.py -share/pmail/mail/Source.pyc -share/pmail/mail/Source.pyo -share/pmail/mail/SpoolFile.py -share/pmail/mail/SpoolFile.pyc -share/pmail/mail/SpoolFile.pyo -share/pmail/mail/__init__.py -share/pmail/mail/__init__.pyc -share/pmail/mail/__init__.pyo -share/pmail/mail/config_hooks.py -share/pmail/mail/config_hooks.pyc -share/pmail/mail/config_hooks.pyo -share/pmail/mail/pmailmailbox.py -share/pmail/mail/pmailmailbox.pyc -share/pmail/mail/pmailmailbox.pyo -share/pmail/mail/util.py -share/pmail/mail/util.pyc -share/pmail/mail/util.pyo -share/pmail/main.py -share/pmail/main.pyc -share/pmail/main.pyo -share/pmail/plugins/Filters.py -share/pmail/plugins/Filters.pyc -share/pmail/plugins/Filters.pyo -share/pmail/plugins/HtmlViewer.py -share/pmail/plugins/HtmlViewer.pyc -share/pmail/plugins/HtmlViewer.pyo -share/pmail/plugins/__init__.py -share/pmail/plugins/__init__.pyc -share/pmail/plugins/__init__.pyo -share/pmail/plugins/filters.glade -share/pmail/plugins/myf.py -share/pmail/plugins/myf.pyc -share/pmail/plugins/myf.pyo -share/pmail/pmailmimify.py -share/pmail/pmailmimify.pyc -share/pmail/pmailmimify.pyo -share/pmail/posixfile.py -share/pmail/posixfile.pyc -share/pmail/posixfile.pyo -@dirrm share/pmail/plugins -@dirrm share/pmail/mail -@dirrm share/pmail/gtkf -@dirrm share/pmail/config -@dirrm share/pmail +share/gnome/pmail/Base.py +share/gnome/pmail/Base.pyc +share/gnome/pmail/Base.pyo +share/gnome/pmail/MessageList.py +share/gnome/pmail/MessageList.pyc +share/gnome/pmail/MessageList.pyo +share/gnome/pmail/MimeWriter.py +share/gnome/pmail/MimeWriter.pyc +share/gnome/pmail/MimeWriter.pyo +share/gnome/pmail/PmailGtkXmHTML.py +share/gnome/pmail/PmailGtkXmHTML.pyc +share/gnome/pmail/PmailGtkXmHTML.pyo +share/gnome/pmail/_pmailextensionsmodule.so +share/gnome/pmail/config/Config.py +share/gnome/pmail/config/Config.pyc +share/gnome/pmail/config/Config.pyo +share/gnome/pmail/config/__init__.py +share/gnome/pmail/config/__init__.pyc +share/gnome/pmail/config/__init__.pyo +share/gnome/pmail/config/paths.py +share/gnome/pmail/config/paths.pyc +share/gnome/pmail/config/paths.pyo +share/gnome/pmail/dumpconfig.py +share/gnome/pmail/dumpconfig.pyc +share/gnome/pmail/dumpconfig.pyo +share/gnome/pmail/gtkf/Compose.py +share/gnome/pmail/gtkf/Compose.pyc +share/gnome/pmail/gtkf/Compose.pyo +share/gnome/pmail/gtkf/FrontEnd.py +share/gnome/pmail/gtkf/FrontEnd.pyc +share/gnome/pmail/gtkf/FrontEnd.pyo +share/gnome/pmail/gtkf/GladeWindow.py +share/gnome/pmail/gtkf/GladeWindow.pyc +share/gnome/pmail/gtkf/GladeWindow.pyo +share/gnome/pmail/gtkf/MainWindow.py +share/gnome/pmail/gtkf/MainWindow.pyc +share/gnome/pmail/gtkf/MainWindow.pyo +share/gnome/pmail/gtkf/MessageList.py +share/gnome/pmail/gtkf/MessageList.pyc +share/gnome/pmail/gtkf/MessageList.pyo +share/gnome/pmail/gtkf/MozillaMsgWindow.py +share/gnome/pmail/gtkf/MozillaMsgWindow.pyc +share/gnome/pmail/gtkf/MozillaMsgWindow.pyo +share/gnome/pmail/gtkf/MsgWindow.py +share/gnome/pmail/gtkf/MsgWindow.pyc +share/gnome/pmail/gtkf/MsgWindow.pyo +share/gnome/pmail/gtkf/Preferences.py +share/gnome/pmail/gtkf/Preferences.pyc +share/gnome/pmail/gtkf/Preferences.pyo +share/gnome/pmail/gtkf/ProgressBar.py +share/gnome/pmail/gtkf/ProgressBar.pyc +share/gnome/pmail/gtkf/ProgressBar.pyo +share/gnome/pmail/gtkf/SMessageWindow.py +share/gnome/pmail/gtkf/SMessageWindow.pyc +share/gnome/pmail/gtkf/SMessageWindow.pyo +share/gnome/pmail/gtkf/SearchMessages.py +share/gnome/pmail/gtkf/SearchMessages.pyc +share/gnome/pmail/gtkf/SearchMessages.pyo +share/gnome/pmail/gtkf/Spell.py +share/gnome/pmail/gtkf/Spell.pyc +share/gnome/pmail/gtkf/Spell.pyo +share/gnome/pmail/gtkf/TextMsgWindow.py +share/gnome/pmail/gtkf/TextMsgWindow.pyc +share/gnome/pmail/gtkf/TextMsgWindow.pyo +share/gnome/pmail/gtkf/TreeWindow.py +share/gnome/pmail/gtkf/TreeWindow.pyc +share/gnome/pmail/gtkf/TreeWindow.pyo +share/gnome/pmail/gtkf/XmHTMLMsgWindow.py +share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyc +share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyo +share/gnome/pmail/gtkf/__init__.py +share/gnome/pmail/gtkf/__init__.pyc +share/gnome/pmail/gtkf/__init__.pyo +share/gnome/pmail/gtkf/all.glade +share/gnome/pmail/gtkf/gnomeapp.glade +share/gnome/pmail/gtkf/gutil.py +share/gnome/pmail/gtkf/gutil.pyc +share/gnome/pmail/gtkf/gutil.pyo +share/gnome/pmail/gtkf/mygnome.py +share/gnome/pmail/gtkf/mygnome.pyc +share/gnome/pmail/gtkf/mygnome.pyo +share/gnome/pmail/gtkf/update.py +share/gnome/pmail/gtkf/update.pyc +share/gnome/pmail/gtkf/update.pyo +share/gnome/pmail/imaplib.py +share/gnome/pmail/imaplib.pyc +share/gnome/pmail/imaplib.pyo +share/gnome/pmail/mail/IMAP.py +share/gnome/pmail/mail/IMAP.pyc +share/gnome/pmail/mail/IMAP.pyo +share/gnome/pmail/mail/MH.py +share/gnome/pmail/mail/MH.pyc +share/gnome/pmail/mail/MH.pyo +share/gnome/pmail/mail/Mailbox.py +share/gnome/pmail/mail/Mailbox.pyc +share/gnome/pmail/mail/Mailbox.pyo +share/gnome/pmail/mail/Message.py +share/gnome/pmail/mail/Message.pyc +share/gnome/pmail/mail/Message.pyo +share/gnome/pmail/mail/NewMessage.py +share/gnome/pmail/mail/NewMessage.pyc +share/gnome/pmail/mail/NewMessage.pyo +share/gnome/pmail/mail/POP.py +share/gnome/pmail/mail/POP.pyc +share/gnome/pmail/mail/POP.pyo +share/gnome/pmail/mail/Plugin.py +share/gnome/pmail/mail/Plugin.pyc +share/gnome/pmail/mail/Plugin.pyo +share/gnome/pmail/mail/SearchCriteria.py +share/gnome/pmail/mail/SearchCriteria.pyc +share/gnome/pmail/mail/SearchCriteria.pyo +share/gnome/pmail/mail/Source.py +share/gnome/pmail/mail/Source.pyc +share/gnome/pmail/mail/Source.pyo +share/gnome/pmail/mail/SpoolFile.py +share/gnome/pmail/mail/SpoolFile.pyc +share/gnome/pmail/mail/SpoolFile.pyo +share/gnome/pmail/mail/__init__.py +share/gnome/pmail/mail/__init__.pyc +share/gnome/pmail/mail/__init__.pyo +share/gnome/pmail/mail/config_hooks.py +share/gnome/pmail/mail/config_hooks.pyc +share/gnome/pmail/mail/config_hooks.pyo +share/gnome/pmail/mail/pmailmailbox.py +share/gnome/pmail/mail/pmailmailbox.pyc +share/gnome/pmail/mail/pmailmailbox.pyo +share/gnome/pmail/mail/util.py +share/gnome/pmail/mail/util.pyc +share/gnome/pmail/mail/util.pyo +share/gnome/pmail/main.py +share/gnome/pmail/main.pyc +share/gnome/pmail/main.pyo +share/gnome/pmail/plugins/Filters.py +share/gnome/pmail/plugins/Filters.pyc +share/gnome/pmail/plugins/Filters.pyo +share/gnome/pmail/plugins/HtmlViewer.py +share/gnome/pmail/plugins/HtmlViewer.pyc +share/gnome/pmail/plugins/HtmlViewer.pyo +share/gnome/pmail/plugins/__init__.py +share/gnome/pmail/plugins/__init__.pyc +share/gnome/pmail/plugins/__init__.pyo +share/gnome/pmail/plugins/filters.glade +share/gnome/pmail/plugins/myf.py +share/gnome/pmail/plugins/myf.pyc +share/gnome/pmail/plugins/myf.pyo +share/gnome/pmail/pmailmimify.py +share/gnome/pmail/pmailmimify.pyc +share/gnome/pmail/pmailmimify.pyo +share/gnome/pmail/posixfile.py +share/gnome/pmail/posixfile.pyc +share/gnome/pmail/posixfile.pyo +@dirrm share/gnome/pmail/plugins +@dirrm share/gnome/pmail/mail +@dirrm share/gnome/pmail/gtkf +@dirrm share/gnome/pmail/config +@dirrm share/gnome/pmail diff --git a/mail/sonicmail/Makefile b/mail/sonicmail/Makefile index 74e85ad3e819..6c166a89a5d2 100644 --- a/mail/sonicmail/Makefile +++ b/mail/sonicmail/Makefile @@ -12,8 +12,14 @@ MASTER_SITES= http://download.sourceforge.net/sonicmail/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes +USE_GNOME= yes + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/mail/sonicmail/files/patch-aa b/mail/sonicmail/files/patch-aa index d0e58373185e..2986fa716524 100644 --- a/mail/sonicmail/files/patch-aa +++ b/mail/sonicmail/files/patch-aa @@ -6,8 +6,8 @@ # Change these to the default location of the pixmaps/wav files: -XPMSPATH = /usr/share/pixmaps/sonicmail -WAVSPATH = /usr/share/sound/sonicmail -+XPMSPATH = /usr/X11R6/share/pixmaps/sonicmail -+WAVSPATH = /usr/X11R6/share/sound/sonicmail ++XPMSPATH = ${PREFIX}/share/pixmaps/sonicmail ++WAVSPATH = ${PREFIX}/share/sound/sonicmail # Change to 1 to activate debug mode: SONICMAIL_DEBUG = 0 @@ -16,7 +16,7 @@ CFLAGS = -Wall $($(OSTYPE)_Flags) -O2 `gnome-config --cflags applets` $(DEFINES) -LFLAGS = `gnome-config --libs applets` `gtk-config --libs gthread` -lpthread -+LFLAGS = `gnome-config --libs applets` `gtk12-config --libs gthread` ++LFLAGS = `gnome-config --libs applets` `${GTK_CONFIG} --libs gthread` # Define platform specific flags/libraries below: Linux_Flags = -DLINUX diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index eac1ed21e32a..551b74640fb2 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -14,30 +14,22 @@ MASTER_SITE_SUBDIR= stable/sources/gnumeric MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - python:${PORTSDIR}/lang/python -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - python:${PORTSDIR}/lang/python +BUILD_DEPENDS= python:${PORTSDIR}/lang/python +RUN_DEPENDS= python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-guile --without-bonobo +CONFIGURE_ARGS= --with-guile --without-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index eac1ed21e32a..551b74640fb2 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -14,30 +14,22 @@ MASTER_SITE_SUBDIR= stable/sources/gnumeric MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - python:${PORTSDIR}/lang/python -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - python:${PORTSDIR}/lang/python +BUILD_DEPENDS= python:${PORTSDIR}/lang/python +RUN_DEPENDS= python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-guile --without-bonobo +CONFIGURE_ARGS= --with-guile --without-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/math/rcalc/Makefile b/math/rcalc/Makefile index e4b7fd4bdea2..a10d44da8d98 100644 --- a/math/rcalc/Makefile +++ b/math/rcalc/Makefile @@ -14,16 +14,15 @@ DISTNAME= rCalc-${PORTVERSION} MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= 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-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' + .include <bsd.port.mk> diff --git a/math/rcalc/pkg-plist b/math/rcalc/pkg-plist index ace0f118ded6..4087f6c4490d 100644 --- a/math/rcalc/pkg-plist +++ b/math/rcalc/pkg-plist @@ -7,5 +7,3 @@ share/gnome/help/rCalc/C/calculate.png share/gnome/help/rCalc/C/topic.dat @dirrm share/gnome/help/rCalc/C @dirrm share/gnome/help/rCalc -@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true -@unexec rmdir %D/share/gnome/help 2>/dev/null || true diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile index 0fda383d5c4e..917f6d82afc5 100644 --- a/math/scigraphica/Makefile +++ b/math/scigraphica/Makefile @@ -15,23 +15,16 @@ MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= python:${PORTSDIR}/lang/python15 \ ${LOCALBASE}/include/python1.5/Numeric/arrayobject.h:${PORTSDIR}/math/numpy -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtkextra.10:${PORTSDIR}/x11-toolkits/gtkextra \ +LIB_DEPENDS= gtkextra.10:${PORTSDIR}/x11-toolkits/gtkextra \ xml.5:${PORTSDIR}/textproc/libxml -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - python:${PORTSDIR}/lang/python15 \ +RUN_DEPENDS= python:${PORTSDIR}/lang/python15 \ ${LOCALBASE}/include/python1.5/Numeric/arrayobject.h:${PORTSDIR}/math/numpy -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}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: diff --git a/misc/gnomepm/Makefile b/misc/gnomepm/Makefile index f1fe86b9808e..f36637a30e1e 100644 --- a/misc/gnomepm/Makefile +++ b/misc/gnomepm/Makefile @@ -13,22 +13,13 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - ghttp.1:${PORTSDIR}/www/libghttp -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp 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" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile index 0df5ecb28a10..44fcd0b1d123 100644 --- a/misc/gnomeusersguide/Makefile +++ b/misc/gnomeusersguide/Makefile @@ -14,14 +14,10 @@ DISTNAME= users-guide-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index 2b18eb0ab01b..0200e1f452ff 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -14,21 +14,15 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop \ +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -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/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 2b18eb0ab01b..0200e1f452ff 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -14,21 +14,15 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop \ +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -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/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 2b1f8a032240..9277130cfde5 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -6,28 +6,19 @@ # PORTNAME= everybuddy -PORTVERSION= 0.1.4-2 +PORTVERSION= 0.1.4.2 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2/-2/} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes MAN1= everybuddy.1 -post-patch: - @${CP} ${FILESDIR}/config.h ${WRKSRC}/src - .include <bsd.port.mk> diff --git a/net-im/ayttm/files/patch-ae b/net-im/ayttm/files/patch-ae index 4918144ca31d..554421bb9cda 100644 --- a/net-im/ayttm/files/patch-ae +++ b/net-im/ayttm/files/patch-ae @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = ${PREFIX}/share/applnk/Internet ++Utilitiesdir = $(datadir)/apps/Internet Utilities_DATA = Everybuddy.desktop EXTRA_DIST = Everybuddy.desktop diff --git a/net-im/ayttm/files/patch-af b/net-im/ayttm/files/patch-af new file mode 100644 index 000000000000..9380f8dd1e94 --- /dev/null +++ b/net-im/ayttm/files/patch-af @@ -0,0 +1,14 @@ +--- src/config.sh.in.orig Sun Oct 1 23:04:45 2000 ++++ src/config.sh.in Sun Oct 1 23:06:02 2000 +@@ -1,6 +1,6 @@ + #!/bin/sh +-rm config.h >& /dev/null +-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h +-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h +-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h +-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h ++rm config.h 2> /dev/null ++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h ++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h ++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h ++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist index 461b438122d9..519ff0959c11 100644 --- a/net-im/ayttm/pkg-plist +++ b/net-im/ayttm/pkg-plist @@ -1,9 +1,10 @@ bin/everybuddy bin/update.pl bin/contact-update.pl -share/applnk/Internet/Everybuddy.desktop -share/pixmaps/ebicon.xpm -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au +share/gnome/apps/Internet/Everybuddy.desktop +share/gnome/pixmaps/ebicon.xpm +share/gnome/sounds/everybuddy/BuddyArrive.au +share/gnome/sounds/everybuddy/BuddyLeave.au +share/gnome/sounds/everybuddy/Send.au +share/gnome/sounds/everybuddy/Receive.au +@dirrm share/gnome/sounds/everybuddy diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net-im/gnomeicu2/Makefile +++ b/net-im/gnomeicu2/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile index 2b1f8a032240..9277130cfde5 100644 --- a/net/ayttm/Makefile +++ b/net/ayttm/Makefile @@ -6,28 +6,19 @@ # PORTNAME= everybuddy -PORTVERSION= 0.1.4-2 +PORTVERSION= 0.1.4.2 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2/-2/} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes MAN1= everybuddy.1 -post-patch: - @${CP} ${FILESDIR}/config.h ${WRKSRC}/src - .include <bsd.port.mk> diff --git a/net/ayttm/files/patch-ae b/net/ayttm/files/patch-ae index 4918144ca31d..554421bb9cda 100644 --- a/net/ayttm/files/patch-ae +++ b/net/ayttm/files/patch-ae @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = ${PREFIX}/share/applnk/Internet ++Utilitiesdir = $(datadir)/apps/Internet Utilities_DATA = Everybuddy.desktop EXTRA_DIST = Everybuddy.desktop diff --git a/net/ayttm/files/patch-af b/net/ayttm/files/patch-af new file mode 100644 index 000000000000..9380f8dd1e94 --- /dev/null +++ b/net/ayttm/files/patch-af @@ -0,0 +1,14 @@ +--- src/config.sh.in.orig Sun Oct 1 23:04:45 2000 ++++ src/config.sh.in Sun Oct 1 23:06:02 2000 +@@ -1,6 +1,6 @@ + #!/bin/sh +-rm config.h >& /dev/null +-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h +-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h +-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h +-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h ++rm config.h 2> /dev/null ++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h ++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h ++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h ++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist index 461b438122d9..519ff0959c11 100644 --- a/net/ayttm/pkg-plist +++ b/net/ayttm/pkg-plist @@ -1,9 +1,10 @@ bin/everybuddy bin/update.pl bin/contact-update.pl -share/applnk/Internet/Everybuddy.desktop -share/pixmaps/ebicon.xpm -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au +share/gnome/apps/Internet/Everybuddy.desktop +share/gnome/pixmaps/ebicon.xpm +share/gnome/sounds/everybuddy/BuddyArrive.au +share/gnome/sounds/everybuddy/BuddyLeave.au +share/gnome/sounds/everybuddy/Send.au +share/gnome/sounds/everybuddy/Receive.au +@dirrm share/gnome/sounds/everybuddy diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile index 2ef10ab86e72..5285c798b8c2 100644 --- a/net/crescendo/Makefile +++ b/net/crescendo/Makefile @@ -11,21 +11,14 @@ MASTER_SITES= http://crescendo.dpnd.com/files/ MAINTAINER= dirk.meyer@dinoex.sub.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --enable-compile-warnings=yes -CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} +CONFIGURE_ARGS= --enable-compile-warnings=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" CFLAGS+= -g PLIST_SUB= DOCDIR=${DOCDIR} diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile index 2b1f8a032240..9277130cfde5 100644 --- a/net/everybuddy/Makefile +++ b/net/everybuddy/Makefile @@ -6,28 +6,19 @@ # PORTNAME= everybuddy -PORTVERSION= 0.1.4-2 +PORTVERSION= 0.1.4.2 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2/-2/} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes MAN1= everybuddy.1 -post-patch: - @${CP} ${FILESDIR}/config.h ${WRKSRC}/src - .include <bsd.port.mk> diff --git a/net/everybuddy/files/patch-ae b/net/everybuddy/files/patch-ae index 4918144ca31d..554421bb9cda 100644 --- a/net/everybuddy/files/patch-ae +++ b/net/everybuddy/files/patch-ae @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = ${PREFIX}/share/applnk/Internet ++Utilitiesdir = $(datadir)/apps/Internet Utilities_DATA = Everybuddy.desktop EXTRA_DIST = Everybuddy.desktop diff --git a/net/everybuddy/files/patch-af b/net/everybuddy/files/patch-af new file mode 100644 index 000000000000..9380f8dd1e94 --- /dev/null +++ b/net/everybuddy/files/patch-af @@ -0,0 +1,14 @@ +--- src/config.sh.in.orig Sun Oct 1 23:04:45 2000 ++++ src/config.sh.in Sun Oct 1 23:06:02 2000 +@@ -1,6 +1,6 @@ + #!/bin/sh +-rm config.h >& /dev/null +-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h +-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h +-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h +-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h ++rm config.h 2> /dev/null ++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h ++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h ++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h ++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h diff --git a/net/everybuddy/pkg-plist b/net/everybuddy/pkg-plist index 461b438122d9..519ff0959c11 100644 --- a/net/everybuddy/pkg-plist +++ b/net/everybuddy/pkg-plist @@ -1,9 +1,10 @@ bin/everybuddy bin/update.pl bin/contact-update.pl -share/applnk/Internet/Everybuddy.desktop -share/pixmaps/ebicon.xpm -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au +share/gnome/apps/Internet/Everybuddy.desktop +share/gnome/pixmaps/ebicon.xpm +share/gnome/sounds/everybuddy/BuddyArrive.au +share/gnome/sounds/everybuddy/BuddyLeave.au +share/gnome/sounds/everybuddy/Send.au +share/gnome/sounds/everybuddy/Receive.au +@dirrm share/gnome/sounds/everybuddy diff --git a/net/gabber/Makefile b/net/gabber/Makefile index f4311e1d3614..e0e2fd9645b7 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -13,23 +13,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= erich@tacni.net -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \ - gnomemm-1.1.3:${PORTSDIR}/x11-toolkits/gnome-- \ +LIB_DEPENDS= gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- \ + gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \ sigc.1:${PORTSDIR}/devel/libsigc++ \ gnet.0:${PORTSDIR}/net/gnet \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure jabberoo/configure -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ +CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae index 09ef23a237e2..d2b9e22711ba 100644 --- a/net/gabber/files/patch-ae +++ b/net/gabber/files/patch-ae @@ -5,6 +5,6 @@ static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade"; static const char* GABBER_CONFIG = "/Gabber/"; -static const char* GABBER_PIXPATH = "@prefix@/share/pixmaps/gabber/"; -+static const char* GABBER_PIXPATH = "@prefix@/share/gnome/pixmaps/gabber/"; ++static const char* GABBER_PIXPATH = "@datadir@/pixmaps/gabber/"; diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai index 074375922acb..3ff1a30660ca 100644 --- a/net/gabber/files/patch-ai +++ b/net/gabber/files/patch-ai @@ -1,3 +1,9 @@ +--- jabberoo/Makefile.am.orig Wed Sep 13 12:18:07 2000 ++++ jabberoo/Makefile.am Wed Sep 13 12:18:11 2000 +@@ -1,2 +1,2 @@ + EXTRA_DIST = include +-SUBDIRS = expat src test ++SUBDIRS = expat src --- jabberoo/Makefile.in.orig Mon Jul 31 23:38:31 2000 +++ jabberoo/Makefile.in Tue Sep 12 15:00:38 2000 @@ -69,7 +69,7 @@ diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist index 1a74ade0f18a..6490e1ac00d2 100644 --- a/net/gabber/pkg-plist +++ b/net/gabber/pkg-plist @@ -1,19 +1,19 @@ bin/gabber -share/gabber/gabber.glade -share/gabber/glade-delete-user-menu.xpm -share/gabber/glade-delete-user.xpm -share/gabber/glade-edit-user-menu.xpm -share/gabber/glade-edit-user.xpm -share/gabber/glade-gabber-logo.png -share/gabber/glade-message.xpm -share/gabber/glade-new-user-menu.xpm -share/gabber/glade-new-user.xpm -share/gabber/glade-noclose.xpm -share/gabber/glade-ooochat.xpm -share/gabber/glade-s10n.xpm -share/gabber/glade-sendasooo.xpm -share/gabber/glade-users.xpm share/gnome/apps/Internet/gabber.desktop +share/gnome/gabber/gabber.glade +share/gnome/gabber/glade-delete-user-menu.xpm +share/gnome/gabber/glade-delete-user.xpm +share/gnome/gabber/glade-edit-user-menu.xpm +share/gnome/gabber/glade-edit-user.xpm +share/gnome/gabber/glade-gabber-logo.png +share/gnome/gabber/glade-message.xpm +share/gnome/gabber/glade-new-user-menu.xpm +share/gnome/gabber/glade-new-user.xpm +share/gnome/gabber/glade-noclose.xpm +share/gnome/gabber/glade-ooochat.xpm +share/gnome/gabber/glade-s10n.xpm +share/gnome/gabber/glade-sendasooo.xpm +share/gnome/gabber/glade-users.xpm share/gnome/help/gabber/C/agents-available.png share/gnome/help/gabber/C/agents-register.png share/gnome/help/gabber/C/agents.html @@ -84,4 +84,4 @@ share/locale/en_SE/LC_MESSAGES/gabber.mo @dirrm share/gnome/help/gabber/C/stylesheet-images @dirrm share/gnome/help/gabber/C @dirrm share/gnome/help/gabber -@dirrm share/gabber +@dirrm share/gnome/gabber diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile index 15c972b44a2d..ce5e7580d703 100644 --- a/net/gnomba/Makefile +++ b/net/gnomba/Makefile @@ -13,16 +13,21 @@ MASTER_SITES= http://gnomba.darkcorner.net/tars/ \ MAINTAINER= dima@Chg.RU -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' pre-configure: - ${RM} ${WRKSRC}/config.cache + ${RM} ${WRKSRC}/config.cache .include <bsd.port.mk> diff --git a/net/gnomba/files/patch-ac b/net/gnomba/files/patch-ac new file mode 100644 index 000000000000..e56e855838d4 --- /dev/null +++ b/net/gnomba/files/patch-ac @@ -0,0 +1,11 @@ +--- configure.orig Thu Feb 10 01:53:13 2000 ++++ configure Thu Feb 10 01:54:54 2000 +@@ -3440,7 +3440,7 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +-localedir=${datadir}/locale ++localedir=${prefix}/${DATADIRNAME}/locale + + + trap '' 1 2 15 diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile index 695a8408a264..35ae89ec927e 100644 --- a/net/gnometelnet/Makefile +++ b/net/gnometelnet/Makefile @@ -13,23 +13,13 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes USE_GMAKE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile index 2ffd95dfc02e..8c6fadef388e 100644 --- a/net/gnosamba/Makefile +++ b/net/gnosamba/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://www.open-systems.com/gnosamba/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-patch: @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c diff --git a/news/grn/Makefile b/news/grn/Makefile index 1f46e97a30f4..48fe7347c53d 100644 --- a/news/grn/Makefile +++ b/news/grn/Makefile @@ -12,22 +12,23 @@ MASTER_SITES= ftp://ivvs.ul.ru/pub/unix/grn/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libmutt/configure - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - CONFIGURE_ENV= glibpath="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-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 + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/news/pan/Makefile b/news/pan/Makefile index d723ce81558e..2ed18f20f7bf 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -13,23 +13,16 @@ DISTNAME= pan-0.8.1beta6 MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint \ +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ uu.1:${PORTSDIR}/converters/uulib \ unicode.0:${PORTSDIR}/devel/libunicode -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_BZIP2= yes 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -luu" pre-patch: diff --git a/news/pan2/Makefile b/news/pan2/Makefile index d723ce81558e..2ed18f20f7bf 100644 --- a/news/pan2/Makefile +++ b/news/pan2/Makefile @@ -13,23 +13,16 @@ DISTNAME= pan-0.8.1beta6 MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint \ +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ uu.1:${PORTSDIR}/converters/uulib \ unicode.0:${PORTSDIR}/devel/libunicode -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_BZIP2= yes 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -luu" pre-patch: diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index c62eb93bf0dd..8f9b539b787b 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -15,20 +15,14 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOMECTRL= yes USE_LIBTOOL= yes LIBTOOLFILES= configure mal-conduit/configure -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 040ad1ac7e8e..69ec630f4d2e 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -16,23 +16,16 @@ MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - panel_applet.4:${PORTSDIR}/x11/gnomecore \ xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -USE_GMAKE= yes USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile index c62eb93bf0dd..8f9b539b787b 100644 --- a/palm/gnomepilot-conduits/Makefile +++ b/palm/gnomepilot-conduits/Makefile @@ -15,20 +15,14 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOMECTRL= yes USE_LIBTOOL= yes LIBTOOLFILES= configure mal-conduit/configure -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index c62eb93bf0dd..8f9b539b787b 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -15,20 +15,14 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOMECTRL= yes USE_LIBTOOL= yes LIBTOOLFILES= configure mal-conduit/configure -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile index 040ad1ac7e8e..69ec630f4d2e 100644 --- a/palm/gnomepilot/Makefile +++ b/palm/gnomepilot/Makefile @@ -16,23 +16,16 @@ MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - panel_applet.4:${PORTSDIR}/x11/gnomecore \ xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -USE_GMAKE= yes USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index 040ad1ac7e8e..69ec630f4d2e 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -16,23 +16,16 @@ MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob LIB_DEPENDS= pisock.3:${PORTSDIR}/palm/pilot-link \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ - panel_applet.4:${PORTSDIR}/x11/gnomecore \ xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -USE_GMAKE= yes USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ +CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" pre-patch: diff --git a/print/ggv/Makefile b/print/ggv/Makefile index f21026415059..95722aef37bd 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -13,16 +13,12 @@ MASTER_SITE_SUBDIR= stable/sources/ggv MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 USE_X_PREFIX= 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/print/ggv2/Makefile b/print/ggv2/Makefile index f21026415059..95722aef37bd 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -13,16 +13,12 @@ MASTER_SITE_SUBDIR= stable/sources/ggv MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 USE_X_PREFIX= 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/print/gnome-print/Makefile b/print/gnome-print/Makefile index 783c353d3001..0eb21d687089 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -14,24 +14,19 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml \ +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - PLIST_SUB= VERSION=${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes USE_PERL5= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 783c353d3001..0eb21d687089 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -14,24 +14,19 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml \ +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - PLIST_SUB= VERSION=${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes USE_PERL5= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 783c353d3001..0eb21d687089 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -14,24 +14,19 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml \ +RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6 +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - PLIST_SUB= VERSION=${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes USE_PERL5= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 73295781bf61..328b46ab1c27 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= dave@mu.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + MAN1= seahorse.1 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/seahorse ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/doc/seahorse.1 ${PREFIX}/man/man1 +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|datadir\`/gnome/|datadir\`/|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist index c3c50b736daa..f300bb1cd53a 100644 --- a/security/seahorse/pkg-plist +++ b/security/seahorse/pkg-plist @@ -1 +1,18 @@ bin/seahorse +share/gnome/gnome/apps/Applications/seahorse.desktop +share/gnome/gnome/help/seahorse/C/seahorse.html +share/gnome/gnome/help/seahorse/C/topic.dat +share/gnome/gnome/help/seahorse/ja/seahorse.html +share/gnome/gnome/help/seahorse/ja/topic.dat +share/gnome/pixmaps/seahorse/seahorse.png +share/locale/cs/LC_MESSAGES/seahorse.mo +share/locale/da/LC_MESSAGES/seahorse.mo +share/locale/de/LC_MESSAGES/seahorse.mo +share/locale/fi/LC_MESSAGES/seahorse.mo +share/locale/fr/LC_MESSAGES/seahorse.mo +share/locale/ja/LC_MESSAGES/seahorse.mo +share/locale/sv/LC_MESSAGES/seahorse.mo +@dirrm share/gnome/pixmaps/seahorse +@dirrm share/gnome/gnome/help/seahorse/ja +@dirrm share/gnome/gnome/help/seahorse/C +@dirrm share/gnome/gnome/help/seahorse diff --git a/sysutils/battstat-applet/Makefile b/sysutils/battstat-applet/Makefile index bf4352ca8fb1..bbb3eb9d0999 100644 --- a/sysutils/battstat-applet/Makefile +++ b/sysutils/battstat-applet/Makefile @@ -13,14 +13,20 @@ DISTNAME= battstat_applet-${PORTVERSION} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${DISTNAME} -USE_LIBTOOL= yes -USE_GMAKE= yes + USE_X_PREFIX= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/sysutils/battstat-applet/files/patch-aa b/sysutils/battstat-applet/files/patch-aa new file mode 100644 index 000000000000..a1f2957f2b4a --- /dev/null +++ b/sysutils/battstat-applet/files/patch-aa @@ -0,0 +1,22 @@ +--- docs/C/Makefile.in.orig Mon Oct 2 00:34:46 2000 ++++ docs/C/Makefile.in Mon Oct 2 00:37:29 2000 +@@ -310,7 +310,6 @@ + $(distdir)/$(applet)-applet/stylesheet-images + + install-data-am: index.html +- -$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images + -cp $(srcdir)/topic.dat $(DESTDIR)$(helpdir) + -for file in \ + $(applet)-applet/*.html \ +@@ -318,11 +317,6 @@ + $(srcdir)/*.png; do\ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \ +- done +- -for file in \ +- $(applet)-applet/stylesheet-images/*.png; do \ +- basefile=`echo $$file | sed -e 's,^.*/,,'`; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/stylesheet-images/$$basefile; \ + done + + $(applet)-applet.ps: $(srcdir)/$(applet)-applet.sgml $(srcdir)/$(applet).sgml diff --git a/sysutils/battstat-applet/pkg-plist b/sysutils/battstat-applet/pkg-plist index 7265629cd9e6..5c6874f76874 100644 --- a/sysutils/battstat-applet/pkg-plist +++ b/sysutils/battstat-applet/pkg-plist @@ -2,7 +2,6 @@ bin/battstat_applet etc/CORBA/servers/battstat_applet.gnorba etc/sound/events/battstat_applet.soundlist share/gnome/applets/Monitors/battstat_applet.desktop -share/gnome/pixmaps/battstat.png share/gnome/help/battstat_applet/C/appear-hidden.gif share/gnome/help/battstat_applet/C/appear.gif share/gnome/help/battstat_applet/C/bottom.gif @@ -16,4 +15,7 @@ share/gnome/help/battstat_applet/C/square-hidden.gif share/gnome/help/battstat_applet/C/square.gif share/gnome/help/battstat_applet/C/top.gif share/gnome/help/battstat_applet/C/topic.dat -@dirrm share/gnome/help/battstat_applet/C/stylesheet-images +share/gnome/pixmaps/battstat.png +share/locale/sv/LC_MESSAGES/battstat_applet.mo +@dirrm share/gnome/help/battstat_applet/C +@dirrm share/gnome/help/battstat_applet diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 9a123170a119..ba6ab1c4d6b6 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -14,19 +14,14 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 9a123170a119..ba6ab1c4d6b6 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -14,19 +14,14 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index f64df8d8e9b7..021a08da15ca 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -13,17 +13,12 @@ MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= 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/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 9a123170a119..ba6ab1c4d6b6 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -14,19 +14,14 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 9a123170a119..ba6ab1c4d6b6 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -14,19 +14,14 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOMELIBS= 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}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile index 34ea4b7d7159..d32a4e2ef75f 100644 --- a/sysutils/gnomefind/Makefile +++ b/sysutils/gnomefind/Makefile @@ -14,23 +14,14 @@ DISTNAME= gnome-find-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-lgnuregex -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade USE_X_PREFIX= yes USE_XPM= yes +USE_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-lgnuregex -L${LOCALBASE}/lib" MAN1= gnome-find.1 diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index f64df8d8e9b7..021a08da15ca 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -13,17 +13,12 @@ MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= 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/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index f64df8d8e9b7..021a08da15ca 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -13,17 +13,12 @@ MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gtop.1:${PORTSDIR}/devel/libgtop - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= 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/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index 0e434ecf00a1..30610b2172c6 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -13,23 +13,16 @@ MASTER_SITE_SUBDIR= unstable/sources/medusa MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - oaf.0:${PORTSDIR}/devel/oaf \ +LIB_DEPENDS= oaf.0:${PORTSDIR}/devel/oaf \ gnomevfs.0:${PORTSDIR}/devel/gnomevfs \ gconf-1.1:${PORTSDIR}/devel/gconf -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 -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --enable-shared --enable-static +CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile index 4b88115d61fe..2e2f66548c54 100644 --- a/textproc/gtkdiff/Makefile +++ b/textproc/gtkdiff/Makefile @@ -12,20 +12,19 @@ MASTER_SITES= http://www.ainet.or.jp/~inoue/software/gtkdiff/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= gtkdiff.1 +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/textproc/gtkdiff/pkg-plist b/textproc/gtkdiff/pkg-plist index 265405ee8be7..371b3802497a 100644 --- a/textproc/gtkdiff/pkg-plist +++ b/textproc/gtkdiff/pkg-plist @@ -1,8 +1,8 @@ bin/gtkdiff bin/gtkdiff-rcs share/gnome/apps/Utilities/gtkdiff.desktop -share/gtkdiff/gtkdiffrc +share/gnome/gtkdiff/gtkdiffrc share/locale/es/LC_MESSAGES/gtkdiff.mo share/locale/fr/LC_MESSAGES/gtkdiff.mo share/locale/ja/LC_MESSAGES/gtkdiff.mo -@dirrm share/gtkdiff +@dirrm share/gnome/gtkdiff diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 9ccb4144ae17..ec3cff708396 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade +RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded @@ -33,20 +31,15 @@ MOZLIBS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib USE_X_PREFIX= yes USE_NEWGCC= yes +USE_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-mozilla-includes="${MOZHEADERS}" \ + --with-mozilla-libs="${MOZLIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-mozilla-includes="${MOZHEADERS}" \ - --with-mozilla-libs="${MOZLIBS}" -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITH_FULL_MOZILLA) post-extract: diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 9ccb4144ae17..ec3cff708396 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade +RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded @@ -33,20 +31,15 @@ MOZLIBS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib USE_X_PREFIX= yes USE_NEWGCC= yes +USE_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-mozilla-includes="${MOZHEADERS}" \ + --with-mozilla-libs="${MOZLIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-mozilla-includes="${MOZHEADERS}" \ - --with-mozilla-libs="${MOZLIBS}" -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITH_FULL_MOZILLA) post-extract: diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile index 85755fc3873b..ed524a49459c 100644 --- a/www/glibwww/Makefile +++ b/www/glibwww/Makefile @@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR= unstable/sources/glibwww MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - wwwzip.1:${PORTSDIR}/www/libwww - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww USE_X_PREFIX= 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 5ea14ba96d41..f22cebfead84 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -19,18 +19,12 @@ LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ gconf-1.1:${PORTSDIR}/devel/gconf \ pspell.2:${PORTSDIR}/textproc/pspell -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 5ea14ba96d41..f22cebfead84 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -19,18 +19,12 @@ LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ gconf-1.1:${PORTSDIR}/devel/gconf \ pspell.2:${PORTSDIR}/textproc/pspell -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 5ea14ba96d41..f22cebfead84 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -19,18 +19,12 @@ LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ gconf-1.1:${PORTSDIR}/devel/gconf \ pspell.2:${PORTSDIR}/textproc/pspell -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 5ea14ba96d41..f22cebfead84 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -19,18 +19,12 @@ LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ gconf-1.1:${PORTSDIR}/devel/gconf \ pspell.2:${PORTSDIR}/textproc/pspell -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= 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" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/www/peacock/Makefile b/www/peacock/Makefile index f95c8a72ac39..495e2bd2bef4 100644 --- a/www/peacock/Makefile +++ b/www/peacock/Makefile @@ -13,18 +13,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${GTK_CONFIG}" + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 267ee3063df8..82c94f6f4360 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -14,34 +14,21 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - xml.5:${PORTSDIR}/textproc/libxml \ - glade.4:${PORTSDIR}/devel/libglade \ +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \ guile.9:${PORTSDIR}/lang/guile \ wwwcore.1:${PORTSDIR}/www/libwww -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore USE_GMAKE= yes -USE_LIBTOOL= yes USE_X_PREFIX= yes USE_XPM= yes - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --libdir=${PREFIX}/share/gnome +USE_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \ s|\$\(datadir\)/gnome|\$\(datadir\)|g ; \ diff --git a/www/screem/Makefile b/www/screem/Makefile index 267ee3063df8..82c94f6f4360 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -14,34 +14,21 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - xml.5:${PORTSDIR}/textproc/libxml \ - glade.4:${PORTSDIR}/devel/libglade \ +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \ guile.9:${PORTSDIR}/lang/guile \ wwwcore.1:${PORTSDIR}/www/libwww -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore USE_GMAKE= yes -USE_LIBTOOL= yes USE_X_PREFIX= yes USE_XPM= yes - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --libdir=${PREFIX}/share/gnome +USE_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \ s|\$\(datadir\)/gnome|\$\(datadir\)|g ; \ 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> |