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)

14 files changed, 81 insertions, 38 deletions

diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 3f76bea..e60530d 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.38
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Provides transparent RSA encryption as a Gaim plugin
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile
index 995776b..d1ddf1b 100644
--- a/security/gaim-otr/Makefile
+++ b/security/gaim-otr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
@@ -17,13 +18,14 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@mcdermottroe.com
 COMMENT=	Allows deniable private conversations using GAIM
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
+		--with-libotr-inc-prefix=${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 90e2ee4..0f962c9 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcipher
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	A simple encryption tool
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	libgnomeui
 
 GCIPHER_PREFIX=	${PREFIX}/share/gnome/gcipher
diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index 917ffd1..196c123 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-password-generator
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-password
@@ -17,7 +17,6 @@ COMMENT=	GNOME 2 password generator
 
 USE_GNOME=	pygnome2
 USE_PYTHON=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index a76dde3..ada9821 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpass
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security gnome
 MASTER_SITES=	http://projects.netlab.jp/gpass/release/
 
@@ -17,14 +17,14 @@ COMMENT=	A password manager for GNOME2
 LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/mcrypt \
 		mhash:${PORTSDIR}/security/mhash
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 USE_GMAKE=	yes
 
-MAN1=	gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
+MAN1=		gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
 
-USE_GNOME=	gtk20 libgnomeui intltool libglade2
+USE_GNOME=	gnomehack gnomeprefix gtk20 libgnomeui intltool libglade2
 GCONF_SCHEMAS=	gpass.schemas
 
 .include <bsd.port.pre.mk>
@@ -33,4 +33,11 @@ GCONF_SCHEMAS=	gpass.schemas
 BROKEN=		Does not compile
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|{packageprefix}/share|{datadir}|g' \
+		${WRKSRC}/configure
+
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.post.mk>
diff --git a/security/gpass/pkg-plist b/security/gpass/pkg-plist
index 6bcc033..9910308 100644
--- a/security/gpass/pkg-plist
+++ b/security/gpass/pkg-plist
@@ -1,16 +1,17 @@
 bin/gpass
 bin/gpass-convert
-share/applications/gpass.desktop
-%%DATADIR%%/welcome.glade
-%%DATADIR%%/intergradation.glade
-%%DATADIR%%/authentication.glade
-%%DATADIR%%/window.glade
+share/gnome/applications/gpass.desktop
+share/gnome/pixmaps/gpass-icon.png
 %%DATADIR%%/attribute-editor.glade
-%%DATADIR%%/confirm-quit.glade
+%%DATADIR%%/authentication.glade
 %%DATADIR%%/change-master-password.glade
+%%DATADIR%%/confirm-quit.glade
+%%DATADIR%%/intergradation.glade
+%%DATADIR%%/lock.glade
 %%DATADIR%%/password-generator.glade
 %%DATADIR%%/preferences.glade
-%%DATADIR%%/lock.glade
-share/pixmaps/gpass-icon.png
-@dirrmtry share/applications
+%%DATADIR%%/welcome.glade
+%%DATADIR%%/window.glade
 @dirrm %%DATADIR%%
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index b64b5b9..299e82c 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -21,13 +21,14 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:14 aclocal:14 autoconf:213
+USE_AUTOTOOLS=	automake:15 aclocal:15 autoconf:259
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 DOCS=		README src/gpasman4.sample
 PLIST_FILES=	bin/gtkpasman
+ACLOCAL_ARGS?=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	README gpasman4.sample
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 83c1b38..e125b61 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	babak@farrokhi.net
 COMMENT=	A secure (encrypted) remote shell compatible with ssh 2.0
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 \
-		${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
+		${LOCALBASE}/share/guile/1.6/slibcat:${PORTSDIR}/lang/slib-guile
 LIB_DEPENDS+=	oop:${PORTSDIR}/devel/liboop
 
 GNU_CONFIGURE=	yes
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index 6075091..1ccff74 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nofgpg
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://www.cgabriel.org/download/nofgpg/
 
@@ -24,7 +25,8 @@ MAN1=		nofgpg.1
 PLIST_FILES=	bin/nofgpg
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/share,${X11BASE}/share/gnome,g" ${WRKSRC}/nofgpg
+	@${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share/gnome,g" \
+		${WRKSRC}/nofgpg
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 3f76bea..e60530d 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.38
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Provides transparent RSA encryption as a Gaim plugin
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 995776b..d1ddf1b 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
@@ -17,13 +18,14 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@mcdermottroe.com
 COMMENT=	Allows deniable private conversations using GAIM
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
+		--with-libotr-inc-prefix=${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 3819c0e..ce0e158 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.16 2006/03/05 21:52:25 marcus Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.18 2006/10/01 01:56:57 ahze Exp $
 #
 
 PORTNAME=	seahorse
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme
 
+USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
@@ -28,7 +29,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
-INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-gpg-check
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -37,11 +37,13 @@ GCONF_SCHEMAS=	seahorse.schemas
 
 OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
 		LDAP "Enable LDAP support" on \
-		GEDIT "Enable GEdit plug-in support" on \
 		HKP "Enable HKP keyserver interface" on
+#		GEDIT "Enable GEdit plug-in support" on
 
 .include <bsd.port.pre.mk>
 
+# Gedit not working right now..
+WITHOUT_GEDIT=	yes
 .if !defined(WITHOUT_GEDIT)
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 5b17b6d..363cf20 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -112,3 +112,29 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@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/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index ba90dfc..70db830 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yersinia
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.yersinia.net/download/
 
@@ -16,7 +17,7 @@ COMMENT=	Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
 BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 .if !defined(WITHOUT_GTK)
-.if exists(${X11BASE}/include/gtk-2.0/gtk/gtk.h)
+.if exists(${LOCALBASE}/include/gtk-2.0/gtk/gtk.h)
 WITH_GTK=	true
 .endif
 .endif
@@ -41,7 +42,7 @@ MAN8=		yersinia.8
 PLIST_FILES=	sbin/yersinia
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${TARGETDIR}/sbin/
-		${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${TARGETDIR}/man/man8/
+		${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/
+		${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${PREFIX}/man/man8/
 
 .include <bsd.port.post.mk>