4 files changed, 33 insertions, 12 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 3dc52d7f4723..f59fc3b9a5dc 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -7,19 +7,18 @@ PORTREVISION=	7
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/${PORTNAME}/BLT/BLT%20${PORTVERSION} \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
-
 DISTNAME=	BLT${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/${PORTNAME}\/BLT\/BLT%20${PORTVERSION}/} \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
 PATCH_SITE_SUBDIR=	${PORTNAME}
 PATCHFILES=	blt2.4z-patch-2
-PATCH_DIST_STRIP= -p1
+PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Tk extension (with shared libs)
+COMMENT=	Extension for the Tk toolkit (with shared libs)
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
@@ -29,14 +28,16 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-Wall -Wno-uninitialized
 CFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
 
-USE_TK=		84+
-INVALID_TK_VER=	86
+USES+=		tk:84,85
 USE_XORG=	x11
 
-NO_STAGE=	yes
+post-patch:
+	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
+	    ${REINPLACE_CMD} -e '/^INSTALL_ROOT/s|$$|$${DESTDIR}|'
+
 post-install:
-	${LN} -sf libBLT24.so.3 ${PREFIX}/lib/libBLT24.so
-	${LN} -sf libBLTlite24.so.3 ${PREFIX}/lib/libBLTlite24.so
+	${LN} -sf libBLT24.so.3 ${STAGEDIR}${PREFIX}/lib/libBLT24.so
+	${LN} -sf libBLTlite24.so.3 ${STAGEDIR}${PREFIX}/lib/libBLTlite24.so
 
 CONFIGURE_ARGS+=--exec_prefix=${PREFIX} \
 		--enable-jpeg=${LOCALBASE} \
diff --git a/x11-toolkits/blt/files/patch-Makefile.in b/x11-toolkits/blt/files/patch-Makefile.in
new file mode 100644
index 000000000000..78305310c7b3
--- /dev/null
+++ b/x11-toolkits/blt/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2013-10-30 13:46:13.000000000 +0100
++++ Makefile.in	2013-10-30 13:46:28.000000000 +0100
+@@ -47,9 +47,6 @@
+ 	(cd library; $(MAKE) install)
+ 	(cd man; $(MAKE) install)
+ 	(cd demos; $(MAKE) install)
+-	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \
diff --git a/x11-toolkits/blt/files/patch-library_Makefile.in b/x11-toolkits/blt/files/patch-library_Makefile.in
new file mode 100644
index 000000000000..8fc445f4a815
--- /dev/null
+++ b/x11-toolkits/blt/files/patch-library_Makefile.in
@@ -0,0 +1,11 @@
+--- library/Makefile.in.orig	2013-10-30 13:44:51.000000000 +0100
++++ library/Makefile.in	2013-10-30 13:45:04.000000000 +0100
+@@ -60,7 +60,7 @@
+ 	for i in $(miscFiles) ; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
+ 	done 
+-	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \
diff --git a/x11-toolkits/blt/pkg-plist b/x11-toolkits/blt/pkg-plist
index 4082caf0afaf..dd1e922954ca 100644
--- a/x11-toolkits/blt/pkg-plist
+++ b/x11-toolkits/blt/pkg-plist
@@ -10,9 +10,6 @@ include/bltList.h
 include/bltPool.h
 include/bltTree.h
 include/bltVector.h
-lib/blt2.4/NEWS
-lib/blt2.4/PROBLEMS
-lib/blt2.4/README
 lib/blt2.4/bltCanvEps.pro
 lib/blt2.4/bltGraph.pro
 lib/blt2.4/dd_protocols/dd-color.tcl