- Fix build on 5.x.

- Use REINPLACE_CMD.
- Bump PORTREVISION.

3 files changed, 49 insertions, 49 deletions

diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 719fe029596e..92b1c1d1d673 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
@@ -26,6 +27,7 @@ CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=${TK_LIB_FILE}
 PKGINSTALL=	${PKGDIR}/pkg-install.wish
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
+USE_REINPLACE=	yes
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	4
@@ -41,8 +43,7 @@ TK_LIB_FILE=	${TK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
 
 post-patch:
-	@${CP} ${WRKSRC}/mkLinks ${WRKSRC}/mkLinks.orig
-	@${SED} -e 's/\.[3n]/&.gz/g' ${WRKSRC}/mkLinks.orig > ${WRKSRC}/mkLinks
+	@${REINPLACE_CMD} -e 's/\.[3n]/&.gz/g' ${WRKSRC}/mkLinks
 
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
diff --git a/x11-toolkits/tk80/files/Makefile.lib b/x11-toolkits/tk80/files/Makefile.lib
index eb7a86c9f701..7758881867e5 100644
--- a/x11-toolkits/tk80/files/Makefile.lib
+++ b/x11-toolkits/tk80/files/Makefile.lib
@@ -6,53 +6,53 @@ CFLAGS+=	-I. -I./../generic -I../bitmaps -I/usr/X11R6/include \
 		-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
+	tk3d.c tkArgv.c \
+	tkAtom.c tkBind.c	\
+	tkBitmap.c tkClipboard.c \
+	tkCmds.c tkColor.c \
+	tkConfig.c tkCursor.c \
+	tkError.c tkEvent.c \
+	tkFocus.c tkFont.c \
+	tkGet.c tkGC.c \
+	tkGeometry.c tkGrab.c \
+	tkGrid.c \
+	tkMain.c tkOption.c \
+	tkPack.c tkPlace.c \
+	tkSelect.c \
+	tkUtil.c \
+	tkVisual.c tkWindow.c \
+	tkButton.c \
+	tkEntry.c tkFrame.c \
+	tkListbox.c tkMenu.c \
+	tkMenubutton.c tkMessage.c \
+	tkScale.c tkScrollbar.c \
+	tkCanvas.c tkCanvArc.c \
+	tkCanvBmap.c tkCanvImg.c \
+	tkCanvLine.c tkCanvPoly.c \
+	tkCanvPs.c tkCanvText.c \
+	tkCanvUtil.c \
+	tkCanvWind.c tkRectOval.c \
+	tkTrig.c tkImage.c \
+	tkImgBmap.c tkImgGIF.c \
+	tkImgPPM.c \
+	tkImgPhoto.c tkText.c \
+	tkTextBTree.c tkTextDisp.c \
+	tkTextIndex.c tkTextMark.c \
+	tkTextTag.c tkTextWind.c \
+	tkMenuDraw.c tkTextImage.c \
+	tkUnix.c tkUnixCursor.c tkUnixDraw.c \
+	tkUnixEvent.c tkUnixInit.c \
+	tkUnixSelect.c tkUnixWm.c \
+	tkUnixXId.c tkUnix3d.c\
+	tkUnixButton.c tkUnixColor.c \
+	tkUnixEmbed.c \
+	tkUnixFocus.c tkUnixFont.c\
+	tkUnixMenu.c tkUnixDialog.c\
+	tkUnixMenubu.c tkUnixScale.c\
+	tkUnixScrlbr.c  tkUnixSend.c
+
+.PATH:	../generic
 
 .include <bsd.lib.mk>
diff --git a/x11-toolkits/tk80/files/makefile b/x11-toolkits/tk80/files/makefile
index 7c4d34e0a0e6..050b1e13097e 100644
--- a/x11-toolkits/tk80/files/makefile
+++ b/x11-toolkits/tk80/files/makefile
@@ -1,5 +1,4 @@
 all:
-	for f in ../generic/*.o; do ln -sf $$f; done
 	make -f Makefile wish
 test:
 	make -f Makefile test