- 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)

11 files changed, 21 insertions, 27 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 0a93da583f35..cb7fd1318713 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -26,6 +26,6 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2 gnomehier
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 64377a05a103..0d833aa033f7 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
@@ -37,9 +37,8 @@ OPTIONS=	AQBANKING	"AqBanking support (HBCI/OpenHBCI)"	off	\
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_XORG=	xpm x11
 USE_GMAKE=	yes
-USE_XPM=	yes
 USE_PERL5=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix libgsf_gnome libglade2 \
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index b053eeed801d..459c7b963ff3 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -22,7 +22,7 @@ USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-qhacc-config=${X11BASE}/bin
+CONFIGURE_ARGS=	--with-qhacc-config=${LOCALBASE}/bin
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 1caf126d5d15..d0eac87054c6 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	${UPPORTNAME:L}
 PORTVERSION=	5.05
 PORTREVISION=	1
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	opentaxsolver
+MASTER_SITES=	SF/opentaxsolver
 DISTNAME=	${UPPORTNAME}2007_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
@@ -23,7 +22,7 @@ UPPORTNAME=	OpenTaxSolver
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%PREFIX%%/${PREFIX:C,/,\/,g}/' \
 	${WRKSRC}/src/GUI/ots_gui.c
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \
 	${WRKSRC}/src/GUI/Makefile.linux
 
 # 4.07 distfile has pre-built (linux) binaries we must whack.
diff --git a/finance/pfpro/Makefile b/finance/pfpro/Makefile
index 75e4f10b3b10..eae0fed13aca 100644
--- a/finance/pfpro/Makefile
+++ b/finance/pfpro/Makefile
@@ -17,7 +17,7 @@ COMMENT=	SDK for VeriSign's PayFlow Pro
 
 ONLY_FOR_ARCHS=	i386
 RESTRICTED=	Only for VeriSign PayFlow Pro customers
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 65071d1f31da..3d527ada7d8e 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple QT-based financial manager
@@ -19,7 +18,6 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_AUTOTOOLS=	libtool:15
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index c17ebb51cb4e..3d3e38a4bd5a 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	qtstalker
 PORTVERSION=	0.28
 PORTREVISION=	1
 CATEGORIES=	finance kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Commodity and stock market charting and technical analysis
@@ -19,7 +18,7 @@ BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	db2:${PORTSDIR}/databases/db2
 
 USE_QT_VER=3
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
@@ -84,8 +83,8 @@ do-configure:
 	@cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} -spec ${QMAKESPEC} \
-		"INCLUDEPATH += ${QT_PREFIX}/include ${LOCALBASE}/include ${X11BASE}/include" \
-		"LIBS += -L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		"INCLUDEPATH += ${QT_PREFIX}/include ${LOCALBASE}/include" \
+		"LIBS += -L${LOCALBASE}/lib " \
 		"QMAKE_CFLAGS_SHLIB += -fPIC" \
 		"QMAKE_CXXFLAGS_SHLIB += -fPIC" \
 		"DEFINES += QT_NO_COMPAT PIC" -o ${MAKEFILE} qtstalker.pro
diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile
index 46c797358ca0..e94acb6168e4 100644
--- a/finance/wmstock/Makefile
+++ b/finance/wmstock/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	wmstock
 PORTVERSION=	0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance windowmaker
 MASTER_SITES=	http://mattfischer.com/wmstock/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cool WindowMaker Dockapp that shows stock ticker(s)
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 WRKSRC=		${WRKDIR}/wmstock/src
 USE_GMAKE=	yes
diff --git a/finance/wmstock/files/patch-ab b/finance/wmstock/files/patch-ab
index bde526c3a636..6025b41c39e8 100644
--- a/finance/wmstock/files/patch-ab
+++ b/finance/wmstock/files/patch-ab
@@ -14,9 +14,9 @@
 -DESTDIR= /usr/X11R6
 -LIBDIR = -L/usr/X11R6/lib
 +X11BASE	?= /usr/X11R6
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
 +DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  
  # for linux
  LIBS   = -lXpm -lX11 -lXext
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index e223fab446d3..1d484d560961 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Xbae.4:${PORTSDIR}/x11-toolkits/xbae
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 PLIST_FILES=	bin/Xquote lib/X11/app-defaults/Xquote
 
diff --git a/finance/xtrader/files/patch-Makefile.linux b/finance/xtrader/files/patch-Makefile.linux
index f22cbec7958f..ef14baccdc39 100644
--- a/finance/xtrader/files/patch-Makefile.linux
+++ b/finance/xtrader/files/patch-Makefile.linux
@@ -7,10 +7,10 @@
 -LFLAGS=			-L/usr/local/lib -lz -lfltk -lptypes  -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft
 -LFLAGS2=		-L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread
 +COMP=			$(CC)
-+IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes -I$(X11BASE)/include
++IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes
 +CFLAGS:=			$(CFLAGS) -Wno-format-y2k
-+LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes  -lexpat -L$(X11BASE)/lib -lm -lXpm -lX11  $(PTHREAD_LIBS) -lXft -lcompat
-+LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -L$(X11BASE)/lib -lXpm -lX11  $(PTHREAD_LIBS)
++LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes  -lexpat -lm -lXpm -lX11  $(PTHREAD_LIBS) -lXft -lcompat
++LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11  $(PTHREAD_LIBS)
  XTRADER=		xtrader
  XTRADER2=		xtrader.static