From 7c0838aa59107b82f684c40e90ab09125bcd4c09 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Sun, 29 Jul 2007 13:11:16 +0000 Subject: [PATCH] - Change USE_XLIB=yes to USE_XORG=x11 - Bump PORTREVISION Suggested by: miwi Approved by: garga (mentor, implicit) --- x11-toolkits/tk80/Makefile | 5 +++-- x11-toolkits/tk82/Makefile | 7 +++++-- x11-toolkits/tk83/Makefile | 7 +++++-- x11-toolkits/tk84/Makefile | 5 +++-- x11-toolkits/tk85/Makefile | 5 +++-- x11-toolkits/tk86/Makefile | 5 +++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile index f63b226e404a..99b0f58564ff 100644 --- a/x11-toolkits/tk80/Makefile +++ b/x11-toolkits/tk80/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits tk80 MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_0 @@ -20,7 +20,7 @@ USE_TCL= 80 USE_TCL_BUILD= 80 NO_LATEST_LINK= yes -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix GNU_CONFIGURE= yes @@ -281,6 +281,7 @@ MLINKS= 3DBorder.3 Tk_Get3DBorder.3 \ .endif post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's/\.[3n]/&.gz/g' ${WRKSRC}/mkLinks post-configure: diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile index ff921000df0b..5b0b63b96017 100644 --- a/x11-toolkits/tk82/Makefile +++ b/x11-toolkits/tk82/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.2.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-toolkits tk82 MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_2 @@ -20,7 +20,7 @@ USE_TCL= 82 USE_TCL_BUILD= 82 LATEST_LINK= tk82 -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes @@ -309,6 +309,9 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} +post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure + post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile index 0d196cfaa272..a3f670a325ac 100644 --- a/x11-toolkits/tk83/Makefile +++ b/x11-toolkits/tk83/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.3.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits tk83 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -20,7 +20,7 @@ USE_TCL= 83 USE_TCL_BUILD= 83 LATEST_LINK= tk83 -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix GNU_CONFIGURE= yes @@ -327,6 +327,9 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} +post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure + post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 6ada8f1f2c0b..0a7f0c72884b 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.4.15 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -19,7 +19,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Graphical toolkit for TCL LATEST_LINK?= tk84 -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix GNU_CONFIGURE= yes @@ -382,6 +382,7 @@ pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in .if defined(BUILDING_TK_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 189d8faec813..f48fac5760e8 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.5.a.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -18,7 +18,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Graphical toolkit for TCL LATEST_LINK?= tk85 -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix GNU_CONFIGURE= yes @@ -401,6 +401,7 @@ pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in .if defined(BUILDING_TK_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index 189d8faec813..f48fac5760e8 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.5.a.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -18,7 +18,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Graphical toolkit for TCL LATEST_LINK?= tk85 -USE_XLIB= yes +USE_XORG= x11 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix GNU_CONFIGURE= yes @@ -401,6 +401,7 @@ pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi post-patch: + @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in .if defined(BUILDING_TK_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \