summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-09-19 14:59:42 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-09-19 14:59:42 +0000
commit6e9adb7dd9e1370cb43b02b01a2296d47fdc1670 (patch)
treedf6f6bed999425c6758ea7b30d33f50f3ebc0cb3 /archivers
parentConvert to the new Uses/tk.mk. (diff)
- Take maintainership (tcltk@)
- Convert to USES+=tcl - Simplify files/Makefile.bsd
Notes
Notes: svn path=/head/; revision=327627
Diffstat (limited to 'archivers')
-rw-r--r--archivers/tclmkziplib/Makefile13
-rw-r--r--archivers/tclmkziplib/files/Makefile.bsd8
2 files changed, 5 insertions, 16 deletions
diff --git a/archivers/tclmkziplib/Makefile b/archivers/tclmkziplib/Makefile
index cabaa5bbcf75..d1de2e75df48 100644
--- a/archivers/tclmkziplib/Makefile
+++ b/archivers/tclmkziplib/Makefile
@@ -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
diff --git a/archivers/tclmkziplib/files/Makefile.bsd b/archivers/tclmkziplib/files/Makefile.bsd
index 3da8a9b6a6b3..4be0d99b678b 100644
--- a/archivers/tclmkziplib/files/Makefile.bsd
+++ b/archivers/tclmkziplib/files/Makefile.bsd
@@ -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}