Bugfix to set RANLIB correctly. Also set VERSION in port Makefile.

Closes PR ports/2937.

Submitted by:	Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>

5 files changed, 21 insertions, 13 deletions

diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 8c6b83edc76b..6a31ffaa10f8 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	tcl7.6jp
 # Version required:	7.6p2jp
-# Date created:		
+# Date created:		11 March 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/02 13:01:24 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/05 23:13:23 asami Exp $
 #
 
 DISTNAME=	tcl7.6p2
@@ -21,6 +21,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
+VERSION=	7.6jp
+
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 .else
@@ -35,11 +37,11 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} && rm *.o
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && rm *.o
 
 pre-install:
-	${MKDIR} ${PREFIX}/lib/tcl7.6jp
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib install PREFIX=${PREFIX}
+	${MKDIR} ${PREFIX}/lib/tcl${VERSION}
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/japanese/tcl76/files/Makefile.lib b/japanese/tcl76/files/Makefile.lib
index 54fd089cba50..90c451c4ea69 100644
--- a/japanese/tcl76/files/Makefile.lib
+++ b/japanese/tcl76/files/Makefile.lib
@@ -1,6 +1,4 @@
 NOPROFILE=	yes
-
-VERSION=	7.6jp
 LIB=		tcl${VERSION}
 TCL_LIBRARY=	${PREFIX}/lib/tcl${VERSION}
 CFLAGS+=	-I. -I./../generic \
diff --git a/japanese/tcl76/files/patch-ac b/japanese/tcl76/files/patch-ac
index 7b451b4f4ce3..87033473dcfd 100644
--- a/japanese/tcl76/files/patch-ac
+++ b/japanese/tcl76/files/patch-ac
@@ -1,5 +1,5 @@
---- tclConfig.sh.in.ORIG	Mon Feb 10 13:22:37 1997
-+++ tclConfig.sh.in	Mon Feb 10 13:23:28 1997
+--- ./tclConfig.sh.in.orig	Fri Jan 31 09:17:04 1997
++++ ./tclConfig.sh.in	Tue Mar  4 13:13:25 1997
 @@ -20,7 +20,7 @@
  TCL_CC='@CC@'
  
@@ -9,3 +9,12 @@
  
  # The name of the Tcl library (may be either a .a file or a shared library):
  TCL_LIB_FILE=@TCL_LIB_FILE@
+@@ -69,7 +69,7 @@
+ TCL_COMPAT_OBJS='@LIBOBJS@'
+ 
+ # Name of the ranlib program to use.
+-TCL_RANLIB='@RANLIB@'
++TCL_RANLIB=ranlib
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 66656896d7a3..00257ab10544 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -3,7 +3,7 @@
 # Date created:		
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/02 13:02:06 asami Exp $
 #
 
 DISTNAME=	tk4.2p2
@@ -41,13 +41,13 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} && rm -f *.o
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && rm -f *.o
 
 pre-install:
 	${MKDIR} ${PREFIX}/lib/tk${VERSION}
 
 post-install:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib install PREFIX=${PREFIX}
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
 	${LDCONFIG} -m ${PREFIX}/lib
 	@echo "**********"
 	@echo "IMPORTANT:"
diff --git a/japanese/tk42/files/Makefile.lib b/japanese/tk42/files/Makefile.lib
index b2be2e63b17a..cfba95ed3e2d 100644
--- a/japanese/tk42/files/Makefile.lib
+++ b/japanese/tk42/files/Makefile.lib
@@ -1,4 +1,3 @@
-VERSION=	4.2jp
 NOPROFILE=	yes
 LIB=		tk${VERSION}
 TK_LIBRARY=	${PREFIX}/lib/tk${VERSION}