Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
author: marcus <marcus@FreeBSD.org> 2006-10-14 08:54:54 +0000
committer: marcus <marcus@FreeBSD.org> 2006-10-14 08:54:54 +0000
commit: 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree: 17937489af4c767844fc63b684ae3e7b31948812 /mail
parent: e959473966b963953d63d5f00fae8751f2decf0f (diff)
download: FreeBSD-ports-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip
FreeBSD-ports-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz
19 files changed, 142 insertions, 56 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index e86f45f..60a9b39 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/balsa/Makefile,v 1.1 2006/03/05 06:57:58 marcus Exp $
+#   $MCom: ports/mail/balsa/Makefile,v 1.7 2006/07/27 17:09:22 mezz Exp $
 #
 
 PORTNAME=	balsa
@@ -23,7 +23,7 @@ LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
@@ -52,7 +52,7 @@ OPTIONS=	LDAP "Enable LDAP support" on \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GPG)
-LIB_DEPENDS+=		gpgme.17:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+=		gpgme.15:${PORTSDIR}/security/gpgme
 CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}/bin/gpgme-config
 .endif
 
@@ -66,7 +66,7 @@ LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--with-gtkspell
 .endif
 
-.if ${PREFIX}==${X11BASE}
+.if ${PREFIX}==${LOCALBASE}
 PLIST_SUB+=	GTKICON="@comment "
 .else
 PLIST_SUB+=	GTKICON=""
@@ -81,7 +81,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
-	@${X11BASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
+	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
 		${PREFIX}/share/gnome/balsa/hicolor
 
 .include <bsd.port.post.mk>
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index fa72e9b..86029ee 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -136,10 +136,6 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_HK/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/omf/balsa
 %%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
@@ -153,3 +149,39 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/balsa/hicolor/16x16
 @dirrm share/gnome/balsa/hicolor
 @dirrm share/gnome/balsa
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index a5c8c97..caa00ee 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -3,10 +3,11 @@
 # Whom:					kwm@rainbow-runner.nl
 #
 # $FreeBSD$
-#
+#    $MCom: ports/mail/contact-lookup-applet/Makefile,v 1.13 2006/09/30 23:58:38 ahze Exp $
 
 PORTNAME=	contact
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 PKGNAMESUFFIX=	-lookup-applet
diff --git a/mail/contact-lookup-applet/files/patch-src_contact-dialog.c b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
new file mode 100644
index 0000000..52ab865
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
@@ -0,0 +1,11 @@
+--- src/contact-dialog.c.orig	Sat Sep 30 19:56:51 2006
++++ src/contact-dialog.c	Sat Sep 30 19:57:14 2006
+@@ -260,7 +260,7 @@
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-      if (!gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL)) {
++      if (!gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL)) {
+         gtk_widget_hide (photo_frame);
+       } else if( (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL ) {
+         GdkPixbuf *tmp;
diff --git a/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
new file mode 100644
index 0000000..2ce6c8e
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
@@ -0,0 +1,13 @@
+--- src/e-contact-entry.c.orig	Sat Sep 30 19:54:33 2006
++++ src/e-contact-entry.c	Sat Sep 30 19:56:09 2006
+@@ -261,8 +261,8 @@
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
++      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
++			      photo->data.inlined.length, NULL))
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
index 21f5ef3..7c6a886 100644
--- a/mail/contact-lookup-applet/pkg-plist
+++ b/mail/contact-lookup-applet/pkg-plist
@@ -31,7 +31,25 @@ share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
 @dirrm share/gnome/lookup-applet
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index 6457613..aed7a9e 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION=	0.94.1
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/downloads/src/
 PKGNAMEPREFIX?=	thunderbird-
@@ -33,13 +34,12 @@ GECKO_PORTDIR=	www/${GECKO}
 GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
 WRKSRC=		${WRKDIR}/mozilla
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4+
 USE_GNOME=	gtk20 libidl desktopfileutils
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-CFLAGS+=	-I${X11BASE}/include
+CFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
 
 XPI_FILE=	${DISTNAME}-${GECKO}-freebsd-${ARCH}.xpi
 PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 7a719a8..ecd5167 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION?=	0.93.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	mail security
 MASTER_SITES=	\
 		http://mozdev.secsup.org/enigmail/src/ \
@@ -34,7 +34,6 @@ RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 
 IPCVERSION?=	1.1.3
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libidl
 
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 79409eb..342e67e 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution-sharp
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
@@ -28,8 +29,9 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD}  's|evolution-shell-2.2|evolution-shell-2.6|g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD}  's|eshellver="2.6"|eshellver="2.8"|g ; \
+		s|evolution-shell-2.6|evolution-shell-2.8|g' \
+			${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|.@EBOOK_SOVERSION@||g ; \
 		s|.@ECAL_SOVERSION@||g ; \
 		s|.@EDS_SOVERSION@||g' \
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 122062a..56a0086 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnubiff
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,6 @@ COMMENT=	A mail notification program for Gnome
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_X_PREFIX=	yes
 USE_GNOME=	intlhack libglade2 esound
 USE_GMAKE=	yes
 USE_FAM=	yes
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 3472a48..07d5924 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -30,10 +30,13 @@ bin/gnubiff
 %%SHAREDIR%%/pixmaps/gnubiff.png
 %%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server
 %%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
