Remove USE_X11BASE and X11PREFIX.

12 files changed, 16 insertions, 26 deletions

diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index 728a94f296d..1fc552863e4 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/05/03 19:47:49 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:40 joerg Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -13,7 +13,6 @@ COMMENT=	Dockable clock and calendar with themes for GTK+
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
 WRKSRC=		${WRKDIR}/asclock-gtk
-USE_X11BASE=	yes
 
 PLIST_SRC=	${PKGDIR}/PLIST \
 		${PKGDIR}/PLIST.themes
diff --git a/time/bbdate/distinfo b/time/bbdate/distinfo
index df9f0ad6384..f8cb73446d1 100644
--- a/time/bbdate/distinfo
+++ b/time/bbdate/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 19:14:53 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/07/04 16:18:40 joerg Exp $
 
 SHA1 (bbdate-0.2.4.tar.gz) = c48052eec337dfdca5fdfe6b87cd2bccf3a03921
 RMD160 (bbdate-0.2.4.tar.gz) = a6af9817069f09fe359679feb6128be8b7096d0d
 Size (bbdate-0.2.4.tar.gz) = 60644 bytes
-SHA1 (patch-aa) = f3dcd43ff15b065b2e4e63a07743178490c1634d
+SHA1 (patch-aa) = b4a13b2e0493967463270b9f5782117642261320
 SHA1 (patch-ab) = 4ba9c43992b476e8d515fb56fb18dad586533a3a
diff --git a/time/bbdate/patches/patch-aa b/time/bbdate/patches/patch-aa
index 880082a79b2..4f083ac68d3 100644
--- a/time/bbdate/patches/patch-aa
+++ b/time/bbdate/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2015/07/04 16:18:40 joerg Exp $
 
 --- Makefile.in.orig	Fri Jul 18 11:31:51 2003
 +++ Makefile.in	Fri Jul 18 11:32:49 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $
  
  DEFS = @DEFS@ -I. -I$(srcdir) 
 -LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
++LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11BASE}/lib
  LIBS = @LIBS@
  X_CFLAGS = @X_CFLAGS@
  X_LIBS = @X_LIBS@
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index 78facae895f..e1aef90c808 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/04/06 12:04:02 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2015/07/04 16:18:40 joerg Exp $
 #
 
 DISTNAME=	cs113ins
@@ -18,8 +18,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_X11BASE=	yes
-
 USE_TOOLS+=	pax gtar
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/time/dclock/Makefile b/time/dclock/Makefile
index 5df3aa111ee..07de9c85a2e 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 13:04:17 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:40 joerg Exp $
 #
 
 DISTNAME=	dclock
@@ -14,7 +14,6 @@ COMMENT=	Digital clock for X
 CONFLICTS+=	ivtools-*
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/time/gnyaclock/distinfo b/time/gnyaclock/distinfo
index 8d1830c7759..bdabdace182 100644
--- a/time/gnyaclock/distinfo
+++ b/time/gnyaclock/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 19:14:54 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/07/04 16:18:40 joerg Exp $
 
 SHA1 (gnya.shar) = 8d5ba47445bc28eb1cf5019d1e1cd0fd38b025c5
 RMD160 (gnya.shar) = f23bf47732b51ea03fbe4cabc13d20bcc9848247
 Size (gnya.shar) = 46266 bytes
-SHA1 (patch-aa) = 886cb708df64f04d4a13b24ca584c3480a5c835f
+SHA1 (patch-aa) = c289b86e19aeb455974411a8b7a866ecd186f20b
 SHA1 (patch-ab) = 6c79cb5d3d7eff42e0f5418c061feefac1672524
diff --git a/time/gnyaclock/patches/patch-aa b/time/gnyaclock/patches/patch-aa
index 443b8ea0651..5d8bf0a911c 100644
--- a/time/gnyaclock/patches/patch-aa
+++ b/time/gnyaclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/18 12:35:48 kei Exp $
+$NetBSD: patch-aa,v 1.2 2015/07/04 16:18:40 joerg Exp $
 
 --- Imakefile.orig	Mon Dec 18 13:41:06 2000
 +++ Imakefile	Mon Dec 18 13:42:16 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/18 12:35:48 kei Exp $
   */
  #ifdef SUPPORT_XPM
 -    EXTRA_INCLUDES = -I/usr/local/include
-+    EXTRA_INCLUDES = -I${X11PREFIX}/include
++    EXTRA_INCLUDES = -I${X11BASE}/include
         XPM_LIBRARY = -lXpm
  #endif
  
diff --git a/time/plan/Makefile b/time/plan/Makefile
index 32e2e90f591..88394619571 100644
--- a/time/plan/Makefile
+++ b/time/plan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/02/16 15:41:54 wiedi Exp $
+# $NetBSD: Makefile,v 1.33 2015/07/04 16:18:40 joerg Exp $
 
 DISTNAME=	plan-1.9
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	Schedule planner based on X/Motif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_TOOLS+=	yacc lex
-USE_X11BASE=	YES
 BUILD_TARGET=	${LOWER_OPSYS}
 
 INSTALLATION_DIRS=	libexec/plan ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 \
diff --git a/time/rclock/Makefile b/time/rclock/Makefile
index a75ae043ae6..0106f271b1c 100644
--- a/time/rclock/Makefile
+++ b/time/rclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/08 13:04:28 asau Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:40 joerg Exp $
 
 DISTNAME=		rxvt-2.7.10
 PKGNAME=		rclock-2.7.10
@@ -10,7 +10,6 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Analog clock for X w/appointment reminder and mail notification
 
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		clock
 
diff --git a/time/titrax/Makefile b/time/titrax/Makefile
index e610191737e..61acfa24949 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/06/12 10:51:46 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/07/04 16:18:40 joerg Exp $
 #
 
 DISTNAME=		titrax-1.98
@@ -23,7 +23,6 @@ USE_TOOLS+=		perl:run
 pre-configure:
 	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
 	${SED}	-e "s|@LOCALBASE@|${PREFIX}|g"			\
-		-e "s|@X11BASE@|${X11PREFIX}|g"				\
 		${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile
 
 INSTALLATION_DIRS=	libexec/titrax
diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile
index 8053c594c6c..ebc72c56467 100644
--- a/time/wmfishtime/Makefile
+++ b/time/wmfishtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:40 joerg Exp $
 #
 
 DISTNAME=	wmfishtime-1.24
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ne.jp/asahi/linux/timecop/
 COMMENT=	Dockable clock application with clock, date and fish
 
-USE_X11BASE=	yes
-
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 .include "../../devel/libgetopt/buildlink3.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 6c0165c5d49..4b8355f5515 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:40 joerg Exp $
 
 DISTNAME=	wmMoonClock-1.27
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	Shows lunar ephemeris to fairly high accuracy
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 USE_TOOLS+=	gmake
-USE_X11BASE=	YES
 
 MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}