Fake.

Switch tkcvs to tcl/tk82
2000-03-20 19:25:12 +00:00 · 2000-03-20 19:25:12 +00:00 · 2a7029372b
commit 2a7029372b
parent a6cc308e22
5 changed files with 101 additions and 21 deletions
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/03/05 18:30:26 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/03/20 19:25:13 espie Exp $

 DISTNAME=	tkcvs-6.0
 CATEGORIES=	devel
@ -14,10 +14,11 @@ PERMIT_DISTFILES_FTP=	Yes

 MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/

-RUN_DEPENDS=	/usr/local/bin/wish8.0:x11/tk80
+RUN_DEPENDS=	/usr/local/bin/wish8.2:x11/tk82

 NO_BUILD=	Yes
 NO_CONFIGURE=	Yes
+FAKE=		Yes

 do-install:
 	cd $(WRKSRC)/tkcvs; ./doinstall
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@ -1,8 +1,8 @@
 --- tkcvs/doinstall.orig	Tue Jan  9 22:17:52 1996
-+++ tkcvs/doinstall	Sun Apr 26 19:03:11 1998
+++ tkcvs/doinstall	Mon Mar 20 20:18:00 2000
@@ -2,10 +2,10 @@
 #
- # $Id: patch-aa,v 1.1.1.1 1998/06/15 05:35:00 todd Exp $
+ # $Id: patch-aa,v 1.2 2000/03/20 19:25:13 espie Exp $
 #
 -
 +PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@ -24,7 +24,7 @@
  
 -WISH=`which wish4.0`
 -if [ ! -f $WISH ]; then
-+WISH=`which wish8.0`
+WISH=`which wish8.2`
 +if [ ! -f ${WISH} ]
 +then
 +  WISH=`which wish4.2`
@ -51,12 +51,82 @@
 do
   if [ -d "$GDIR" ]; then
     break
-@@ -62,7 +72,7 @@
+@@ -46,15 +56,15 @@
+ 
+ # Find out where we want the system installed.
+ 
+-if [ ! -d "$INSTALLDIR" ]; then
+if [ ! -d "${DESTDIR}$INSTALLDIR" ]; then
+   echo "Enter the top level installation directory:"
+   INSTALLDIR=`line`
+-  mkdir -p $INSTALLDIR
+-  if [ ! -d $INSTALLDIR ]; then
+  mkdir -p ${DESTDIR}$INSTALLDIR
+  if [ ! -d ${DESTDIR}$INSTALLDIR ]; then
+     echo "I cant create that directory"
+     exit 1
+   fi
+-  if [ ! -w $INSTALLDIR ]; then
+  if [ ! -w ${DESTDIR}$INSTALLDIR ]; then
+     echo "I cant write to that directory"
+     exit 1
+   fi
+@@ -62,25 +72,25 @@
 
 # Some directories we have to create.
 
 -LDIR=${INSTALLDIR}/bitmaps
 +LDIR=${INSTALLDIR}/tkcvs/bitmaps
 TCDIR=${INSTALLDIR}/tkcvs
- mkdir -p $LDIR $TCDIR
+-mkdir -p $LDIR $TCDIR
+mkdir -p ${DESTDIR}$LDIR ${DESTDIR}$TCDIR
 for dir in $LDIR $TCDIR
