aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-07-03 23:18:33 +0000
committerSteve Price <steve@FreeBSD.org>1998-07-03 23:18:33 +0000
commita1e8f57981adeb9400f82955e8c393ba8afa33e8 (patch)
treef658d15878c1f04b39c6bde7ea9639b1e0ba3008 /japanese
parentbb1b9a698fdbb50e1f20b4010d1fa235e6396255 (diff)
downloadports-a1e8f57981adeb9400f82955e8c393ba8afa33e8.tar.gz
ports-a1e8f57981adeb9400f82955e8c393ba8afa33e8.zip
Notes
Diffstat (limited to 'japanese')
-rw-r--r--japanese/expect/Makefile20
-rw-r--r--japanese/expect/files/patch-aa8
-rw-r--r--japanese/expect/files/patch-ab69
-rw-r--r--japanese/expect/pkg-plist24
4 files changed, 41 insertions, 80 deletions
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index 2a6c5d079bf4..659d40bd204e 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -1,24 +1,28 @@
# New ports collection makefile for: expect
-# Version required: 5.25
+# Version required: 5.26
# Date created: 17 Oct 1997
# Whom: taguchi
#
-# $Id: Makefile,v 1.6 1998/02/18 06:28:23 asami Exp $
+# $Id: Makefile,v 1.7 1998/02/22 08:35:03 fenner Exp $
#
-PKGNAME= ja-expect-5.25
+DISTNAME= expect-5.26
+PKGNAME= ja-expect-5.26
CATEGORIES= japanese lang tk42
MAINTAINER= taguchi@tohoku.iij.ad.jp
-LIB_DEPENDS= tk42jp\\.1\\.:${PORTSDIR}/japanese/tk42
+LIB_DEPENDS= tk80jp\\.1\\.:${PORTSDIR}/japanese/tk80
FILESDIR= ${.CURDIR}/../../lang/expect/files
+GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CFLAGS= -DKANJI -DKINPUT2
-CONFIGURE_ARGS= --enable-shared --with-tclconfig=${PREFIX}/lib/tcl7.6jp \
- --with-tkconfig=${PREFIX}/lib/tk4.2jp \
- --with-tclinclude=${PREFIX}/include/tcl7.6jp \
- --with-tkinclude=${PREFIX}/include/tk4.2jp
+CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ARGS= --enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
+ --with-tkconfig=${PREFIX}/lib/tk8.0jp \
+ --with-tclinclude=${PREFIX}/include/tcl8.0jp \
+ --with-tkinclude=${PREFIX}/include/tk8.0jp
NO_MAN_INSTALL= yes
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa
index f9835c0c2838..3c8885d35302 100644
--- a/japanese/expect/files/patch-aa
+++ b/japanese/expect/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG Fri Oct 17 14:53:29 1997
-+++ Makefile.in Fri Oct 17 14:54:11 1997
+--- Makefile.in.ORIG Mon Jun 29 10:12:36 1998
++++ Makefile.in Mon Jun 29 10:12:54 1998
@@ -30,7 +30,7 @@
TCL_LIBRARY = @TCL_LIBRARY@
@@ -227,7 +227,7 @@
$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
-@@ -682,7 +669,7 @@
+@@ -680,7 +667,7 @@
expect-$(VERSION).tar.gz: expect-$(VERSION).tar
gzip -fc expect-$(VERSION).tar > $@
@@ -236,7 +236,7 @@
rm -f .tmp
echo "set objdir" `pwd` > .tmp
if [ "$(srcdir)" = "." ] ; then \
-@@ -692,7 +679,7 @@
+@@ -690,7 +677,7 @@
echo "source all" >> .tmp
rootme=`pwd`; export rootme; \
srcdir=${srcdir} ; export srcdir ; \
diff --git a/japanese/expect/files/patch-ab b/japanese/expect/files/patch-ab
index 005ebf3c3b7d..5f6c66c3b314 100644
--- a/japanese/expect/files/patch-ab
+++ b/japanese/expect/files/patch-ab
@@ -1,33 +1,15 @@
---- configure.ORIG Fri Oct 17 10:31:25 1997
-+++ configure Fri Oct 17 10:34:10 1997
-@@ -527,7 +527,7 @@
+--- configure.in.orig Tue May 19 07:21:57 1998
++++ configure.in Mon Jun 29 10:38:49 1998
+@@ -10,7 +10,7 @@
# note when updating version numbers here, also update pkgIndex.in (see
# comments in Makefile)
EXP_MAJOR_VERSION=5
--EXP_MINOR_VERSION=25
-+EXP_MINOR_VERSION=25jp
+-EXP_MINOR_VERSION=26
++EXP_MINOR_VERSION=26jp
EXP_MICRO_VERSION=0
EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
-@@ -1236,6 +1236,8 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-@@ -2094,7 +2096,7 @@
- # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
- TCLHDIR="${ac_cv_c_tclh}"
- TCLHDIRDASHI="-I${ac_cv_c_tclh}"
-- TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`library
-+ TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`
- fi
- fi
-
-@@ -5738,14 +5740,14 @@
+@@ -1002,9 +1002,9 @@
if test x"$no_tk" != x"true" ; then
# libexpectk no longer exists
# X_PROGS="expectk \$(LIBEXPECTK)"
@@ -38,35 +20,10 @@
+ X_PROGS_INSTALLED=expectkjp_installed
else
X_PROGS="# no X support on this system"
- echo "configure: warning: No X based programs will be built" 1>&2
- echo " WARNING: Can't find Tk headers or library. You can still"
-- echo " build expect, but not expectk. See Expect's README for"
-+ echo " build expectjp, but not expectkjp. See Expect's README for"
- echo " information on how to obtain Tk. If Tk is installed, see"
- echo " Expect's INSTALL on how to tell configure where Tk is"
- echo " installed."
-@@ -5836,13 +5838,15 @@
- EXP_LIB_VERSION=$EXP_VERSION_NODOTS
- fi
-
-+VERSION=${EXP_LIB_VERSION}
-+
- EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}"
- EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}"
- EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a
-
- echo $ac_n "checking for type of library to build""... $ac_c" 1>&6
- echo "configure:5845: checking for type of library to build" >&5
--if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
-+if test "$enable_shared" = "yes" -a "x${TCL_SHLIB_SUFFIX}" != "x" ; then
- EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
- # EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
-@@ -6019,6 +6023,7 @@
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
- s%@CC@%$CC%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@RANLIB@%$RANLIB%g
- s%@subdirs@%$subdirs%g
+ AC_MSG_WARN([No X based programs will be built])
+@@ -1148,4 +1148,5 @@
+ AC_SUBST(SETUID)
+ AC_SUBST(UNSHARED_RANLIB)
+ AC_SUBST(DEFAULT_STTY_ARGS)
++AC_SUBST(INSTALL_SCRIPT)
+ AC_OUTPUT(Makefile pkgIndex)
diff --git a/japanese/expect/pkg-plist b/japanese/expect/pkg-plist
index 5dad72e2506c..2de2f9f3eabc 100644
--- a/japanese/expect/pkg-plist
+++ b/japanese/expect/pkg-plist
@@ -1,10 +1,10 @@
+bin/expectjp
+bin/expectkjp
bin/autoexpect-jp
bin/autopasswd-jp
bin/cryptdir-jp
bin/decryptdir-jp
bin/dislocate-jp
-bin/expectjp
-bin/expectkjp
bin/ftp-rfc-jp
bin/kibitz-jp
bin/lpunlock-jp
@@ -20,13 +20,13 @@ bin/unbuffer-jp
bin/weather-jp
bin/xkibitz-jp
bin/xpstat-jp
-include/expect5.25jp/Dbg.h
-include/expect5.25jp/tclRegexp.h
-include/expect5.25jp/expect.h
-include/expect5.25jp/expect_comm.h
-include/expect5.25jp/expect_tcl.h
-@dirrm include/expect5.25jp
-lib/expect5.25jp/pkgIndex.tcl
-@dirrm lib/expect5.25jp
-lib/libexpect525jp.a
-lib/libexpect525jp.so.1.0
+include/expect5.26jp/Dbg.h
+include/expect5.26jp/tclRegexp.h
+include/expect5.26jp/expect.h
+include/expect5.26jp/expect_comm.h
+include/expect5.26jp/expect_tcl.h
+@dirrm include/expect5.26jp
+lib/expect5.26jp/pkgIndex.tcl
+@dirrm lib/expect5.26jp
+lib/libexpect526jp.a
+lib/libexpect526jp.so.1.2