From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 19 Apr 2008 17:56:05 +0000
Subject: - 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)
---
 finance/wmstock/Makefile       | 5 ++---
 finance/wmstock/files/patch-ab | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'finance/wmstock')

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
-- 
cgit v1.2.3