Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Sep 2013 14:59:42 +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: r327627 - in head/archivers/tclmkziplib: . files
Message-ID:  <201309191459.r8JExg3e030342@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Sep 19 14:59:42 2013
New Revision: 327627
URL: http://svnweb.freebsd.org/changeset/ports/327627

Log:
  - Take maintainership (tcltk@)
  - Convert to USES+=tcl
  - Simplify files/Makefile.bsd

Modified:
  head/archivers/tclmkziplib/Makefile
  head/archivers/tclmkziplib/files/Makefile.bsd

Modified: head/archivers/tclmkziplib/Makefile
==============================================================================
--- head/archivers/tclmkziplib/Makefile	Thu Sep 19 14:31:17 2013	(r327626)
+++ head/archivers/tclmkziplib/Makefile	Thu Sep 19 14:59:42 2013	(r327627)
@@ -8,30 +8,25 @@ CATEGORIES=	archivers tcl
 MASTER_SITES=	http://mkextensions.sourceforge.net/
 DISTNAME=	mkZiplib${PORTVERSION:S/.//}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	GZIP and ZIP support for TCL; dynamically loadable
 
 LICENSE=	BSD
 
-USE_TCL=	84+
+USES+=		tcl
+USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/mkZiplib${PORTVERSION}
-USE_ZIP=	yes
 
 .include <bsd.port.options.mk>
 
-TCLCONFIG?=	${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh
-
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV=	VERSION=${PORTVERSION:S/.//} \
 		TCL_VER=${TCL_VER} \
-		TCLCONFIG=${TCLCONFIG}
+		TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh
 
 PLIST_SUB+=	VERSION=${PORTVERSION:S/.//}
 
-pre-build:
-		@${TEST} -f ${TCLCONFIG} || ( echo "tclConfig.sh is required to build mkZiplib"; exit 1 )
-
 do-install:
 		@${MKDIR} ${PREFIX}/lib/mkZiplib
 		@${INSTALL_PROGRAM} ${WRKSRC}/mkZiplib${PORTVERSION:S/.//}.so ${PREFIX}/lib/mkZiplib

Modified: head/archivers/tclmkziplib/files/Makefile.bsd
==============================================================================
--- head/archivers/tclmkziplib/files/Makefile.bsd	Thu Sep 19 14:31:17 2013	(r327626)
+++ head/archivers/tclmkziplib/files/Makefile.bsd	Thu Sep 19 14:59:42 2013	(r327627)
@@ -1,16 +1,10 @@
 PACKAGE		= mkZiplib
-VERSION		?= 10
 SHLIB_NAME	= ${PACKAGE}${VERSION}.so
 
 SRCS		= unzip.c zip.c mkZiplib${VERSION}.c
 
-LOCALBASE	?=/usr/local
-TCL_VER		?=8.4
-
 SOBJS=		${SRCS:N*.h:R:S/$/.o/}
 
-TCLCONFIG	?=${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh
-
 TCL_SHLIB_CFLAGS!=	. ${TCLCONFIG}; \
 		echo $$TCL_SHLIB_CFLAGS
 TCL_INCLUDE_SPEC!=	. ${TCLCONFIG}; \
@@ -24,7 +18,7 @@ LDFLAGS		+= ${TCL_STUB_LIB_SPEC} -lz
 all: ${SHLIB_NAME}
 
 ${SHLIB_NAME}: ${SOBJS}
-	${CC} ${LDFLAGS} -shared -o ${.TARGET} `lorder ${SOBJS} | tsort -q` ${LDADD}
+	${CC} ${LDFLAGS} -shared -o ${.TARGET} ${SOBJS}
 
 clean:
 	@rm -f ${SHLIB_NAME} ${SOBJS}



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