43 files changed, 59 insertions, 67 deletions

diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile
index 7eaac2e04131..4509f60219cd 100644
--- a/security/borzoi/Makefile
+++ b/security/borzoi/Makefile
@@ -20,6 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile
index a1aea58b659a..e87e3a538464 100644
--- a/security/bsp_upektfmess/Makefile
+++ b/security/bsp_upektfmess/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	bioapi100.0:${PORTSDIR}/security/bioapi \
 PLIST_FILES=	lib/libtfmessbsp.so
 
 USE_ZIP=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 # Maintainer note
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index ea1134086a36..d7d51324f336 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -40,7 +40,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_SUBMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/${PORTNAME}
 
 MAILOWN=	courier
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index cc034c22a1b7..4940cec64171 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} 's/gpgme-config/gpgme03-config/g' \
diff --git a/security/cutlass/Makefile b/security/cutlass/Makefile
index b8e103f93569..be390a9ca33b 100644
--- a/security/cutlass/Makefile
+++ b/security/cutlass/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	botan-config:${PORTSDIR}/security/botan \
 
 MAN3=	cutlass.3
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	libglade2
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index fd7fbc121015..e4ef958c3240 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -26,7 +26,7 @@ MD5_FILE=	${CYRUS_SASL2_DIR}/distinfo
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/plugins
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index 3f40d18e16dc..628551a8d255 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 LIBTOOLFILES=	configure ssl/configure
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 SUB_LIST+=	NAME=dc_server
 
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index 60631df78f77..4b933f73f5d9 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -23,7 +23,7 @@ USE_RC_SUBR=	dc_server.sh
 USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 SUB_LIST+=	NAME=dc_server
 
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index a5085d415ce0..a8a6d3a52393 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	LDFLAGS=-static
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
-		s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h
+		s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/options.h
 	@${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch]
 	@${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \
 				${WRKSRC}/libtomcrypt/Makefile.in
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index ba9e1f0af68d..43d9bb20f284 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwtk
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
@@ -47,7 +47,7 @@ IGNORE=		does not build on 5.x and above with WITH_SKEY set because it requires
 .if !defined(WITHOUT_X11)
 MAN8+=		x-gw.8
 LIBEXEC_BINS+=	x-gw
-USE_XLIB=	yes
+USE_XORG=	x11
 PLIST_SUB+=	X11=""
 .else
 PLIST_SUB+=	X11="@comment "
diff --git a/security/fwtk/files/patch-aa b/security/fwtk/files/patch-aa
index a4d04246abde..366270057ea1 100644
--- a/security/fwtk/files/patch-aa
+++ b/security/fwtk/files/patch-aa
@@ -60,7 +60,7 @@
  
  # Location of X libraries for X-gw
 -XLIBDIR=/usr/X11/lib
-+XLIBDIR=$(X11BASE)/lib
++XLIBDIR=$(LOCALBASE)/lib
  #XLIBDIR=/usr/local/X11R5/lib
  
  # X Libraries
@@ -75,7 +75,7 @@
  
  # Location of X include files
 -XINCLUDE=/usr/X11/include
-+XINCLUDE=$(X11BASE)/include
++XINCLUDE=$(LOCALBASE)/include
  #XINCLUDE=/usr/local/X11R5/include
  
  # Objects to include in libfwall for SYSV
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index ef1681c30d3d..cb1a105d26e1 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	gcipher
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	jjinux@yahoo.com
 COMMENT=	A simple encryption tool
@@ -18,7 +17,6 @@ COMMENT=	A simple encryption tool
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
 USE_PYTHON=	yes
-USE_XLIB=	yes
 USE_GNOME=	libgnomeui
 
 GCIPHER_PREFIX=	${PREFIX}/share/gcipher
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index bdf0c22c3223..cd6d91eb4d88 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index d043c6bac016..cdbf41131deb 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK=	gpgme03
 
 USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 INFO=	gpgme03
 
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 5fb145b77f30..239a04c72322 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -7,17 +7,15 @@
 
 PORTNAME=	gtkpasman
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	phil@teaser.fr
 COMMENT=	A GTK+ passwords manager for system and network administrators
 
 RUN_DEPENDS+=   gpgv:${PORTSDIR}/security/gnupg1
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 24c780327489..c2a2639a247f 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -61,7 +61,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 .endif
 
 .if defined(WITH_X11)
-USE_XLIB=		yes
+USE_XORG=		x11
 CONFIGURE_ARGS+=	--with-x
 .else
 CONFIGURE_ARGS+=	--without-x
diff --git a/security/ifd-gempc410/Makefile b/security/ifd-gempc410/Makefile
index 76cbb771570f..6387db0ba4e6 100644
--- a/security/ifd-gempc410/Makefile
+++ b/security/ifd-gempc410/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 
 MAKE_ARGS+=	-CGemPC410
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 NOMAN=
 
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 9f511c5a3682..ad898d64f3f8 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -20,11 +20,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build uic_build qt3support_build corelib gui xml
 HAS_CONFIGURE=	yes
+USE_XORG=	xt inputproto xtst xrender xrandr xfixes xcursor\
+		xext x11 sm ice xi
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} -unix PREFIX=${PREFIX} \
-		INCLUDEPATH+=${X11BASE}/include LIBS+=-L${X11BASE}/lib \
+		INCLUDEPATH+=${LOCALBASE}/include LIBS+=-L${LOCALBASE}/lib \
 		keepass.pro
 
 .include <bsd.port.mk>
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 541248604aa9..92802aa28e5c 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--with-pkg-config-files=${PREFIX}/libdata/pkgconfig
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e "s|md5sum|md5|g" ${WRKSRC}/Makefile.in
diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index 3719677453be..01d0a7da7ecb 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -17,7 +17,7 @@ USE_AUTOTOOLS=	libltdl:15
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/linux-f10-openssl/Makefile b/security/linux-f10-openssl/Makefile
index 22cd2d9370d9..a5be6edca011 100644
--- a/security/linux-f10-openssl/Makefile
+++ b/security/linux-f10-openssl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SSL and crypto library (Linux Version)
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-f8-openssl/Makefile b/security/linux-f8-openssl/Makefile
index 22cd2d9370d9..a5be6edca011 100644
--- a/security/linux-f8-openssl/Makefile
+++ b/security/linux-f8-openssl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SSL and crypto library (Linux Version)
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-openssl/Makefile b/security/linux-openssl/Makefile
index 22cd2d9370d9..a5be6edca011 100644
--- a/security/linux-openssl/Makefile
+++ b/security/linux-openssl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SSL and crypto library (Linux Version)
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/matrixssl/Makefile b/security/matrixssl/Makefile
index 32cc34de01e0..c9aafd278d21 100644
--- a/security/matrixssl/Makefile
+++ b/security/matrixssl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Small alternative SSL implementation
 
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmatrixssl* ${PREFIX}/lib
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 401abeae6059..32a6578c1cca 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -27,7 +27,7 @@ WRKSRC=		${WRKDIR}/libnasl
 USE_AUTOTOOLS=	libtool:15
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 
 MAN1=		nasl.1 nasl-config.1
 
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 8cd6c457ecc0..53004b86f9be 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--enable-cipher
 CONFIGURE_ARGS+=	--enable-bpf-sharing
 .endif
 
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 
 MAN1=		nessus-config.1
 
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 21ce21185ce4..9144e16d5ea2 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  nmaplibexecdir = @libexecdir@/nmap
  nmapdatadir = @datadir@/nmap
 -deskdir = $(prefix)/share/applications