-@dirrmtry share/locale/fr_CA/LC_MESSAGES
-@dirrmtry share/locale/fr_CA
 @dirrmtry %%BONOBODIR%%/servers
 @dirrmtry %%BONOBODIR%%
 @dirrmtry %%SHAREDIR%%/gnome-2.0/ui
 @dirrmtry %%SHAREDIR%%/gnome-2.0
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fr_CA/LC_MESSAGES
+@dirrmtry share/locale/fr_CA
 @dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 5dcb946..c0d382f 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mail-notification
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	mailnotify
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A mail notification for freedesktop.org-compliant system trays
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack eel2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -67,9 +68,9 @@ PLIST_SUB+=	GMAIL=""
 CONFIGURE_ARGS+=--disable-evolution
 PLIST_SUB+=	EVOLUTION="@comment "
 .else
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-PLIST_SUB+=	EVOLUTION="" LITERAL_PREFIX="${PREFIX}"
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+PLIST_SUB+=	EVOLUTION=""
 .endif
 .if defined(WITHOUT_SYLPHEED)
 CONFIGURE_ARGS+=--disable-sylpheed
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index a5a268d..052b499 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -30,12 +30,10 @@ share/locale/ru/LC_MESSAGES/mail-notification.mo
 share/locale/sr/LC_MESSAGES/mail-notification.mo
 share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
 share/locale/sv/LC_MESSAGES/mail-notification.mo
-%%EVOLUTION%%@cwd %%X11BASE%%
 %%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.a
 %%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.la
 %%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.so
 %%EVOLUTION%%lib/evolution/2.6/plugins/org-gnome-mail-notification.eplug
-%%EVOLUTION%%@cwd %%LITERAL_PREFIX%%
 @dirrm share/gnome/omf/mail-notification
 @dirrm share/gnome/mail-notification/ui
 @dirrm share/gnome/mail-notification
@@ -43,3 +41,11 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
 @dirrm share/gnome/help/mail-notification/C
 @dirrm share/gnome/help/mail-notification
 @dirrmtry etc/xdg/autostart
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index 8fb9ed0..0ed0f8e 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mboxcheck-applet
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://perso.orange.fr/seb128/fichiers/
 
@@ -15,20 +15,20 @@ COMMENT=	Mailbox checking applet for GNOME 2
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
 do-patch:
 	@${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/*.py
-	@${REINPLACE_CMD} 's|/usr/share/pixmaps/|${X11BASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
-	@${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${X11BASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
+	@${REINPLACE_CMD} 's|/usr/share/pixmaps/|${LOCALBASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
+	@${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${LOCALBASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
 	@${REINPLACE_CMD} 's|mbox.png|mboxcheck.png|' ${WRKSRC}/GNOME_MboxCheck.server
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${X11BASE}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${X11BASE}/libexec
-	${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${X11BASE}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${X11BASE}/libdata/bonobo/servers
+	${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${LOCALBASE}/libexec
+	${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${LOCALBASE}/libexec
+	${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${LOCALBASE}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${LOCALBASE}/libdata/bonobo/servers
 
 .include <bsd.port.mk>
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index 91f6c1d..8c0ea2a 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moztraybiff
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,9 +16,9 @@ DISTNAME=	mozTrayBiff-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	New mail tray icon for Thunderbird
 
-BUILD_DEPENDS=	${X11BASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \
+BUILD_DEPENDS=	${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \
 		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	${X11BASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS=	${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird
 
 .if !exists(../thunderbird/Makefile)
 BROKEN=		${PORTNAME} needs the Thunderbird port in order to build
@@ -26,7 +26,7 @@ BROKEN=		${PORTNAME} needs the Thunderbird port in order to build
 TBVER!=		cd ../thunderbird && ${MAKE} -V PORTVERSION
 .endif
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnome
 MAKE_ARGS+=	MOZILLA_PLATFORM=tbird TBVER=${TBVER} MOZ_TRUNK=0
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 2ce8f26..f5769a4 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird-dictionaries
 PORTVERSION=	20060220
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	dictionaries
@@ -17,9 +18,8 @@ DIST_SUBDIR=	thunderbird
 MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	Dictionaries for Mozilla Thunderbird
 
-RUN_DEPENDS=	${X11BASE}/bin/thunderbird:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS=	thunderbird:${PORTSDIR}/mail/thunderbird
 
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 9745368..3ba3f75 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -3,13 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+#    $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
 #
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.7
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
@@ -22,7 +23,6 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 CFLAGS+=	-I${X11BASE}/include
 
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
 MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
+		--enable-application=mail --enable-official-branding
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 MOZ_EXPORT=	MOZ_THUNDERBIRD=1
 
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 OPTIONS=
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
 
 .if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
 IGNORE=	core dumps at runtime
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 9745368..3ba3f75 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,13 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+#    $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
 #
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.7
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
@@ -22,7 +23,6 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 CFLAGS+=	-I${X11BASE}/include
 
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
 MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
+		--enable-application=mail --enable-official-branding
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 MOZ_EXPORT=	MOZ_THUNDERBIRD=1
 
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 OPTIONS=
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
 
 .if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
 IGNORE=	core dumps at runtime
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 9745368..3ba3f75 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -3,13 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+#    $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
 #
 
 PORTNAME=	thunderbird
 DISTVERSION=	1.5.0.7
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
@@ -22,7 +23,6 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4+
 CFLAGS+=	-I${X11BASE}/include
 
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
 MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
-		--enable-application=mail -enable-official-branding
+		--enable-application=mail --enable-official-branding
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 MOZ_EXPORT=	MOZ_THUNDERBIRD=1
 
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 OPTIONS=
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
 
 .if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
 IGNORE=	core dumps at runtime
author	marcus <marcus@FreeBSD.org>	2006-10-14 08:54:54 +0000
committer	marcus <marcus@FreeBSD.org>	2006-10-14 08:54:54 +0000
commit	0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree	17937489af4c767844fc63b684ae3e7b31948812 /mail
parent	e959473966b963953d63d5f00fae8751f2decf0f (diff)
download	FreeBSD-ports-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip FreeBSD-ports-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz