svn commit: r344781 - in head/devel/ztcl: . files
Pietro Cerutti
gahr at FreeBSD.org
Mon Feb 17 15:44:40 UTC 2014
Author: gahr
Date: Mon Feb 17 15:44:38 2014
New Revision: 344781
URL: http://svnweb.freebsd.org/changeset/ports/344781
QAT: https://qat.redports.org/buildarchive/r344781/
Log:
- Convert to USES=gmake tcl
- PREFIX-clean
- STAGE-clean
- Fix build
Modified:
head/devel/ztcl/Makefile
head/devel/ztcl/files/patch-Makefile.in
head/devel/ztcl/files/patch-configure
head/devel/ztcl/pkg-plist
Modified: head/devel/ztcl/Makefile
==============================================================================
--- head/devel/ztcl/Makefile Mon Feb 17 15:18:04 2014 (r344780)
+++ head/devel/ztcl/Makefile Mon Feb 17 15:44:38 2014 (r344781)
@@ -9,30 +9,31 @@ MASTER_SITES= http://download.gna.org/zt
DISTNAME= ${PORTNAME}_${DISTVERSION}_src
MAINTAINER= dsh at vlink.ru
-COMMENT= A zlib extension library for the Tcl
+COMMENT= Zlib extension library for the Tcl
-LIB_DEPENDS= tclmore0.7:${PORTSDIR}/devel/tclmore
+LICENSE= LGPL21
+LIB_DEPENDS= libtclmore0.so:${PORTSDIR}/devel/tclmore
+
+OPTIONS_DEFINE= DOCS
+
+USES= gmake tcl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_GMAKE= yes
-USE_TCL= yes
-USE_TCL_BUILD= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/_src$//}
INFO= ${PORTNAME} ${PORTNAME}-zlib
-CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \
+CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
--with-tclinclude=${TCL_INCLUDEDIR} \
- --with-tclmorescripts=${PREFIX}/libexec/tclmore
-CPPFLAGS+= -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}
-LDFLAGS+= -L ${PREFIX}/lib
+ --with-tclmorescripts=${LOCALBASE}/libexec/tclmore \
+ --enable-threads
+MAKE_ENV+= STAGEDIR=${STAGEDIR}
+CPPFLAGS+= -I ${LOCALBASE}/include -I ${TCL_INCLUDEDIR}
+LDFLAGS+= -L ${LOCALBASE}/lib
-.if !defined(NOPORTDOCS)
PORTDOCS= *
-.endif
-NO_STAGE= yes
post-extract:
${MV} ${WRKSRC}/doc/zlib.texi ${WRKSRC}/doc/${PORTNAME}-zlib.texi
Modified: head/devel/ztcl/files/patch-Makefile.in
==============================================================================
--- head/devel/ztcl/files/patch-Makefile.in Mon Feb 17 15:18:04 2014 (r344780)
+++ head/devel/ztcl/files/patch-Makefile.in Mon Feb 17 15:44:38 2014 (r344781)
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sat May 22 09:41:17 2004
-+++ Makefile.in Wed Apr 26 11:24:40 2006
+--- Makefile.in.orig 2004-05-22 07:41:17.000000000 +0200
++++ Makefile.in 2014-02-17 16:44:51.000000000 +0100
@@ -42,7 +42,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -9,6 +9,15 @@
#PAGE
## ------------------------------------------------------------
+@@ -50,7 +50,7 @@
+ ## ------------------------------------------------------------
+
+ CONFIGDIR = @CONFIGDIR@
+-INSTALL_ROOT =
++INSTALL_ROOT = ${STAGEDIR}
+
+ # If there is not a value for "TMPDIR" from the environment
+ # we select a common default.
@@ -74,7 +74,7 @@
bindir = @bindir@
Modified: head/devel/ztcl/files/patch-configure
==============================================================================
--- head/devel/ztcl/files/patch-configure Mon Feb 17 15:18:04 2014 (r344780)
+++ head/devel/ztcl/files/patch-configure Mon Feb 17 15:44:38 2014 (r344781)
@@ -1,5 +1,14 @@
---- configure.orig Sat May 22 09:41:22 2004
-+++ configure Wed Apr 26 12:01:02 2006
+--- configure.orig 2004-05-22 07:41:22.000000000 +0200
++++ configure 2014-02-17 16:43:40.000000000 +0100
+@@ -3919,7 +3919,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltclmorestub0.7g -ltclstub8.4g $LIBS"
++LIBS="-ltclmorestub0.7g $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
@@ -3986,7 +3986,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9,6 +18,15 @@
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
+@@ -6748,7 +6748,7 @@
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print }' /etc/.relid'`
++ system=MP-RAS-`awk '{print }' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
@@ -7892,11 +7892,12 @@
EXTRA_CFLAGS="-pthread"
LDFLAGS="$LDFLAGS -pthread"
Modified: head/devel/ztcl/pkg-plist
==============================================================================
--- head/devel/ztcl/pkg-plist Mon Feb 17 15:18:04 2014 (r344780)
+++ head/devel/ztcl/pkg-plist Mon Feb 17 15:44:38 2014 (r344781)
@@ -8,12 +8,4 @@ lib/libztclstub1.0.a
lib/libztclstub1.a
lib/ztcl/pkgIndex.tcl
share/aclocal/ztcl.m4
-%%DOCSDIR%%/DESCRIPTION.txt
-%%DOCSDIR%%/HTML/ztcl-zlib.html
-%%DOCSDIR%%/HTML/ztcl.html
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README
-%%DOCSDIR%%/license.terms
@dirrm lib/ztcl
- at dirrm %%DOCSDIR%%/HTML
- at dirrm %%DOCSDIR%%
More information about the svn-ports-all
mailing list