Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2014 10:57:33 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339582 - in head/textproc/tclExpat: . files
Message-ID:  <201401131057.s0DAvX26029049@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Jan 13 10:57:33 2014
New Revision: 339582
URL: http://svnweb.freebsd.org/changeset/ports/339582

Log:
  - Convert to USES=tcl
  - STAGE-clean
  - Respect PREFIX
  
  MFH:		2014Q1

Modified:
  head/textproc/tclExpat/Makefile   (contents, props changed)
  head/textproc/tclExpat/distinfo   (contents, props changed)
  head/textproc/tclExpat/files/Makefile   (contents, props changed)
  head/textproc/tclExpat/pkg-plist   (contents, props changed)

Modified: head/textproc/tclExpat/Makefile
==============================================================================
--- head/textproc/tclExpat/Makefile	Mon Jan 13 10:44:50 2014	(r339581)
+++ head/textproc/tclExpat/Makefile	Mon Jan 13 10:57:33 2014	(r339582)
@@ -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>

Modified: head/textproc/tclExpat/distinfo
==============================================================================
--- head/textproc/tclExpat/distinfo	Mon Jan 13 10:44:50 2014	(r339581)
+++ head/textproc/tclExpat/distinfo	Mon Jan 13 10:57:33 2014	(r339582)
@@ -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

Modified: head/textproc/tclExpat/files/Makefile
==============================================================================
--- head/textproc/tclExpat/files/Makefile	Mon Jan 13 10:44:50 2014	(r339581)
+++ head/textproc/tclExpat/files/Makefile	Mon Jan 13 10:57:33 2014	(r339582)
@@ -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/.//}

Modified: head/textproc/tclExpat/pkg-plist
==============================================================================
--- head/textproc/tclExpat/pkg-plist	Mon Jan 13 10:44:50 2014	(r339581)
+++ head/textproc/tclExpat/pkg-plist	Mon Jan 13 10:57:33 2014	(r339582)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401131057.s0DAvX26029049>