-+deskdir = $(X11BASE)/share/applications
++deskdir = $(LOCALBASE)/share/applications
  NMAPDEVDIR=~/nmap-dev
  
  export NBASEDIR=@NBASEDIR@
diff --git a/security/openbsm/Makefile b/security/openbsm/Makefile
index 90eecbf5bacb..ba243665ad06 100644
--- a/security/openbsm/Makefile
+++ b/security/openbsm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Open Source Basic Security Module (BSM) Audit Implementation
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=		auditreduce.1		\
 		praudit.1
diff --git a/security/openct/Makefile b/security/openct/Makefile
index 718bce7bc462..31d7b2ac5d1a 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -21,7 +21,7 @@ USE_AUTOTOOLS=	libltdl:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	openct
 SUB_FILES=	etoken.conf
 
diff --git a/security/openfwtk/files/patch-configs-FreeBSD b/security/openfwtk/files/patch-configs-FreeBSD
index f8460b85f4f3..481a8ae52a87 100644
--- a/security/openfwtk/files/patch-configs-FreeBSD
+++ b/security/openfwtk/files/patch-configs-FreeBSD
@@ -47,14 +47,14 @@
  
  # Location of X libraries for X-gw
 -XLIBDIR=/usr/X11R6/lib
-+XLIBDIR=${X11BASE}lib/X11
++XLIBDIR=${LOCALBASE}lib/X11
  
  # X Libraries
  XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lSM -lICE -lXext
  
  # Location of X include files
 -XINCLUDE=/usr/X11R6/include
-+XINCLUDE=${X11BASE}/include/X11
++XINCLUDE=${LOCALBASE}/include/X11
  
  # IPFilter location
  #IPFILTER=$(PREFIX)/development/src/ipfilter/ip_fil3.2.9
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index bdc55f61dd9a..00e462f4efca 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -24,10 +24,10 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -I${X11BASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 0c9eef370a4b..6a100dd53e25 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	pidgin
 PORTVERSION=	3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pidgin-encrypt
+MASTER_SITES=	SF/pidgin-encrypt
 PKGNAMESUFFIX=	-encryption
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
@@ -21,7 +20,6 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 LIB_DEPENDS=	purple.4:${PORTSDIR}/net-im/libpurple \
 		nss3:${PORTSDIR}/security/nss
 
-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 7c72ebaa027d..cc60df9f1010 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 PKGNAMEPREFIX=	pidgin-
@@ -24,7 +24,6 @@ LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		purple.4:${PORTSDIR}/net-im/libpurple
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool
 USE_GETTEXT=	yes
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 4f01886ae923..f347df9b85ef 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -24,7 +24,7 @@ USE_ICONV=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 INFO=		pinentry
 
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index f983f3aa83f8..42601d822271 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -23,7 +23,7 @@ USE_OPENSSL=	yes
 USE_QT_VER=	3
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS=	--qtdir=${X11BASE} \
+CONFIGURE_ARGS=	--qtdir=${LOCALBASE} \
 		--with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB}
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/security/qtfw/files/patch-Makefile b/security/qtfw/files/patch-Makefile
index efe4966222e2..4a7e877cb27a 100644
--- a/security/qtfw/files/patch-Makefile
+++ b/security/qtfw/files/patch-Makefile
@@ -15,8 +15,8 @@
 -QT_LIBS:=-L/usr/X11R6/lib
 -LIBS:=-lqt-mt -pthread
 +CXXFLAGS+=-I. -I.. -Wall ${PTHREAD_CFLAGS}
