5 files changed, 63 insertions, 38 deletions

diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 099fd1c32653..04eefe608395 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -3,31 +3,31 @@
 # Date created:		26 Dec 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.5 1998/08/07 23:55:47 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/28 10:31:26 asami Exp $
 #
 
-DISTNAME=	tk8.0p2
-PKGNAME=	ja-tk-8.0.2
+DISTNAME=	tk8.0.3
+PKGNAME=	ja-tk-8.0.3
 CATEGORIES=	japanese x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tk8.0p2jp1.1b0.patch.gz
+PATCHFILES=	tk8.0.3jp1.1.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 
 VERSION=	8.0
-TOPDIR=		${WRKDIR}/tk${VERSION}
+TOPDIR=		${WRKDIR}/${DISTNAME}
 WRKSRC=		${TOPDIR}/unix
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
 .else
 PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
-GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
+USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp
 
 .if !defined(NOPORTDOCS)
@@ -48,7 +48,10 @@ post-install:
 		Incompat80jp ${PREFIX}/share/doc/tk${VERSION}jp; \
 	 )
 .endif
-	@${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
+		${LN} -sf libtk80jp.so.1.2 ${PREFIX}/lib/libtk80jp.so; \
+	fi
 	@${CAT}	${PKGDIR}/MESSAGE
 
 test:
diff --git a/japanese/tk80/distinfo b/japanese/tk80/distinfo
index b3363b288f95..d2513dae3236 100644
--- a/japanese/tk80/distinfo
+++ b/japanese/tk80/distinfo
@@ -1,2 +1,2 @@
-MD5 (tk8.0p2.tar.gz) = e7711ce7e584bf1c0388cdbb86ffe7cc
-MD5 (tk8.0p2jp1.1b0.patch.gz) = d7a7be8ba80e4573292d42879d08c6e8
+MD5 (tk8.0.3.tar.gz) = 0d738e6ca31b49067b0e6e7efdec6532
+MD5 (tk8.0.3jp1.1.patch.gz) = 5ed2eb4190eab76d10f8e50279da76a1
diff --git a/japanese/tk80/files/patch-aa b/japanese/tk80/files/patch-aa
index 13628c5a62f7..2b82b9b7a053 100644
--- a/japanese/tk80/files/patch-aa
+++ b/japanese/tk80/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.in.ORIG	Tue Jan  6 13:23:19 1998
-+++ configure.in	Tue Jan  6 13:24:45 1998
-@@ -9,6 +9,7 @@
+--- configure.in.ORIG	Fri Sep 25 13:59:42 1998
++++ configure.in	Fri Sep 25 14:07:23 1998
+@@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
- TK_PATCH_LEVEL="p2"
+ TK_PATCH_LEVEL=".3"
  VERSION=${TK_VERSION}
 +TCL_L10N=jp
  
  if test "${prefix}" = "NONE"; then
      prefix=/usr/local
-@@ -40,8 +41,8 @@
+@@ -51,8 +52,8 @@
  if test ! -d $TCL_BIN_DIR; then
      AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
  fi
@@ -19,20 +19,34 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -60,6 +61,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
+@@ -86,6 +87,8 @@
+ CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
+ CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 +
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -387,8 +390,10 @@
+@@ -535,7 +538,11 @@
+     TK_SHARED_BUILD=1
+     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+     TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
++    if test "X$PORTOBJFORMAT" = "Xelf"; then
++    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    else
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    fi
+     RANLIB=":"
+ else
+     TK_SHARED_BUILD=0
+@@ -576,10 +583,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
 +AC_SUBST(TCL_LIB_SPEC)
+ AC_SUBST(TCL_DBGX)
+ AC_SUBST(TCL_LIB_FLAG)
  AC_SUBST(TCL_SRC_DIR)
  AC_SUBST(TCL_VERSION)
 +AC_SUBST(TCL_L10N)
diff --git a/japanese/tk80/files/patch-ab b/japanese/tk80/files/patch-ab
index ba3bdfd3e6a4..2ceb612d219a 100644
--- a/japanese/tk80/files/patch-ab
+++ b/japanese/tk80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Tue Jan  6 13:23:29 1998
-+++ Makefile.in	Tue Jan  6 13:25:40 1998
+--- Makefile.in.ORIG	Fri Sep 25 13:59:32 1998
++++ Makefile.in	Fri Sep 25 14:10:31 1998
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -21,16 +21,16 @@
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
-@@ -94,7 +99,7 @@
+@@ -112,7 +117,7 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
 -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 +LIBS = @TCL_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
-@@ -135,7 +140,7 @@
+ # To turn off the security checks that disallow incoming sends when
+ # the X server appears to be insecure, reverse the comments on the
+@@ -148,7 +153,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -39,7 +39,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -148,6 +153,8 @@
+@@ -161,6 +166,8 @@
  TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
  
  TK_LIB_FILE = @TK_LIB_FILE@
@@ -47,8 +47,8 @@
 +TK_STATIC_LIB_FILE = libtk80$(TCL_L10N).a
  #TK_LIB_FILE = libtk.a
  
- # The symbol below provides support for dynamic loading and shared
-@@ -300,6 +307,10 @@
+ TK_LIB_FLAG = @TK_LIB_FLAG@
+@@ -320,6 +327,10 @@
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -59,19 +59,22 @@
  all: wish
  
  # The following target is configured by autoconf to generate either
-@@ -309,6 +320,11 @@
+@@ -328,6 +339,14 @@
+ 	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
- 	$(RANLIB) @TK_LIB_FILE@
- 
+ 	$(RANLIB) ${TK_LIB_FILE}
++.if ${PORTOBJFORMAT}X == elfX
++	ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`
++.endif
++
 +$(TK_STATIC_LIB_FILE): $(OBJS)
 +	rm -f $(TK_STATIC_LIB_FILE)
 +	ar cr $(TK_STATIC_LIB_FILE) $(OBJS)
 +	$(RANLIB) $(TK_STATIC_LIB_FILE)
-+
+ 
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -353,13 +369,13 @@
+@@ -377,13 +396,13 @@
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
@@ -87,10 +90,13 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -373,13 +389,19 @@
+@@ -397,13 +416,22 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
++.if ${PORTOBJFORMAT}X == elfX
++	@(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
++.endif
 +	@echo "Installing $(TK_STATIC_LIB_FILE)"
 +	@$(INSTALL_DATA) $(TK_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE)
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_STATIC_LIB_FILE))
@@ -108,7 +114,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -389,8 +411,18 @@
+@@ -413,8 +441,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -129,7 +135,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -449,10 +481,10 @@
+@@ -473,10 +511,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -143,7 +149,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -460,19 +492,26 @@
+@@ -484,19 +522,26 @@
  	    echo "Installing doc/$$i"; \
  	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
diff --git a/japanese/tk80/pkg-plist b/japanese/tk80/pkg-plist
index 0c2ae8d3947d..26e56e0e0e50 100644
--- a/japanese/tk80/pkg-plist
+++ b/japanese/tk80/pkg-plist
@@ -1,7 +1,9 @@
 bin/wish8.0jp
 lib/libtk80jp.a
 lib/libtk80jp.so.1.2
-@exec /sbin/ldconfig -m %B
+lib/libtk80jp.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/tk8.0jp/tk.h
 include/tk8.0jp/generic/default.h
 include/tk8.0jp/generic/ks_names.h