aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/tclExpat/Makefile17
-rw-r--r--textproc/tclExpat/distinfo4
-rw-r--r--textproc/tclExpat/files/Makefile2
-rw-r--r--textproc/tclExpat/pkg-plist4
4 files changed, 12 insertions, 15 deletions
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 9308507ddbc2..e71ab6030b9b 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -8,19 +8,18 @@ CATEGORIES= textproc tcl
MASTER_SITES= http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
MAINTAINER= mi@aldan.algebra.com
-COMMENT= The TCL interface to Expat library
+COMMENT= Tcl interface to Expat library
-LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
USE_LDCONFIG= yes
-USE_TCL= 84+
+USES= tcl
PLIST_SUB+= TCL_VERSION=${TCL_VER}
MAKEFILE= ${FILESDIR}/Makefile
MAKE_ENV+= TCL_VERSION=${TCL_VER}
-NO_STAGE= yes
# Remove the old version of expat bundled with the package:
post-extract:
${RM} -rf ${WRKSRC}/expat
@@ -32,12 +31,10 @@ post-build test:
cd ${WRKSRC} && ${TCLSH} test-error.tcl
post-install:
- ${MKDIR} ${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
${SED} 's|PREFIX|${PREFIX}|' < ${FILESDIR}/pkgIndex.tcl.in > \
- ${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME}/pkgIndex.tcl
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/share/doc/${PORTNAME}/
-.endif
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/textproc/tclExpat/distinfo b/textproc/tclExpat/distinfo
index ace3ef87229a..c6ede7c3529f 100644
--- a/textproc/tclExpat/distinfo
+++ b/textproc/tclExpat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TclExpat-1.1.tar.gz) = 3403e26a6cd3e84946a805d4482e7cf241af76c12bd2ec851b7f442bff3572a8
-SIZE (TclExpat-1.1.tar.gz) = 268538
+SHA256 (TclExpat-1.1.tar.gz) = c8bc32b2d38faebba98098e5047a932900a2b08d9f378182324f3c8b87731e40
+SIZE (TclExpat-1.1.tar.gz) = 269845
diff --git a/textproc/tclExpat/files/Makefile b/textproc/tclExpat/files/Makefile
index fcc323833835..55a3c7eaa10f 100644
--- a/textproc/tclExpat/files/Makefile
+++ b/textproc/tclExpat/files/Makefile
@@ -4,7 +4,7 @@
SRCS= tclexpat.c
SHLIB_NAME= libtclexpat.so.1
-LIBDIR= ${LOCALBASE}/lib
+LIBDIR= ${PREFIX}/lib
TCL_VERSION?= 8.4
TCL_DVER?= ${TCL_VERSION:S/.//}
diff --git a/textproc/tclExpat/pkg-plist b/textproc/tclExpat/pkg-plist
index c388166b1d75..4a928cf3eb94 100644
--- a/textproc/tclExpat/pkg-plist
+++ b/textproc/tclExpat/pkg-plist
@@ -1,5 +1,5 @@
-lib/tcl%%TCL_VERSION%%/TclExpat/pkgIndex.tcl
-@dirrm lib/tcl%%TCL_VERSION%%/TclExpat
+lib/TclExpat/pkgIndex.tcl
+@dirrm lib/TclExpat
lib/libtclexpat.so.1
lib/libtclexpat.so
%%PORTDOCS%%%%DOCSDIR%%/README