*: Cleanup

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 25 19:05:06 2016 +0200
Changeset:	9f5eced1529a3383f0eeda1b77cd04aa8c155c39

Modified Files:
	briquolo/Makefile
	gdb-git/Makefile
	gnome-jabber/Makefile
	hs-x11-extras/Makefile
	tcl-itcl3/Makefile
	tk-itk3/Makefile
	tk-tkimg/options.mk
	tktile/Makefile
	wmsupermon/Makefile

Log Message:
*: Cleanup

*: Replace BUILDLINK_PREFIX.libX11 with X11BASE
gdb-git: Use perl c c++; drop AUTO_MKDIRS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9f5eced1529a3383f0eeda1b77cd04aa8c155c39

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 briquolo/Makefile      | 4 ++--
 gdb-git/Makefile       | 4 ++--
 gnome-jabber/Makefile  | 4 ++--
 hs-x11-extras/Makefile | 4 ++--
 tcl-itcl3/Makefile     | 4 ++--
 tk-itk3/Makefile       | 4 ++--
 tk-tkimg/options.mk    | 4 ++--
 tktile/Makefile        | 4 ++--
 wmsupermon/Makefile    | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diffs:
diff --git a/briquolo/Makefile b/briquolo/Makefile
index ea1c012..8098924 100644
--- a/briquolo/Makefile
+++ b/briquolo/Makefile
@@ -18,8 +18,8 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		grep intltool msgfmt msgmerge xgettext
-CONFIGURE_ARGS+=	--with-x --x-includes=${BUILDLINK_PREFIX.libX11}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--with-x --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 CONFIGURE_ARGS+=	--includedir=${BUILDLINK_PREFIX.MesaLib}/include/GL
 
 post-install:
diff --git a/gdb-git/Makefile b/gdb-git/Makefile
index 36c746a..7fdeeea 100644
--- a/gdb-git/Makefile
+++ b/gdb-git/Makefile
@@ -19,14 +19,14 @@ BROKEN_GETTEXT_DETECTION=	yes
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake msgfmt makeinfo
+USE_TOOLS+=		gmake msgfmt makeinfo perl
 REPLACE_LOCALEDIR_PATTERNS+=	Make-in
 INSTALL_TARGET=		install install-info
 TEST_TARGET=		check
 INFO_FILES=		yes
 CONFIGURE_ENV+=		CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
 
-AUTO_MKDIRS=		yes
+USE_LANGUAGES=	c c++
 
 .include "options.mk"
 
diff --git a/gnome-jabber/Makefile b/gnome-jabber/Makefile
index e512fcc..2fea1ed 100644
--- a/gnome-jabber/Makefile
+++ b/gnome-jabber/Makefile
@@ -22,8 +22,8 @@ USE_LANGUAGES+=		c c++ fortran
 USE_TOOLS+=		msgfmt perl pkg-config xgettext
 
 CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 
 GCONF_SCHEMAS+=		gnome-jabber.schemas
diff --git a/hs-x11-extras/Makefile b/hs-x11-extras/Makefile
index a432640..5ccc0b6 100644
--- a/hs-x11-extras/Makefile
+++ b/hs-x11-extras/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS+=	--configure-option="--x-libraries=${XLIBRARIES}"
 
 
 .if ${X11_TYPE} == "modular"
-XINCLUDES=		${BUILDLINK_PREFIX.libX11}/include
-XLIBRARIES+=		${BUILDLINK_PREFIX.libX11}/lib
+XINCLUDES=		${X11BASE}/include
+XLIBRARIES+=		${X11BASE}/lib
 .else
 XINCLUDES=		${X11BASE}/include
 XLIBRARIES=		${X11BASE}/lib
diff --git a/tcl-itcl3/Makefile b/tcl-itcl3/Makefile
index b395685..fb6d6c3 100644
--- a/tcl-itcl3/Makefile
+++ b/tcl-itcl3/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Framework for building mega-widgets using [incr Tcl]
 LICENSE=	mit # Standard ML of New Jersey Variant
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include/X11
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include/X11
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/itcl3
 USE_TOOLS+=		grep
 
diff --git a/tk-itk3/Makefile b/tk-itk3/Makefile
index 9e458c5..bc0a4d9 100644
--- a/tk-itk3/Makefile
+++ b/tk-itk3/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Framework for building mega-widgets for Tcl/Tk
 LICENSE=	mit # Standard ML of New Jersey Variant
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include/X11
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include/X11
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 CONFIGURE_ARGS+=	--with-itcl=${BUILDLINK_PREFIX.tcl-itcl3}/lib
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/itk3
 USE_TOOLS+=		grep
diff --git a/tk-tkimg/options.mk b/tk-tkimg/options.mk
index 5d67f0b..0cb6be7 100644
--- a/tk-tkimg/options.mk
+++ b/tk-tkimg/options.mk
@@ -14,8 +14,8 @@ CONFIGURE_ARGS+=	--disable-symbols
 
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libX11/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x --x-includes=${BUILDLINK_PREFIX.libX11}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+CONFIGURE_ARGS+=	--with-x --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
diff --git a/tktile/Makefile b/tktile/Makefile
index 544e4a8..b52d330 100644
--- a/tktile/Makefile
+++ b/tktile/Makefile
@@ -16,8 +16,8 @@ GNU_CONFIGURE=	yes
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11:Q}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11:Q}/lib
+CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib
 .endif
 
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/wmsupermon/Makefile b/wmsupermon/Makefile
index 36a5975..63f48dc 100644
--- a/wmsupermon/Makefile
+++ b/wmsupermon/Makefile
@@ -18,7 +18,7 @@ SUBST_CLASSES+=		x11
 SUBST_FILES.x11=	Makefile
 SUBST_STAGE.x11=	post-patch
 SUBST_MESSAGE.x11=	Fixing X11 LIBDIR.
-SUBST_SED.x11=		-e "s|/usr/X11R6/lib|${BUILDLINK_PREFIX.libX11}/lib -Wl,-rpath,${BUILDLINK_PREFIX.libX11}/lib|"
+SUBST_SED.x11=		-e "s|/usr/X11R6/lib|${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib|"
 
 do-install:
 			${INSTALL_PROGRAM} ${WRKSRC}/wmsupermon ${DESTDIR}${PREFIX}/bin/wmsupermon