diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /deskutils | |
parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'deskutils')
49 files changed, 69 insertions, 87 deletions
diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index 151d6639265a..70e028cfd4af 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -7,7 +7,7 @@ PORTNAME= aspostit PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/aspostit @@ -17,8 +17,7 @@ COMMENT= An AfterStep dockable version of XPostIt LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg/ -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xaw xext x11 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile index 25f08511876a..5425c5080a3d 100644 --- a/deskutils/babytrans/Makefile +++ b/deskutils/babytrans/Makefile @@ -8,7 +8,7 @@ PORTNAME= babytrans PORTVERSION= 0.9.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils MASTER_SITES= http://fjolliton.free.fr/babytrans/ @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+/GNOME front-end for Babylon Translator .dic files USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gtk12 gnomehack gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile index f632165f8cbd..d9bff9247504 100644 --- a/deskutils/chmsee/Makefile +++ b/deskutils/chmsee/Makefile @@ -7,7 +7,7 @@ PORTNAME= chmsee PORTVERSION= 0.9.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://chmsee.gro.clinux.org/ @@ -22,7 +22,6 @@ USE_GNOME= gtk20 libglade2 gnomeprefix gnomehack libgnome WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_BZIP2= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index d7a2cea809eb..00f545d6bda7 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -8,6 +8,7 @@ PORTNAME= deskbar-applet PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-e USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack USE_PYTHON= yes USE_GMAKE= yes diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile index e5700fb5f3d6..611902a2836e 100644 --- a/deskutils/dlume/Makefile +++ b/deskutils/dlume/Makefile @@ -7,14 +7,13 @@ PORTNAME= dlume PORTVERSION= 0.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils gnome MASTER_SITES= http://clay.ll.pl/download/ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2 address book -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile index 797f3f5194c3..5bcfda189006 100644 --- a/deskutils/dragstack/Makefile +++ b/deskutils/dragstack/Makefile @@ -17,7 +17,7 @@ COMMENT= Drop stack applet for KDE USE_AUTOTOOLS= libtool:15 USE_KDEBASE_VER= 3 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index e08023336f7e..b8cad0d66c2a 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-jescs PORTVERSION= 2.22 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile index 0fe1457c27bb..2455d55ce2c8 100644 --- a/deskutils/gdeskcal-skins/Makefile +++ b/deskutils/gdeskcal-skins/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdeskcal-skins PORTVERSION= 0.56 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/skins/gdeskcal/ DISTNAME= @@ -33,7 +33,6 @@ COMMENT= Skins for gdeskcal RUN_DEPENDS= gdeskcal:${PORTSDIR}/deskutils/gdeskcal USE_PYTHON= yes -USE_XLIB= yes USE_GNOME= gnomeprefix NO_BUILD= yes diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile index 971c5908869f..8e3806bd1541 100644 --- a/deskutils/gdesklets-recentlyused/Makefile +++ b/deskutils/gdesklets-recentlyused/Makefile @@ -7,7 +7,7 @@ PORTNAME= recentlyused PORTVERSION= 0.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +19,6 @@ COMMENT= A toolbar for the most recently used items from ~/.recently-used RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets USE_PYTHON= yes -USE_XLIB= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile index 953cc95346b8..da24bfd283d6 100644 --- a/deskutils/gdesklets-starterbar/Makefile +++ b/deskutils/gdesklets-starterbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= starterbar PORTVERSION= 0.31.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -21,7 +21,6 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \ USE_BZIP2= yes USE_PYTHON= yes -USE_XLIB= yes NAME= StarterBar DATADIR= ${PREFIX}/share diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile index fe42b7931f84..d4b124ab6d56 100644 --- a/deskutils/gdesklets/Makefile +++ b/deskutils/gdesklets/Makefile @@ -40,8 +40,8 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-install: @${MKDIR} ${PREFIX}/share/gdesklets/Displays diff --git a/deskutils/gkrellm-gtodo/Makefile b/deskutils/gkrellm-gtodo/Makefile index 9a54796788ef..0da9fd6eae2b 100644 --- a/deskutils/gkrellm-gtodo/Makefile +++ b/deskutils/gkrellm-gtodo/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-0.2.5a MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that tracks tasks and to-do items -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile index eaffaa46a6ba..6980eeaf13f7 100644 --- a/deskutils/gkrellm-reminder2/Makefile +++ b/deskutils/gkrellm-reminder2/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that reminds you of important events -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/deskutils/gkrellm-timers/Makefile b/deskutils/gkrellm-timers/Makefile index c30f4f1a153e..8f6dfd81e176 100644 --- a/deskutils/gkrellm-timers/Makefile +++ b/deskutils/gkrellm-timers/Makefile @@ -17,7 +17,7 @@ DISTNAME= gkrellm_${PORTNAME}-${PORTVERSION} MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that allows the setting of countdowns -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile index 6ae7f4f12914..98736a9a3500 100644 --- a/deskutils/gnome-menu-editor/Makefile +++ b/deskutils/gnome-menu-editor/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-menu-editor PORTVERSION= 0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MASTER_SITES= http://manny.cluecoder.org/packages/gnome-menu-editor/ @@ -18,7 +18,6 @@ COMMENT= Simple menu editor for Gnome USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomemenus intlhack gtk20 gnomevfs2 USE_GETTEXT= yes -USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index 49d5e6398035..6b9c6adfe3b0 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-pim PORTVERSION= 1.4.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://www.jroger.in-berlin.de/gnome-pim/ DIST_SUBDIR= gnome @@ -15,7 +15,6 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome pim package -USE_X_PREFIX= yes USE_BISON= build USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index ab15858fda36..570a167f640b 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-utils PORTVERSION= 2.20.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,7 +22,6 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile index 9b027df63a55..c8f8abc804d9 100644 --- a/deskutils/gnotime/Makefile +++ b/deskutils/gnotime/Makefile @@ -8,10 +8,9 @@ PORTNAME= gnotime PORTVERSION= 2.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gttr +MASTER_SITES= SF/gttr MAINTAINER= ports@FreeBSD.org COMMENT= GnoTime is a time tracker for gnome2 @@ -21,7 +20,6 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnomeprefix intlhack gtkhtml3 libgnomeui USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile index b4403c9989c7..033dabe34168 100644 --- a/deskutils/gourmet/Makefile +++ b/deskutils/gourmet/Makefile @@ -7,10 +7,9 @@ PORTNAME= gourmet PORTVERSION= 0.11.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= grecipe-manager +MASTER_SITES= SF/grecipe-manager MAINTAINER= ahze@FreeBSD.org COMMENT= GNOME recipe manager @@ -19,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py ${PYTHON_SITELIBDIR}/PyRTF/__init__.py:${PORTSDIR}/print/py-rtf \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -USE_X_PREFIX= yes USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile index 4647adc301fd..6d8a26483edc 100644 --- a/deskutils/griffith/Makefile +++ b/deskutils/griffith/Makefile @@ -31,6 +31,6 @@ post-patch: @${FIND} ${WRKSRC}/ -name Makefile |\ ${XARGS} ${REINPLACE_CMD} -e '/^PREFIX/d' -e '/^MANDIR/s|=.*|=${MANPREFIX}/man|' @${REINPLACE_CMD} -e '/^LANGUAGES=/s|find.*|cd i18n/\&\&ls -d *)|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/share/fonts|${X11BASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME} + @${REINPLACE_CMD} -e 's|/usr/share/fonts|${LOCALBASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME} .include <bsd.port.mk> diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile index cced0855c186..bf65926b9182 100644 --- a/deskutils/gtodo/Makefile +++ b/deskutils/gtodo/Makefile @@ -7,17 +7,15 @@ PORTNAME= gtodo PORTVERSION= 0.14 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtodo +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An Gtk2 Todo list manager USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnometarget gnomevfs2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile index 630517a34e47..01219742301e 100644 --- a/deskutils/gtweakui/Makefile +++ b/deskutils/gtweakui/Makefile @@ -7,16 +7,14 @@ PORTNAME= gTweakUI PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtweakui +MASTER_SITES= SF/gtweakui DIST_SUBDIR= gnome2 MAINTAINER= ports@FreeBSD.org COMMENT= A collection of simple dialogs as a front end to GConf -USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix libgnomeui gconf2 libglade2 intlhack USE_GMAKE= yes diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index da068b27043c..eab11b53f36c 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -8,6 +8,7 @@ PORTNAME= gucharmap PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +20,6 @@ LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 WANT_GNOME= yes diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile index e2cf55c87ac4..c4ff467978bd 100644 --- a/deskutils/karamba/Makefile +++ b/deskutils/karamba/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../comms/kallers/files/patch-configure USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile index c50bf170b6cf..f9d849754b3b 100644 --- a/deskutils/kbirthday/Makefile +++ b/deskutils/kbirthday/Makefile @@ -17,7 +17,7 @@ COMMENT= KDE kicker-applet that reminds you of birthdays and anniversaries USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_KDELIBS_VER=3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes # may or may not solve the alpha compilation issue.... CONFIGURE_ARGS= --with-pic diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index fe264f83e084..5a11037ec812 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index fe264f83e084..5a11037ec812 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile index 232a7aae59d3..4e52f99dfad3 100644 --- a/deskutils/mdh/Makefile +++ b/deskutils/mdh/Makefile @@ -7,7 +7,7 @@ PORTNAME= mdh PORTVERSION= 1.9.59 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gozer.org/my_stuff/gtk/gtk/mdh/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2-based toolbar, like a smaller GNOME panel USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile index 642af1eea824..79a051f3cd97 100644 --- a/deskutils/multi-backgrounds-daemon/Makefile +++ b/deskutils/multi-backgrounds-daemon/Makefile @@ -6,14 +6,13 @@ PORTNAME= multi-backgrounds-daemon PORTVERSION= 0.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://jeanschu.free.fr/multi-backgrounds-daemon/ MAINTAINER= ports@FreeBSD.org COMMENT= Change your GNOME2 backgound when you switch to other workspace -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui libwnck diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile index eb1cd9625e36..d657ca528778 100644 --- a/deskutils/nautilus-actions/Makefile +++ b/deskutils/nautilus-actions/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-actions PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ftp://ftp2.grumz.net/grumz/ @@ -21,7 +22,6 @@ USE_GETTEXT= yes USE_GNOME= nautilus2 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes -USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0 diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index 43eccc8f39c9..9f3c577c1dc3 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -20,8 +20,8 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GNOME= nautilus2 PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ - LDFLASG="-L${LOCALBASE}/lib -L${X11BASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ + LDFLASG="-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \ LIBS="-lssl" PLIST_FILES= lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \ lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \ diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile index 8da39977b451..7d2855c97459 100644 --- a/deskutils/nautilus-open-terminal/Makefile +++ b/deskutils/nautilus-open-terminal/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-open-terminal PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -20,7 +21,6 @@ GNU_CONFIGURE= yes USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= nautilus-open-terminal.schemas diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index 04998fd5ce74..d32cbd9f6cb4 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus-sendto PORTVERSION= 0.14.0 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -19,7 +20,6 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution MAN1= nautilus-sendto.1 GCONF_SCHEMAS= nst.schemas USE_BZIP2= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index b375d8ac6073..32e0d2ef4071 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -7,7 +7,7 @@ PORTNAME= notification-daemon PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/ @@ -19,8 +19,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck USE_GMAKE= yes -USE_XLIB= yes USE_GETTEXT= yes +USE_XORG= x11 xt sm ice xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile index 905fc5a5f302..eef5dceab0d9 100644 --- a/deskutils/plan/files/patch-Makefile +++ b/deskutils/plan/files/patch-Makefile @@ -64,7 +64,7 @@ NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -+FBSD_C = -ansi -I$(X11BASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ ++FBSD_C = -ansi -I$(LOCALBASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -DSTDLIBMALLOC @@ -76,9 +76,9 @@ -FBSD_L2 = -L/usr/X11R6/lib -lc -OBSD_L1 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11 -OBSD_L2 = -lc -+FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++FBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +FBSD_L2 = -+OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++OBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +OBSD_L2 = LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc @@ -106,11 +106,11 @@ SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure -LDIR = /usr/X11R6/lib -+LDIR = $(X11BASE)/lib ++LDIR = $(LOCALBASE)/lib BINDIR = plan-$(VERSION) gMYCC = gcc -gCF = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -+gCF = -I$(X11BASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ++gCF = -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11 gL2F = -lc - + diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 7cc2e8779730..951e8caa6169 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -8,7 +8,7 @@ PORTNAME= planner PORTVERSION= 0.14.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.14 @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Project management application for GNOME 2 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \ libgsf desktopfileutils diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile index 7d271ffd476d..22663b79327d 100644 --- a/deskutils/pypanel/Makefile +++ b/deskutils/pypanel/Makefile @@ -32,7 +32,7 @@ post-patch: @${REINPLACE_CMD} -e \ 's|/usr/bin/freetype-config|${LOCALBASE}/bin/freetype-config|; \ s|/usr/bin/imlib2-config|${LOCALBASE}/bin/imlib2-config|; \ - s|/usr/X11R6/include|${X11BASE}/include|; \ + s|/usr/X11R6/include|${LOCALBASE}/include|; \ s|"COPYING", "README", ||' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \ ${WRKSRC}/setup.py ${WRKSRC}/pypanel diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index fe264f83e084..5a11037ec812 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/tagutils/Makefile b/deskutils/tagutils/Makefile index 6d6c5118fa4a..5e7fd62a7921 100644 --- a/deskutils/tagutils/Makefile +++ b/deskutils/tagutils/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= leaftag.0:${PORTSDIR}/devel/libleaftag USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index 19b0e137fca4..90a39110732f 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -34,7 +34,6 @@ USE_AUTOTOOLS= autoconf:261:env automake:19:env libtool:15:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile index 5f60a1226af2..65c356a7f617 100644 --- a/deskutils/tpb/Makefile +++ b/deskutils/tpb/Makefile @@ -38,7 +38,7 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/cfg.h \ ${WRKSRC}/man/tpb.1 diff --git a/deskutils/tpb/files/patch-man-tpb.1 b/deskutils/tpb/files/patch-man-tpb.1 index 5ac30a63c94f..ba4e90938204 100644 --- a/deskutils/tpb/files/patch-man-tpb.1 +++ b/deskutils/tpb/files/patch-man-tpb.1 @@ -43,7 +43,7 @@ This program was developed on a Thinkpad Model T21. .SH EXAMPLE -tpb \-\-osd=off \-\-verbose \-\-thinkpad="xterm \-T ntpctl \-e ntpctl" -+tpb \-\-osd=off \-\-verbose \-\-thinkpad="%%X11BASE%%/bin/xterm" ++tpb \-\-osd=off \-\-verbose \-\-thinkpad="%%LOCALBASE%%/bin/xterm" .SH COPYRIGHT Copyright 2002-2005, Markus Braun <markus.braun@krawel.de> .PP diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile index 36562d6e9e6f..245e08b2b650 100644 --- a/deskutils/tuxcards/Makefile +++ b/deskutils/tuxcards/Makefile @@ -23,10 +23,10 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" .include <bsd.port.pre.mk> # Add this condititonal while people might still have old versions -# of qmake, living in X11BASE, installed. This should go away eventually. +# of qmake, living in LOCALBASE, installed. This should go away eventually. -.if exists(${X11BASE}/share/qt/mkspecs/freebsd-g++) -QMAKESPEC= ${X11BASE}/share/qt/mkspecs/freebsd-g++ +.if exists(${LOCALBASE}/share/qt/mkspecs/freebsd-g++) +QMAKESPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .else QMAKESPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .endif diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 631165ef63cf..53d4747c9566 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -29,7 +29,7 @@ post-patch: ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero @${ECHO_MSG} removing unneccessary DependTarget from Imakefile-s ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl' .include <bsd.port.mk> diff --git a/deskutils/xmdiary/files/patch-ab b/deskutils/xmdiary/files/patch-ab index 9a3f20c9cfc3..1f28e76a4b70 100644 --- a/deskutils/xmdiary/files/patch-ab +++ b/deskutils/xmdiary/files/patch-ab @@ -17,10 +17,10 @@ -XDDATADIR = /usr/local/lib/xdiary -XDAPPDIR = /usr/lib/X11/app-defaults -XDMANDIR = /usr/local/man/man1 -+XDEXEDIR = $(X11BASE)/bin -+XDDATADIR = $(X11BASE)/lib/X11/xdiary -+XDAPPDIR = $(X11BASE)/lib/X11/app-defaults -+XDMANDIR = $(X11BASE)/man/man1 ++XDEXEDIR = $(LOCALBASE)/bin ++XDDATADIR = $(LOCALBASE)/lib/X11/xdiary ++XDAPPDIR = $(LOCALBASE)/lib/X11/app-defaults ++XDMANDIR = $(LOCALBASE)/man/man1 /*---------------------------------------------------------------------------- diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile index a2765cbba566..6789bf023cf1 100644 --- a/deskutils/xopps/Makefile +++ b/deskutils/xopps/Makefile @@ -7,7 +7,7 @@ PORTNAME= xopps PORTVERSION= 1.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://cvsup.theplanet.com/distfiles/ \ http://dl.droso.net/ports/ @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A tool which lets you draw Gantt charts ALL_TARGET= -USE_X_PREFIX= yes USE_MOTIF= yes MAKE_ENV= 'MACH=${OPSYS}' diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa index e825439457a3..f95ce7bbf404 100644 --- a/deskutils/xopps/files/patch-aa +++ b/deskutils/xopps/files/patch-aa @@ -62,7 +62,7 @@ -LIBS = -lXm -lXt -lX11 -SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib +LIBS = -lXm -lXext -lXt -lX11 ${MOTIFLIB} -+LIBS+= -Wl,-rpath,$(X11BASE)/lib ++LIBS+= -Wl,-rpath,$(LOCALBASE)/lib +#SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH) diff --git a/deskutils/xopps/files/patch-ab b/deskutils/xopps/files/patch-ab index 4d172926dd6c..b47c6c81902d 100644 --- a/deskutils/xopps/files/patch-ab +++ b/deskutils/xopps/files/patch-ab @@ -14,8 +14,8 @@ -MACHINCLPATH = -I/SFOC/$(SFOCVER)/include/$(MACH) -I/usr/5include -MACHLIBPATH = -L/usr/5lib +MACHDEFS = -ansi -fsigned-char -+MACHINCLPATH = -I$(X11BASE)/include -+MACHLIBPATH = -L$(X11BASE)/lib ++MACHINCLPATH = -I$(LOCALBASE)/include ++MACHLIBPATH = -L$(LOCALBASE)/lib MACHLIBS = MACHLIBS_SYBCL = -lsybdb -lcs -lct -lcomn -ltcl -lintl -linsck -lm diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index 843ad00c21f1..ec9853d1aa77 100644 --- a/deskutils/xpad/Makefile +++ b/deskutils/xpad/Makefile @@ -7,15 +7,16 @@ PORTNAME= xpad PORTVERSION= 2.14 +PORTREVISION= 1 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= amyfoub@gmail.com COMMENT= A virtual note-pad system for your X11 desktop USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= x11 sm USE_GNOME= pkgconfig gtk20 gnomehier intltool GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ |