- 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)
author: miwi <miwi@FreeBSD.org> 2008-04-20 01:56:05 +0800
committer: miwi <miwi@FreeBSD.org> 2008-04-20 01:56:05 +0800
commit: bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch)
tree: f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /mail
parent: 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff)
download: freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz
freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst
freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip
60 files changed, 101 insertions, 128 deletions
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 5c94da6ef374..b409a2dacec2 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -7,22 +7,21 @@
 
 PORTNAME=	asmail
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmail/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Biff-type program, designed to match AfterStep
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shaping \
 		--with-xpm \
-		--with-xpm-includes=${X11BASE}/include \
-		--with-xpm-library=${X11BASE}/lib
+		--with-xpm-includes=${LOCALBASE}/include \
+		--with-xpm-library=${LOCALBASE}/lib
 
 MAN1=	asmail.1x
 MAN5=	asmailrc.5x
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 1208a0d106c7..d7c044234d1a 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -23,7 +23,6 @@ LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
@@ -32,7 +31,6 @@ USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \
 		libgnomeprintui
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libltdl:15
-USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--enable-threads \
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index a1dadf3a5f90..d3a0c449aa58 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -51,7 +51,7 @@ CONFIGURE_ARGS=	\
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	ALL		"Enable all options except GNUTLS."			off \
diff --git a/mail/coolmail/files/patch-aa b/mail/coolmail/files/patch-aa
index 62e88e6d91db..4600d9ee82ec 100644
--- a/mail/coolmail/files/patch-aa
+++ b/mail/coolmail/files/patch-aa
@@ -9,8 +9,8 @@
  LINK     = $(CC)
 -INCLUDES = -I/usr/X11R5/include
 -LIB_DIRS = -L/usr/X11R5/lib
-+INCLUDES = -I$(X11BASE)/include
-+LIB_DIRS = -L$(X11BASE)/lib
++INCLUDES = -I$(LOCALBASE)/include
++LIB_DIRS = -L$(LOCALBASE)/lib
  BINDIR   = /usr/local/bin
  MANDIR   = /usr/local/man/man1
  
@@ -32,7 +32,7 @@
  
  LIBS  = $(LIB_DIRS) -lXt -lX11 -lm -lXext
 -COPTS = $(CFLAGS) $(AUDIO)
-+LIBS += -Wl,-rpath,$(X11BASE)/lib
++LIBS += -Wl,-rpath,$(LOCALBASE)/lib
 +COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR)
  
  all: coolmail
diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile
index 35ee86e96296..e0b534abaa73 100644
--- a/mail/dsbl-testers/Makefile
+++ b/mail/dsbl-testers/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
 		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
 
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 3c0301dc847b..bd365af25144 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -97,7 +97,7 @@ USE_AUTOTOOLS=	libtool:15
 .ifdef(SNAP_DATE)
 USE_AUTOTOOLS+=	autoconf:261:env automake:19
 .endif
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index 318348e7a684..d30b496630b4 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION=	0.95.6
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/download/source/
 PKGNAMEPREFIX?=	thunderbird-
@@ -19,8 +20,7 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		nspr4:${PORTSDIR}/devel/nspr \
-		nss3:${PORTSDIR}/security/nss \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+		nss3:${PORTSDIR}/security/nss
 RUN_DEPENDS=	${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gpg:${PORTSDIR}/security/gnupg
 
@@ -34,11 +34,11 @@ GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
 WRKSRC=		${WRKDIR}/mozilla
 
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gtk20 libidl desktopfileutils
+USE_XORG=	xft xt x11
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-CFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 
 XPI_FILE=	${DISTNAME}-${GECKO}-freebsd-${ARCH}.xpi
 PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index f5bb2fb5d1e1..389e133c17f6 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +22,6 @@ RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BDB=	41
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index c566a94ffdb0..39c4ad548cf9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.22.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,7 +24,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack
 USE_AUTOTOOLS=	libtool:15
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index afa787de8fb9..bee87b46e68c 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -47,7 +47,7 @@ WITH_EXIMON=	yes
 .endif
 
 .if defined(WITH_EXIMON)
-USE_XLIB=	yes
+USE_XORG=	x11 xaw xt
 .endif
 
 USE_BZIP2=	yes
diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist
index 3ed3f6a4b0df..77b174b12f44 100644
--- a/mail/faces/pkg-plist
+++ b/mail/faces/pkg-plist
@@ -9,5 +9,4 @@ include/compface.h
 lib/libcompface.a
 lib/libcompface.so
 lib/libcompface.so.1
-%%X11%%@cwd %%X11BASE%%
 %%X11%%lib/X11/app-defaults/Faces
diff --git a/mail/firemime/Makefile b/mail/firemime/Makefile
index b8ea91232903..08d8d0449b31 100644
--- a/mail/firemime/Makefile
+++ b/mail/firemime/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Callback-based interface for parsing MIME-encoded messages
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN1=		mimedump.1
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index 7b0493fba743..1ea6f987033c 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbuffy
 PORTVERSION=	0.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}/
 
@@ -18,7 +18,6 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 		compface.1:${PORTSDIR}/mail/faces
 
 PLIST_FILES=	bin/gbuffy
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index c01b779a302d..06e067f45ea7 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	mailwatch-${PORTVERSION}
 MAINTAINER=	treif@mayn.de
 COMMENT=	GKrellM mailwatch plugin
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 PLIST_FILES=	libexec/gkrellm/plugins/mailwatch.so
diff --git a/mail/gkrellmmailwatch/files/patch-aa b/mail/gkrellmmailwatch/files/patch-aa
index af8a3602aa50..be4faf0a2046 100644
--- a/mail/gkrellmmailwatch/files/patch-aa
+++ b/mail/gkrellmmailwatch/files/patch-aa
@@ -8,7 +8,7 @@ $FreeBSD$
  GTK_LIB = `$(GTK_CONFIG) --libs`
  
 -GKRELLM_INCLUDE= -I/usr/local/include
-+GKRELLM_INCLUDE= -I${X11BASE}/include/gkrellm
++GKRELLM_INCLUDE= -I${LOCALBASE}/include/gkrellm
  
  IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
  IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index b9bb98056baf..ff5cea07bd3e 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -18,13 +18,13 @@ COMMENT=	GKrellM mailwatch plugin
 
 LATEST_LINK=	gkrellmmailwatch2
 
-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
 
 WRKSRC=		${WRKDIR}/gkrellm-mailwatch
 
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAKE_ENV+=	PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins CC="${CC}"
 
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index f5ba4241badd..0b1c76cd2a09 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glbiff
 PORTVERSION=	0.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dgp.utoronto.ca/~mac/code/projects/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -18,7 +18,6 @@ COMMENT=	Xbiff-like program for X Window System with nice 3D output
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g}
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index ecb15a4b7efe..d43790375a0d 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmime
 PORTVERSION=	1.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v1.0/
 
@@ -16,7 +16,6 @@ COMMENT=	Library (written in C) for parsing and creating messages using MIME
 
 CONFLICTS=	gmime-2.1.*
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	YES
 USE_GMAKE=	YES
 USE_GNOME=	glib12
 USE_ICONV=	yes
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 45ba22dac276..b8dae1557c1b 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hbiff
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/  \
 		${MASTER_SITE_LOCAL}
@@ -17,11 +17,11 @@ MASTER_SITE_SUBDIR=	obrien
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	A replacement for xbiff that handles popup window with mail headers
 
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN1=		hbiff.1
 
 do-build:
-	cd ${WRKSRC} ; cc -I${X11BASE}/include hbiff.c -L${X11BASE}/lib -lX11
+	cd ${WRKSRC} ; cc -I${LOCALBASE}/include hbiff.c -L${LOCALBASE}/lib -lX11
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/bin/hbiff
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index 40d9cff3e02c..68be103d3ab4 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	kiltdown
 PORTVERSION=	0.8.045
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	kiltdown
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kiltdown is an UI independant Email Client for UNIX
@@ -18,13 +17,13 @@ COMMENT=	Kiltdown is an UI independant Email Client for UNIX
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 
 PLIST_FILES=	bin/kiltdown