+ do
+-  if [ ! -d $dir ]; then
+  if [ ! -d ${DESTDIR}$dir ]; then
+     echo "I cant create the directory $dir"
+     exit 1
+   fi
+ done
+ 
+-if [ ! -d "$BINDIR" ]; then
+if [ ! -d ${DESTDIR}"$BINDIR" ]; then
+   echo "Enter the directory where you want the programs to be stored:"
+   BINDIR=`line`
+-  if [ ! -d "$BINDIR" ]; then
+  if [ ! -d ${DESTDIR}"$BINDIR" ]; then
+     echo "I cant find that directory"
+     exit 1
+   fi
+-  if [ ! -w "$BINDIR" ]; then
+  if [ ! -w ${DESTDIR}"$BINDIR" ]; then
+     echo "I cant write to that directory" 
+     exit 1 
+   fi
+@@ -94,21 +104,21 @@
+       -e "/GDIR/ s;;$GDIR;g" \
+       -e "/EDITOR/ s;;$EDITOR;g" \
+       -e "/TCDIR/ s;;$TCDIR;g" ${file}.blank >$file
+-    $INSTALL_PROG -m 555 $file $BINDIR
+    $INSTALL_PROG -m 555 $file ${DESTDIR}$BINDIR
+     rm -f $file
+   fi
+ done
+ 
+ for f in *.n ../tkdiff/*.n
+ do
+-        $INSTALL_PROG -m 444 $f $MANDIR
+        $INSTALL_PROG -m 444 $f ${DESTDIR}$MANDIR
+ done
+ for f in *.tcl
+ do
+-        $INSTALL_PROG -m 444 $f $TCDIR
+        $INSTALL_PROG -m 444 $f ${DESTDIR}$TCDIR
+ done
+ for f in ../bitmaps/*.xbm
+ do
+-        $INSTALL_PROG -m 444 $f $LDIR
+        $INSTALL_PROG -m 444 $f ${DESTDIR}$LDIR
+ done
+-$INSTALL_PROG -m 444 tclIndex $TCDIR
+$INSTALL_PROG -m 444 tclIndex ${DESTDIR}$TCDIR
--- a/devel/tkcvs/patches/patch-ab
+++ b/devel/tkcvs/patches/patch-ab
@ -4,7 +4,7 @@
 #!/bin/sh
 # \
 -	exec tclsh $0 ${1+"$@"}
-+	exec tclsh8.0 $0 ${1+"$@"}
+	exec tclsh8.2 $0 ${1+"$@"}
 
- # $Id: patch-ab,v 1.1.1.1 1998/06/15 05:35:00 todd Exp $
+ # $Id: patch-ab,v 1.2 2000/03/20 19:25:13 espie Exp $
 #
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@ -1,20 +1,27 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/15 07:47:40 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2000/03/20 19:25:12 espie Exp $
 # $FreeBSD: Makefile,v 1.26 2000/01/05 07:11:48 jseger Exp $

 DISTNAME=	tcl8.2.3
 PKGNAME=	tcl-8.2.3
 CATEGORIES=	lang
+NEED_VERSION=	1.191
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR= tcl8_2

-NEED_VERSION=	1.191
-
 MAINTAINER=	angelos@openbsd.org

+LICENSE_TYPE=		BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
 SEPARATE_BUILD=	concurrent
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	Yes
+CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
+FAKE=		Yes

 .if (${MACHINE_ARCH} == "mips")
 CONFIGURE_ARGS+= --disable-load
@ -23,9 +30,6 @@ CONFIGURE_ENV=	PORTSDIR="${PORTSDIR}"

 WRKDIST=	${WRKDIR}/${DISTNAME}/unix

-post-install:
-	@${LDCONFIG} -m ${PREFIX}/lib
-
 test:	build
 	@cd ${WRKSRC} && make test

--- a/x11/tk82/Makefile
+++ b/x11/tk82/Makefile
@ -1,5 +1,5 @@
 # $FreeBSD: Makefile,v 1.32 2000/01/05 07:12:09 jseger Exp $
-# $OpenBSD: Makefile,v 1.4 2000/03/05 18:30:47 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/03/20 19:25:13 espie Exp $

 DISTNAME=	tk8.2.3
 PKGNAME=	tk-8.2.3
@ -10,19 +10,24 @@ MASTER_SITE_SUBDIR= tcl8_2

 MAINTAINER=	angelos@openbsd.org

+LICENSE_TYPE=		BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
 LIB_DEPENDS=	tcl82.1.3:lang/tcl82

 SEPARATE_BUILD=	concurrent
-GNU_CONFIGURE=	Yes
+HAS_CONFIGURE=	Yes
+CONFIGURE_ARGS+=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --with-tcl="${PREFIX}/lib/tcl8.2"
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+FAKE=		Yes

 WRKDIST=	${WRKDIR}/${DISTNAME}/unix

-post-install:
-	@${LDCONFIG} -m ${PREFIX}/lib
-
 test:	build
 	@cd ${WRKSRC} && make test