6 files changed, 149 insertions, 2 deletions

diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index de99a3458f9a..9dc790aef49f 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1997/11/26 22:48:50 pst Exp $
+# $Id: Makefile,v 1.4 1997/12/01 16:50:49 pst Exp $
 #
 
 DISTNAME=	tcl8.0p2
@@ -18,6 +18,18 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	2
+MAKEFILE=	makefile
+
+post-configure:
+	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
+	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
+
+pre-build:
+	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
+	   SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/lang/tcl80/files/Makefile.lib b/lang/tcl80/files/Makefile.lib
new file mode 100644
index 000000000000..aa89c9ecf2e8
--- /dev/null
+++ b/lang/tcl80/files/Makefile.lib
@@ -0,0 +1,49 @@
+NOPROFILE=	yes
+LIB=		tcl80
+TCL_LIBRARY=	${PREFIX}/lib/tcl8.0
+CFLAGS+=	-I. -I./../generic \
+		-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
+		-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
+		-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
+		-DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1\
+		-DHAVE_SYS_FILIO_H=1 \
+		-DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
+		-DTCL_PACKAGE_PATH="\"${PREFIX}/lib\""
+
+
+
+GENERIC_DIR=	../generic
+UNIX_DIR=	.
+
+SRCS=	\
+		$(GENERIC_DIR)/panic.c $(GENERIC_DIR)/regexp.c\
+		$(GENERIC_DIR)/tclAsync.c $(GENERIC_DIR)/tclBasic.c \
+		$(GENERIC_DIR)/tclCkalloc.c $(GENERIC_DIR)/tclClock.c \
+		$(GENERIC_DIR)/tclCmdAH.c $(GENERIC_DIR)/tclCmdIL.c \
+		$(GENERIC_DIR)/tclCmdMZ.c $(GENERIC_DIR)/tclDate.c \
+		$(GENERIC_DIR)/tclEnv.c $(GENERIC_DIR)/tclEvent.c \
+		$(GENERIC_DIR)/tclFCmd.c \
+		$(GENERIC_DIR)/tclFileName.c \
+		$(GENERIC_DIR)/tclGet.c $(GENERIC_DIR)/tclHash.c \
+		$(GENERIC_DIR)/tclHistory.c $(GENERIC_DIR)/tclInterp.c \
+		$(GENERIC_DIR)/tclIO.c 	$(GENERIC_DIR)/tclIOCmd.c \
+		$(GENERIC_DIR)/tclIOSock.c $(GENERIC_DIR)/tclIOUtil.c \
+		$(GENERIC_DIR)/tclLink.c $(GENERIC_DIR)/tclLoad.c \
+		$(GENERIC_DIR)/tclMain.c $(GENERIC_DIR)/tclNotify.c \
+		$(GENERIC_DIR)/tclParse.c $(GENERIC_DIR)/tclPkg.c \
+		$(GENERIC_DIR)/tclPosixStr.c $(GENERIC_DIR)/tclPreserve.c \
+		$(GENERIC_DIR)/tclProc.c $(GENERIC_DIR)/tclUtil.c \
+		$(GENERIC_DIR)/tclVar.c $(UNIX_DIR)/tclMtherr.c \
+		$(GENERIC_DIR)/tclCompile.c $(GENERIC_DIR)/tclExecute.c\
+		$(GENERIC_DIR)/tclBinary.c $(GENERIC_DIR)/tclCompExpr.c\
+		$(GENERIC_DIR)/tclIndexObj.c $(GENERIC_DIR)/tclListObj.c\
+		$(GENERIC_DIR)/tclNamesp.c\
+		$(GENERIC_DIR)/tclObj.c $(GENERIC_DIR)/tclPipe.c\
+		$(GENERIC_DIR)/tclStringObj.c $(GENERIC_DIR)/tclTimer.c\
+		$(UNIX_DIR)/tclUnixChan.c $(UNIX_DIR)/tclUnixFCmd.c \
+		$(UNIX_DIR)/tclUnixFile.c $(UNIX_DIR)/tclUnixNotfy.c \
+		$(UNIX_DIR)/tclUnixPipe.c $(UNIX_DIR)/tclUnixSock.c \
+		$(UNIX_DIR)/tclUnixTime.c $(UNIX_DIR)/tclUnixInit.c \
+		$(UNIX_DIR)/tclLoadDl.c $(UNIX_DIR)/tclUnixEvent.c
+
+.include <bsd.lib.mk>
diff --git a/lang/tcl80/files/makefile b/lang/tcl80/files/makefile
new file mode 100644
index 000000000000..4f51bb5255f1
--- /dev/null
+++ b/lang/tcl80/files/makefile
@@ -0,0 +1,8 @@
+all:
+	for f in ../generic/*.o; do ln -sf $$f; done
+	make -f Makefile tclsh
+test:
+	make -f Makefile test
+install:
+	make -f Makefile install
+
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index cdf9ea574ae5..a56197057caf 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1997/11/26 22:49:14 pst Exp $
+# $Id: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
 #
 
 DISTNAME=	tk8.0p2
@@ -20,6 +20,18 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
+SHLIB_MAJOR=    1
+SHLIB_MINOR=    2
+MAKEFILE=       makefile
+
+post-configure:
+	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
+	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
+
+pre-build:
+	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
+	    SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11-toolkits/tk80/files/Makefile.lib b/x11-toolkits/tk80/files/Makefile.lib
new file mode 100644
index 000000000000..eb7a86c9f701
--- /dev/null
+++ b/x11-toolkits/tk80/files/Makefile.lib
@@ -0,0 +1,58 @@
+NOPROFILE=	yes
+LIB=		tk80
+TK_LIBRARY=	${PREFIX}/lib/tk80
+CFLAGS+=	-I. -I./../generic -I../bitmaps -I/usr/X11R6/include \
+		-I${PREFIX}/include/tcl8.0/generic \
+		-DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DSTDC_HEADERS=1 \
+		 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 \
+		 -DTK_LIBRARY=\"${TK_LIBRARY}\" 
+GENERIC_DIR=	../generic
+UNIX_DIR=	.
+
+SRCS=	\
+	$(GENERIC_DIR)/tk3d.c $(GENERIC_DIR)/tkArgv.c \
+	$(GENERIC_DIR)/tkAtom.c $(GENERIC_DIR)/tkBind.c	\
+	$(GENERIC_DIR)/tkBitmap.c $(GENERIC_DIR)/tkClipboard.c \
+	$(GENERIC_DIR)/tkCmds.c $(GENERIC_DIR)/tkColor.c \
+	$(GENERIC_DIR)/tkConfig.c $(GENERIC_DIR)/tkCursor.c \
+	$(GENERIC_DIR)/tkError.c $(GENERIC_DIR)/tkEvent.c \
+	$(GENERIC_DIR)/tkFocus.c $(GENERIC_DIR)/tkFont.c \
+	$(GENERIC_DIR)/tkGet.c $(GENERIC_DIR)/tkGC.c \
+	$(GENERIC_DIR)/tkGeometry.c $(GENERIC_DIR)/tkGrab.c \
+	$(GENERIC_DIR)/tkGrid.c \
+	$(GENERIC_DIR)/tkMain.c $(GENERIC_DIR)/tkOption.c \
+	$(GENERIC_DIR)/tkPack.c $(GENERIC_DIR)/tkPlace.c \
+	$(GENERIC_DIR)/tkSelect.c \
+	$(GENERIC_DIR)/tkUtil.c \
+	$(GENERIC_DIR)/tkVisual.c $(GENERIC_DIR)/tkWindow.c \
+	$(GENERIC_DIR)/tkButton.c \
+	$(GENERIC_DIR)/tkEntry.c $(GENERIC_DIR)/tkFrame.c \
+	$(GENERIC_DIR)/tkListbox.c $(GENERIC_DIR)/tkMenu.c \
+	$(GENERIC_DIR)/tkMenubutton.c $(GENERIC_DIR)/tkMessage.c \
+	$(GENERIC_DIR)/tkScale.c $(GENERIC_DIR)/tkScrollbar.c \
+	$(GENERIC_DIR)/tkCanvas.c $(GENERIC_DIR)/tkCanvArc.c \
+	$(GENERIC_DIR)/tkCanvBmap.c $(GENERIC_DIR)/tkCanvImg.c \
+	$(GENERIC_DIR)/tkCanvLine.c $(GENERIC_DIR)/tkCanvPoly.c \
+	$(GENERIC_DIR)/tkCanvPs.c $(GENERIC_DIR)/tkCanvText.c \
+	$(GENERIC_DIR)/tkCanvUtil.c \
+	$(GENERIC_DIR)/tkCanvWind.c $(GENERIC_DIR)/tkRectOval.c \
+	$(GENERIC_DIR)/tkTrig.c $(GENERIC_DIR)/tkImage.c \
+	$(GENERIC_DIR)/tkImgBmap.c $(GENERIC_DIR)/tkImgGIF.c \
+	$(GENERIC_DIR)/tkImgPPM.c \
+	$(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkText.c \
+	$(GENERIC_DIR)/tkTextBTree.c $(GENERIC_DIR)/tkTextDisp.c \
+	$(GENERIC_DIR)/tkTextIndex.c $(GENERIC_DIR)/tkTextMark.c \
+	$(GENERIC_DIR)/tkTextTag.c $(GENERIC_DIR)/tkTextWind.c \
+	$(GENERIC_DIR)/tkMenuDraw.c $(GENERIC_DIR)/tkTextImage.c \
+	$(UNIX_DIR)/tkUnix.c $(UNIX_DIR)/tkUnixCursor.c $(UNIX_DIR)/tkUnixDraw.c \
+	$(UNIX_DIR)/tkUnixEvent.c $(UNIX_DIR)/tkUnixInit.c \
+	$(UNIX_DIR)/tkUnixSelect.c $(UNIX_DIR)/tkUnixWm.c \
+	$(UNIX_DIR)/tkUnixXId.c $(UNIX_DIR)/tkUnix3d.c\
+	$(UNIX_DIR)/tkUnixButton.c $(UNIX_DIR)/tkUnixColor.c \
+	$(UNIX_DIR)/tkUnixEmbed.c \
+	$(UNIX_DIR)/tkUnixFocus.c $(UNIX_DIR)/tkUnixFont.c\
+	$(UNIX_DIR)/tkUnixMenu.c $(UNIX_DIR)/tkUnixDialog.c\
+	$(UNIX_DIR)/tkUnixMenubu.c $(UNIX_DIR)/tkUnixScale.c\
+	$(UNIX_DIR)/tkUnixScrlbr.c  $(UNIX_DIR)/tkUnixSend.c
+
+.include <bsd.lib.mk>
diff --git a/x11-toolkits/tk80/files/makefile b/x11-toolkits/tk80/files/makefile
new file mode 100644
index 000000000000..7c4d34e0a0e6
--- /dev/null
+++ b/x11-toolkits/tk80/files/makefile
@@ -0,0 +1,8 @@
+all:
+	for f in ../generic/*.o; do ln -sf $$f; done
+	make -f Makefile wish
+test:
+	make -f Makefile test
+install:
+	make -f Makefile install
+