-USE_X_PREFIX=	yes
+
 USE_QT_VER=	3
 USE_GMAKE=	yes
 MY_CONFIGURE_ARGS=	-release
-MY_CONFIGURE_ARGS+=	-qtinc ${X11BASE}/include -qtlib ${X11BASE}/lib
+MY_CONFIGURE_ARGS+=	-qtinc ${LOCALBASE}/include -qtlib ${LOCALBASE}/lib
 MY_CONFIGURE_ARGS+=	-dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib
-BUILD_ENV+=		PATH=${PATH}:${X11BASE}/bin
+BUILD_ENV+=		PATH=${PATH}:${LOCALBASE}/bin
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index 617984a58601..2c624fb62e7a 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -28,7 +28,7 @@ WITH_GPG=	yes
 .if exists (${LOCALBASE}/bin/abook)
 WITH_ABOOK=	yes
 .endif
-.if exists (${X11BASE}/bin/evolution)
+.if exists (${LOCALBASE}/bin/evolution)
 WITH_EVOLUTION=	yes
 .endif
 .if exists (/usr/bin/getent)
diff --git a/mail/libdomainkeys/Makefile b/mail/libdomainkeys/Makefile
index 67c72db20843..70262f8fd5ff 100644
--- a/mail/libdomainkeys/Makefile
+++ b/mail/libdomainkeys/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	DomainKeys library
 
 MAKE_ENV=	PREFIX=${PREFIX} OPENSSLBASE="${OPENSSLBASE}"
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 SHLIB_MAJOR=	3
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index dc412b5986ec..12afb7fb7055 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index 915e96cf2250..6f48d934bd5b 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -21,7 +21,7 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=		yes
 USE_ICONV=		yes
 USE_GETTEXT=		yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 
 CPPFLAGS+=		${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 4a83e41c959b..27d86edceda7 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile
index 2da7d5d795f4..9c8e813cc9fb 100644
--- a/mail/libsrs_alt/Makefile
+++ b/mail/libsrs_alt/Makefile
@@ -15,7 +15,7 @@ COMMENT=		Sender Rewriting Scheme C Implementation
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=		yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 SHLIB_MAJOR=		1
 GNU_CONFIGURE=		yes
 
diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile
index c5e942441d63..cc5feafc529a 100644
--- a/mail/lightning/Makefile
+++ b/mail/lightning/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lightning
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}/source
diff --git a/mail/mavbiff/files/patch-Makefile b/mail/mavbiff/files/patch-Makefile
index fe6bc3b4cd94..89c85464be58 100644
--- a/mail/mavbiff/files/patch-Makefile
+++ b/mail/mavbiff/files/patch-Makefile
@@ -5,7 +5,7 @@
  
  mavbiff: mavbiff.o mavraise.o
 -	gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L/usr/X11R6/lib
-+	gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L${X11BASE}/lib
++	gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L${LOCALBASE}/lib
  
  .c.o:
  	$(CC) $(OPT_C) $(GTK_C) -o $@ $<
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index d996da232df1..fb3c17b6d45c 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mboxcheck-applet
 PORTVERSION=	0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://perso.orange.fr/seb128/fichiers/
 
@@ -15,7 +15,6 @@ COMMENT=	Mailbox checking applet for GNOME 2
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
-USE_XLIB=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/mail/ml/files/patch-ab b/mail/ml/files/patch-ab
index 5ac9eca9d844..21f8d4f6b707 100644
--- a/mail/ml/files/patch-ab
+++ b/mail/ml/files/patch-ab
@@ -5,7 +5,7 @@
  XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir
  
 -EXTRA_INCLUDES =  -I../Xm -I/usr/openwin/include -I$(INCROOT) -I./ -I../