-+QT_INCLUDES:=-I${X11BASE}/include
-+QT_LIBS:=-L${X11BASE}/lib
++QT_INCLUDES:=-I${LOCALBASE}/include
++QT_LIBS:=-L${LOCALBASE}/lib
 +LIBS:=-lqt-mt ${PTHREAD_LIBS}
  
  UI_TEMPLATES_DIR:=../qtdesigner-ui
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index ded0f90c5a96..6ad2bbab89e9 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://oss.codepoet.no/revelation/
 
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/test.py:${PORTSDIR}/security/py-pycrypt
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygnome2 pygnomeextras gnomeprefix gnomehack desktopfileutils \
@@ -33,7 +32,7 @@ USE_GETTEXT=	yes
 
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+		${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
 .endif
 
 post-patch:
diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile
index 2850d77a67f0..daacb30b10b4 100644
--- a/security/saferpay/Makefile
+++ b/security/saferpay/Makefile
@@ -19,7 +19,7 @@ MAKEFILE=	${WRKSRC}/saferpay/Makefile
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}
 
 post-patch:
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2b7837cf8510..f993c9aeea58 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	seahorse
 PORTVERSION=	2.22.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,7 +25,6 @@ LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GECKO=	firefox xulrunner firefox-devel<->firefox
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index e9d245deaf25..5557bb4c340e 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -120,7 +120,7 @@ CONFIGURE_ARGS+=	--with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5
 .endif
 
 # Include extra files if X11 is installed
-.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
+.if defined(WITH_X11) || (exists(${LOCALBASE}/lib/libX11.a) \
 	&& !defined(WITHOUT_X11))
 USE_XORG=	x11
 PLIST:=		${WRKDIR}/PLIST
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 0e01901805a4..ab2e05d70f17 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssh2
 PORTVERSION=	3.2.9.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security ipv6
 # The list of official mirror sites is at:
 # http://www.ssh.com/support/downloads/secureshellserver/non-commercial.html
@@ -86,9 +86,9 @@ EXTRA_PATCHES+=		${FILESDIR}/kerberos-patch-apps::ssh::ssh2_config \
 .endif
 
 .if !defined(WITHOUT_X11)
-BUILD_DEPENDS+=		${X11BASE}/bin/xauth:${X_CLIENTS_PORT}
-RUN_DEPENDS+=		${X11BASE}/bin/xauth:${X_CLIENTS_PORT}
-USE_XLIB=		yes
+BUILD_DEPENDS+=		xauth:${PORTSDIR}/x11/xauth
+RUN_DEPENDS+=		xauth:${PORTSDIR}/x11/xauth
+USE_XORG=		x11
 PLIST_SUB+=		WITH_X11:=""
 .else
 CONFIGURE_ARGS+=	--without-x
@@ -138,7 +138,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\/etc\/ssh2|${PREFIX}&|g' \
 		${WRKSRC}/HOWTO.anonymous.sftp
 	@${REINPLACE_CMD} -e \
-		's|$$PATH:\/usr\/X11R6\/bin:\/usr\/X11\/bin|${X11BASE}\/bin|' \
+		's|$$PATH:\/usr\/X11R6\/bin:\/usr\/X11\/bin|${LOCALBASE}\/bin|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|\$$\(ETCDIR\)|${PREFIX}\/etc|g' \
 		${WRKSRC}/apps/ssh/ssh_dummy_shell.out
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 7b49a3823ca6..4e47657e12b9 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -25,7 +25,7 @@ USE_OPENSSL=	yes
 USE_GNOME=	gnomehack libxslt
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	xmlsec.1 xmlsec-config.1
 
diff --git a/security/xspy/Makefile b/security/xspy/Makefile
index 8bcc5d6f8397..896f926ec065 100644
--- a/security/xspy/Makefile
+++ b/security/xspy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xspy
 PORTVERSION=	1.0c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.acm.vt.edu/~jmaxwell/programs/xspy/
 
@@ -15,7 +15,6 @@ MAINTAINER=	onatan@gmail.com
 COMMENT=	A utility for monitoring keystrokes on remote X servers
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_XLIB=	yes
 USE_IMAKE=	yes
 XMKMF=		xmkmf