Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 13:56:48 +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: r344750 - head/databases/tcl-Mysql
Message-ID:  <201402171356.s1HDumtV071813@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Feb 17 13:56:48 2014
New Revision: 344750
URL: http://svnweb.freebsd.org/changeset/ports/344750
QAT: https://qat.redports.org/buildarchive/r344750/

Log:
  - STAGE-clean
  - Convert to USES=tcl
  - Get rid of pkg-plist (PORTDOCS=*)

Deleted:
  head/databases/tcl-Mysql/pkg-plist
Modified:
  head/databases/tcl-Mysql/Makefile

Modified: head/databases/tcl-Mysql/Makefile
==============================================================================
--- head/databases/tcl-Mysql/Makefile	Mon Feb 17 13:50:43 2014	(r344749)
+++ head/databases/tcl-Mysql/Makefile	Mon Feb 17 13:56:48 2014	(r344750)
@@ -12,36 +12,39 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL module for accessing MySQL databases
 
+OPTIONS_DEFINE=	DOCS
+
 PATCH_DEPENDS=	rcsdiff:${PORTSDIR}/devel/rcs
 
 USE_MYSQL=	41+
-USE_TCL=	84+
+USES=		tcl
 TCL_NODOT=	tcl${TCL_VER:S/.//}
 WRKSRC=		${WRKDIR}/tcl-sql/
 LIB_NAME=	libTclMySQL.so.1
-PLIST_SUB=	TCL_VERSION=tcl${TCL_VER} LIB_NAME=${LIB_NAME}
 MAKE_ARGS+=	SHLIB_NAME=${LIB_NAME} ${PLIST_SUB}
 REINPLACE_ARGS=	-i ""
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 DOCSDIR?=	${PREFIX}/share/doc/tcl-MySQL
 
-NO_STAGE=	yes
+PLIST_FILES=	lib/sql1.0/${LIB_NAME} \
+		lib/sql1.0/pkgIndex.tcl
+PLIST_DIRS=	lib/sql1.0
+PORTDOCS=	*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^int ,static int ,' ${WRKSRC}/sql.cc
 
-SQL_DIR=	${LOCALBASE}/lib/tcl${TCL_VER}/sql1.0
+SQL_DIR=	lib/sql1.0
 
 do-install:
-	${MKDIR} ${SQL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/obj/libTclMySQL.so.* ${SQL_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SQL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/obj/libTclMySQL.so.* ${STAGEDIR}${PREFIX}/${SQL_DIR}
 	${ECHO} "package ifneeded sql 1.1 \
 		{load ${SQL_DIR}/${LIB_NAME} sql}" \
-		> ${SQL_DIR}/pkgIndex.tcl
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+		> ${STAGEDIR}${PREFIX}/${SQL_DIR}/pkgIndex.tcl
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${WRKSRC}/docs/*.txt \
-		${DOCSDIR}
-.endif
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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