-+EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${X11BASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I..
++EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${LOCALBASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I..
  
  
  XCOMM   `Compile time defines: 
@@ -29,7 +29,7 @@
 -OTHERLIBS=-lgen
 -ML_LIBDIR=/usr/local/lib/ml
 +OTHERLIBS=-lcrypt
-+ML_LIBDIR=${X11BASE}/lib/X11/ml
++ML_LIBDIR=${LOCALBASE}/lib/X11/ml
  HELP_FILES=`find ../lib -type f -print`
  
  XCOMM  Default font sizes. Linux folks will want FONTSIZE=14 (or
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index ab752be2f045..3761471c66a1 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -7,17 +7,15 @@
 
 PORTNAME=	mmc
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tiny mail client for Gnome Desktop
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//}
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index 58317c99d90a..3908c4b08e6d 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moztraybiff
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,7 +26,6 @@ BROKEN=		${PORTNAME} needs the Thunderbird port in order to build
 TBVER!=		cd ../thunderbird && ${MAKE} -V PORTVERSION
 .endif
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnome
 MAKE_ARGS+=	MOZILLA_PLATFORM=tbird TBVER=${TBVER} MOZ_TRUNK=0
diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index f5b3ef1ca703..42bf3b7474c9 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmail
 PORTVERSION=	0.5.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail python gnome
 MASTER_SITES=	# previous mastersites disappeared in 2001 and 2002
 
@@ -17,7 +17,6 @@ COMMENT=	A GNOME/python email client
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	yes
diff --git a/mail/popd/Makefile b/mail/popd/Makefile
index 21f090c6d759..569997eaa8b8 100644
--- a/mail/popd/Makefile
+++ b/mail/popd/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Very fast, highly configurable POP3 server (fully RFC1939 compliant)
 MAN5=	popd.conf.5
 MAN8=	popd.8
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MANCOMPRESSED=	maybe
 .if defined(NOPROFILE)
 PLIST_SUB=	NOPROFILE="@comment "
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 8a0043b6d1ab..310920cbcf57 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -27,7 +27,7 @@ MAKE_ARGS=	PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \
 		MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \
 		DIR=lib/postilionlib SED="${SED}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude '*/imap/*'
 
 do-configure:
diff --git a/mail/postilion/files/Makefile.bsd b/mail/postilion/files/Makefile.bsd
index 3aac8a7f3d49..bf0eeff3bb73 100644
--- a/mail/postilion/files/Makefile.bsd
+++ b/mail/postilion/files/Makefile.bsd
@@ -5,7 +5,7 @@ LOCALBASE?=	/usr/local
 TCL_VER?=	8.3
 DIR?=		lib/postlionlib
 
-LDADD=		-lm -L${LOCALBASE}/lib -L${X11BASE} -lc-client4 \
+LDADD=		-lm -L${LOCALBASE}/lib -lc-client4 \
 		-ltk${TCL_VER:S/.//} -ltcl${TCL_VER:S/.//} -lX11
 .if exists(/usr/lib/libpam.a)
 LDADD+=		-lpam
@@ -15,7 +15,7 @@ CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER}
 CFLAGS+=	-I${LOCALBASE}/include/tk${TCL_VER}
 CFLAGS+=	-DNDEBUG -I.
 CFLAGS+=	-I${LOCALBASE}/include/c-client -I${LOCALBASE}/include
-CFLAGS+=	-I${X11BASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 
 BINDIR		= ${LOCALBASE}/${DIR}
 
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 8159dfeb9b24..8c5de3b148cf 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	spruce
 PORTVERSION=	0.6.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple GTK based email client
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 3194812ceb63..0bf61b674c65 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 NO_LATEST_LINK=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 6be7992327a1..dc6c6717554c 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 
 # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index c2a6e4be311a..66b9731970bd 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 
 # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index c2a6e4be311a..66b9731970bd 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 
 # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index d0313fcf2e99..627ad3ef360e 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d0313fcf2e99..627ad3ef360e 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index d0313fcf2e99..627ad3ef360e 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 319edcea0684..cf5f7c892c9d 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkrat
 PORTVERSION=	2.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail tk
 MASTER_SITES=	http://tkrat.org/downloads/stable/ \
 		ftp://ftp.tkrat.org/pub/tkrat/
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84 \
 		c-client4.9:${PORTSDIR}/mail/cclient
 
-USE_XLIB=	yes
+USE_XORG=	x11 xt
 
 GNU_CONFIGURE=	yes
 
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index ffc1689828de..de13d4f725bb 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-config=${PREFIX}/etc/whoson.conf
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	whoson.sh
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 8066199eab98..02ad9ae4cda7 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -9,16 +9,14 @@ PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
 PORTREVISION=	7
 CATEGORIES=	mail windowmaker afterstep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xbiff-like Window Maker dock app
 
 OPTIONS=	GNUTLS "Support for SSL" off
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 89635d2144ba..8caec91db442 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmail
 PORTVERSION=	0.64
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	# none
 DISTNAME=	WMMail.app-${PORTVERSION}
@@ -17,8 +17,7 @@ COMMENT=	A little mail notifier for the Window Maker dock
 
 LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-PL-libs="-L${LOCALBASE}/lib" \
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 482dccb13c84..3e479a238d62 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -7,23 +7,22 @@
 
 PORTNAME=	wmmaiload
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Incoming mail monitor dockapp with a similar look to wmcpuload
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 MAKE_ARGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS} -D_GNU_SOURCE ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIB_SSL="-lssl -lcrypto" \
 		LIB_THREADS="${PTHREAD_LIBS}" \
 		DEBUG_CFLAGS="-I${OPENSSLINC}" \
diff --git a/mail/wmmultipop3/Makefile b/mail/wmmultipop3/Makefile
index 67e4430d3370..b741d467be8d 100644
--- a/mail/wmmultipop3/Makefile
+++ b/mail/wmmultipop3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmultipop3
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
 DISTNAME=	wmMultiPop3-${PORTVERSION}
@@ -16,8 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A WindowMaker dockapp that checks multiple pop3 accounts for new mail
 
 BUILD_WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 DOC_FILES=	ChangeLog INSTALL README
 
diff --git a/mail/wmmultipop3/files/patch-Makefile b/mail/wmmultipop3/files/patch-Makefile
index 1c225fbf3492..dcba0ab4befe 100644
--- a/mail/wmmultipop3/files/patch-Makefile
+++ b/mail/wmmultipop3/files/patch-Makefile
@@ -2,7 +2,7 @@
 +++ wmmultipop3/Makefile	Sun May 26 19:40:43 2002
 @@ -1,14 +1,13 @@
 -LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  LIBS   = -lXpm -lXext -lX11
 -FLAGS  = -O2
  OBJS   = wmmultipop3.o Pop3Client.o ../wmgeneral/wmgeneral.o ../wmgeneral/misc.o ../wmgeneral/list.o
@@ -10,7 +10,7 @@
  
  .c.o:
 -	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
-+	${CC} -I${X11BASE}/include ${CFLAGS} -c -Wall $< -o $@
++	${CC} -I${LOCALBASE}/include ${CFLAGS} -c -Wall $< -o $@
  
  wmmultipop3: $(OBJS) 
 -	cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS)
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index a8c4af5dbe57..0f6d6dfa358c 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpop3
 PORTVERSION=	0.5.6a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	#
 DISTNAME=	WMPop3-${PORTVERSION}
@@ -17,8 +17,7 @@ COMMENT=	A POP3 mail check for the Window Maker dock
 
 WRKSRC=		${WRKDIR}/${DISTNAME:L}/wmpop3
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 ALL_TARGET=	clean all
 
 PLIST_FILES=	bin/wmpop3 %%EXAMPLESDIR%%/wmpop3rc
diff --git a/mail/wmymail/Makefile b/mail/wmymail/Makefile
index 9ca7e1929615..0db07cf0e8cf 100644
--- a/mail/wmymail/Makefile
+++ b/mail/wmymail/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmymail
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail x11
 MASTER_SITES=	http://yath.mine.nu/wmymail/ \
 		http://dockapps.org/files/65/96/
@@ -17,8 +17,6 @@ COMMENT=	Check inbox using a WindowMaker DockApp
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 RUN_DEPENDS=	fetchmail:${PORTSDIR}/mail/fetchmail
 
-USE_X_PREFIX=	yes
-
 NOMAN=
 PLIST_FILES=	bin/wmymail
 
diff --git a/mail/wmymail/files/patch-Makefile b/mail/wmymail/files/patch-Makefile
index f2512ee08a39..98d70fa456c6 100644
--- a/mail/wmymail/files/patch-Makefile
+++ b/mail/wmymail/files/patch-Makefile
@@ -17,9 +17,9 @@
 -DISTFILES = Makefile README README.old ChangeLog wmymail.c raw-envelope.jpg
 +SRCS=	wmymail.c
 +
-+CFLAGS+=	-I${X11BASE}/include -O2 -Wall
++CFLAGS+=	-I${LOCALBASE}/include -O2 -Wall
 +LDADD+=	-lXpm -lX11 -lXext -ldockapp
-+LDADD+= -L${X11BASE}/lib
++LDADD+= -L${LOCALBASE}/lib
  
 -default all target: wmymail
 +NOMAN=
@@ -29,7 +29,7 @@
  
 -wmymail: wmymail.o
 -	$(CC) $< $(CFLAGS) $(LIBS) -o $@
-+BINDIR?=	${X11BASE}/bin
++BINDIR?=	${LOCALBASE}/bin
  
 -wmymail.o: wmymail.c $(XPMS)
 -	$(CC) $(CFLAGS) $(MY_INCS) -o $@ -c $<
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 2153fcc570a2..d7c2722cff57 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbuffy
 PORTVERSION=	3.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/xbuffy/
 DISTNAME=	${PORTNAME}-3.3.bl.3
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-3.3.bl.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A replacement for xbiff that handles multiple mail files
 
-USE_X_PREFIX=	yes
+USE_XORG=	xext xt xaw
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		xbuffy.1
diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile
index b8bf47c861e2..e57be030ee5c 100644
--- a/mail/xc-mail/Makefile
+++ b/mail/xc-mail/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	xc-mail
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xcmail
 
 MAINTAINER=	ports@FreeBSD.org
@@ -21,16 +21,14 @@ LIB_DEPENDS=	Xclasses.1:${PORTSDIR}/x11-toolkits/xclasses
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	arm i386
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
-CONFIGURE_ARGS=	--includedir=${X11BASE}/include/ \
-		--libdir=${X11BASE}/lib/ \
-		--x-includes=${X11BASE}/include/ \
-		--x-libraries=${X11BASE}/lib/
+CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include/ \
+		--libdir=${LOCALBASE}/lib/
 
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib" \
-		LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 8c0f3c069ff9..d6238346be9a 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	glib12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xpm
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 6c2a184d76f3..10d69a3c1aaf 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	sjr@comcast.net
 COMMENT=	An X-based interface to the Berkeley mail program
 
 USE_IMAKE=	yes
-USE_XPM=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps xpm
 MAN1=		xmail.1
 
 .include <bsd.port.mk>
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 318e233c3b35..71dcf4c1783f 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Mailbox checker with sound and animation for X Window System
 
 USE_IMAKE=		yes
-USE_XPM=		yes
+USE_XORG=		xpm
 MAN1=			xmailbox.1
 
 post-patch:
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index f6c080c42784..3cf90eb8bcd1 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A replacement for xbiff that handles popup window with mail header
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xpbiff
 WRKSRC=		${WRKDIR}/xpbiff
author	miwi <miwi@FreeBSD.org>	2008-04-20 01:56:05 +0800
committer	miwi <miwi@FreeBSD.org>	2008-04-20 01:56:05 +0800
commit	bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch)
tree	f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /mail
parent	2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff)
download	freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip