diff options
author | Satoshi Asami <asami@FreeBSD.org> | 1997-03-11 11:02:41 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 1997-03-11 11:02:41 +0000 |
commit | f68e96f599ea5ab41ea21e561191490ab993d244 (patch) | |
tree | a04779ccd63311ca4eb17414cd3b4bd91da5633d /japanese/tcl76 | |
parent | 21aaf2b3060ca8f0f808de61522f671624e8e31c (diff) | |
download | ports-f68e96f599ea5ab41ea21e561191490ab993d244.tar.gz ports-f68e96f599ea5ab41ea21e561191490ab993d244.zip |
Bugfix to set RANLIB correctly. Also set VERSION in port Makefile.
Closes PR ports/2937.
Submitted by: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
Notes
Notes:
svn path=/head/; revision=5935
Diffstat (limited to 'japanese/tcl76')
-rw-r--r-- | japanese/tcl76/Makefile | 12 | ||||
-rw-r--r-- | japanese/tcl76/files/Makefile.lib | 2 | ||||
-rw-r--r-- | japanese/tcl76/files/patch-ac | 13 |
3 files changed, 18 insertions, 9 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. |