diff options
| -rw-r--r-- | x11/XF86Setup/Makefile | 16 | ||||
| -rw-r--r-- | x11/XF86Setup/distinfo | 4 | ||||
| -rw-r--r-- | x11/XF86Setup/patches/patch-aa | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index 17fdeb7136b..bc57616065a 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2004/03/08 20:27:17 minskim Exp $ +# $NetBSD: Makefile,v 1.33 2005/01/22 03:58:32 minskim Exp $ DISTNAME= XF86Setup-3.3.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 @@ -10,17 +10,13 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= Graphical configuration tool for XFree86 -BUILD_DEPENDS= tcl>=8.3.2:../../lang/tcl83 -BUILD_DEPENDS+= tk>=8.3.2:../../x11/tk83 - ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR}/hw/xfree86/XF86Setup -TCLLIB= ${LOCALBASE}/lib/libtcl83.a -TKLIB= ${LOCALBASE}/lib/libtk83.a NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL +USE_BUILDLINK3= yes USE_IMAKE= yes .if !defined(X11_RELEASE) && !defined(CHECK_X11) @@ -31,7 +27,13 @@ PKG_SKIP_REASON= "This package doesn't work with your X11 distribution." .endif .endif +.include "../../lang/tcl/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" + pre-configure: + ${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.tmp + ${SED} -e "s/TCLTK_LIBRARIES =/TCLTK_LIBRARIES = `${GREP} TCL_LIBS ${TCLCONFIG_SH} | ${AWK} -F \"'\" '{ print $$2 }'`/" \ + < ${WRKSRC}/Imakefile.tmp > ${WRKSRC}/Imakefile @${TOUCH} ${WRKSRC}/res_cpp_symbol ${CP} ${WRKSRC}/main.c ${WRKSRC}/main.c.orig ${SED} -e 's:PKG_PREFIX:${PREFIX}:g' ${WRKSRC}/main.c.orig > ${WRKSRC}/main.c diff --git a/x11/XF86Setup/distinfo b/x11/XF86Setup/distinfo index aab36bc70cd..f93d3adcd99 100644 --- a/x11/XF86Setup/distinfo +++ b/x11/XF86Setup/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/07/22 21:26:41 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/01/22 03:58:32 minskim Exp $ SHA1 (XF86Setup-3.3.6.tar.bz2) = 591bc872dfcd675a4ab07b857b4ed70f0d9141d9 Size (XF86Setup-3.3.6.tar.bz2) = 395303 bytes -SHA1 (patch-aa) = 050e3d59220bbcfa1e64e202d219bf7018acda7b +SHA1 (patch-aa) = e57e3aa582008c8771384e79e28b866480599cc5 SHA1 (patch-ab) = ee820199301bbdfbe6cfd9f1a4cf08ff32041750 SHA1 (patch-ac) = dd92b1bbd264ec520a16ad1e1968634c011c5857 SHA1 (patch-ad) = 7231396c7686fa1d93fc70f9bfef22cf5be3fc6c diff --git a/x11/XF86Setup/patches/patch-aa b/x11/XF86Setup/patches/patch-aa index 4f110cc316a..d1a4f095e26 100644 --- a/x11/XF86Setup/patches/patch-aa +++ b/x11/XF86Setup/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2001/07/22 21:26:41 agc Exp $ +$NetBSD: patch-aa,v 1.8 2005/01/22 03:58:32 minskim Exp $ --- Imakefile.orig Tue Jul 20 19:23:50 1999 +++ Imakefile Sun Jul 22 23:13:29 2001 @@ -12,12 +12,12 @@ $NetBSD: patch-aa,v 1.7 2001/07/22 21:26:41 agc Exp $ + +TCLLIBDIR= $(LOCALBASE)/lib +TCLINCDIR= $(LOCALBASE)/include -+TCLLIBNAME= tcl83 ++TCLLIBNAME= tcl +TCLLIBRARY= -L$(TCLLIBDIR) -l$(TCLLIBNAME) + +TKLIBDIR= $(LOCALBASE)/lib +TKINCDIR= $(LOCALBASE)/include -+TKLIBNAME= tk83 ++TKLIBNAME= tk +TKLIBRARY= -L$(TKLIBDIR) -l$(TKLIBNAME) + #if XF86SetupUsesStaticTk |