ports/57416: ports/x11-toolkits/tk80 broken under FreeBSD 5.1

[Gerhard Gonter]

>Number:         57416
>Category:       ports
>Synopsis:       ports/x11-toolkits/tk80 broken under FreeBSD 5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 30 11:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Gerhard Gonter
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
WU-Wien
>Environment:
System: FreeBSD chuck.iris-net.home 5.1-CURRENT FreeBSD 5.1-CURRENT #4: Wed Sep 24 17:21:47 CEST 2003 root at chuck.iris-net.home:/usr/obj/usr/src/sys/CHUCK i386


>Description:
	ports/x11-toolkits/tk80 can not be built on FreeBSD 5.1.  This seems
	to have something to do with a change in <bsd.lib.mk> and the way
	this port uses it.

>How-To-Repeat:
	See http://bento.freebsd.org/errorlogs/i386-5-latest/tk-8.0.5.log

>Fix:

	The port can be built with these changes.


diff -ruN tk80-orig/Makefile tk80/Makefile
--- tk80-orig/Makefile	Thu Feb 20 20:20:26 2003
+++ tk80/Makefile	Tue Sep 30 20:14:51 2003
@@ -47,6 +47,7 @@
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
+	@cd ${WRKSRC} && ${LN} -s ../generic/*.c .
 
 pre-build:
 	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
diff -ruN tk80-orig/files/Makefile.lib tk80/files/Makefile.lib
--- tk80-orig/files/Makefile.lib	Wed Mar 18 01:56:26 1998
+++ tk80/files/Makefile.lib	Tue Sep 30 19:55:00 2003
@@ -10,40 +10,40 @@
 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)/tk3d.c $(UNIX_DIR)/tkArgv.c \
+	$(UNIX_DIR)/tkAtom.c $(UNIX_DIR)/tkBind.c	\
+	$(UNIX_DIR)/tkBitmap.c $(UNIX_DIR)/tkClipboard.c \
+	$(UNIX_DIR)/tkCmds.c $(UNIX_DIR)/tkColor.c \
+	$(UNIX_DIR)/tkConfig.c $(UNIX_DIR)/tkCursor.c \
+	$(UNIX_DIR)/tkError.c $(UNIX_DIR)/tkEvent.c \
+	$(UNIX_DIR)/tkFocus.c $(UNIX_DIR)/tkFont.c \
+	$(UNIX_DIR)/tkGet.c $(UNIX_DIR)/tkGC.c \
+	$(UNIX_DIR)/tkGeometry.c $(UNIX_DIR)/tkGrab.c \
+	$(UNIX_DIR)/tkGrid.c \
+	$(UNIX_DIR)/tkMain.c $(UNIX_DIR)/tkOption.c \
+	$(UNIX_DIR)/tkPack.c $(UNIX_DIR)/tkPlace.c \
+	$(UNIX_DIR)/tkSelect.c \
+	$(UNIX_DIR)/tkUtil.c \
+	$(UNIX_DIR)/tkVisual.c $(UNIX_DIR)/tkWindow.c \
+	$(UNIX_DIR)/tkButton.c \
+	$(UNIX_DIR)/tkEntry.c $(UNIX_DIR)/tkFrame.c \
+	$(UNIX_DIR)/tkListbox.c $(UNIX_DIR)/tkMenu.c \
+	$(UNIX_DIR)/tkMenubutton.c $(UNIX_DIR)/tkMessage.c \
+	$(UNIX_DIR)/tkScale.c $(UNIX_DIR)/tkScrollbar.c \
+	$(UNIX_DIR)/tkCanvas.c $(UNIX_DIR)/tkCanvArc.c \
+	$(UNIX_DIR)/tkCanvBmap.c $(UNIX_DIR)/tkCanvImg.c \
+	$(UNIX_DIR)/tkCanvLine.c $(UNIX_DIR)/tkCanvPoly.c \
+	$(UNIX_DIR)/tkCanvPs.c $(UNIX_DIR)/tkCanvText.c \
+	$(UNIX_DIR)/tkCanvUtil.c \
+	$(UNIX_DIR)/tkCanvWind.c $(UNIX_DIR)/tkRectOval.c \
+	$(UNIX_DIR)/tkTrig.c $(UNIX_DIR)/tkImage.c \
+	$(UNIX_DIR)/tkImgBmap.c $(UNIX_DIR)/tkImgGIF.c \
+	$(UNIX_DIR)/tkImgPPM.c \
+	$(UNIX_DIR)/tkImgPhoto.c $(UNIX_DIR)/tkText.c \
+	$(UNIX_DIR)/tkTextBTree.c $(UNIX_DIR)/tkTextDisp.c \
+	$(UNIX_DIR)/tkTextIndex.c $(UNIX_DIR)/tkTextMark.c \
+	$(UNIX_DIR)/tkTextTag.c $(UNIX_DIR)/tkTextWind.c \
+	$(UNIX_DIR)/tkMenuDraw.c $(UNIX_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 \

>Release-Note:
>Audit-Trail:
>Unformatted: