svn commit: r316934 - in head/lang/itcl: . files

Pietro Cerutti gahr at FreeBSD.org
Tue Apr 30 14:21:23 UTC 2013 

Author: gahr
Date: Tue Apr 30 14:21:22 2013
New Revision: 316934
URL: http://svnweb.freebsd.org/changeset/ports/316934

Log:
  - Update to 3.4.1
  - Manpages have an .itcl suffix to avoid conflicts with Tcl
  
  PR:		175162 (based on)
  Submitted by:	gahr at FreeBSD.org
  Approved by:	maintainer (timeout > 2 months)

Added:
  head/lang/itcl/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/lang/itcl/files/Makefile.lib
  head/lang/itcl/files/patch-test
  head/lang/itcl/files/patch-warnings
Modified:
  head/lang/itcl/Makefile   (contents, props changed)
  head/lang/itcl/distinfo   (contents, props changed)
  head/lang/itcl/pkg-plist   (contents, props changed)

Modified: head/lang/itcl/Makefile
==============================================================================
--- head/lang/itcl/Makefile	Tue Apr 30 14:14:36 2013	(r316933)
+++ head/lang/itcl/Makefile	Tue Apr 30 14:21:22 2013	(r316934)
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	itcl
-# Date created:		Aug 17 1996
-# Whom:			chuckr
-#
+# Created by: chuckr
 # $FreeBSD$
-#
 
 PORTNAME=	itcl
-PORTVERSION=	3.4b1
-PORTREVISION=	1
+PORTVERSION=	3.4.1
+PORTEPOCH=	1
 CATEGORIES=	lang tcl
-MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4
+MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4.1
 DISTNAME=	itcl${PORTVERSION}
 
 MAINTAINER=	erik at bz.bzflag.bz
@@ -17,36 +13,45 @@ COMMENT=	Object-oriented extension to Tc
 
 USE_TCL=	84+
 
-USE_LDCONFIG=	yes
-MAKE_ENV+=	${PLIST_SUB} \
-		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-		USE_TCL=${USE_TCL} TCL_INCLUDEDIR=${TCL_INCLUDEDIR}
+USE_LDCONFIG=	${PREFIX}/lib/itcl${PORTVERSION:R}
 
 MAKE_JOBS_SAFE=	yes
-SHLIB_MAJOR=	${MAJOR}
-SHLIB_MINOR=	${MINOR}
-MAJOR=	${PORTVERSION:R}
-MINOR=	${PORTVERSION:E:C/[a-z].*//}
-PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
-ITCL_LIB=	libitcl.so
-MAKEFILE=	${FILESDIR}/Makefile.lib
-WRKSRC=		${WRKDIR}/itcl3.4
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${TCL_INCLUDEDIR}/generic
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR} \
+		--prefix=${PREFIX} \
+		--exec-prefix=${PREFIX}
+CONFIGURE_ENV+=	ac_cv_c_tclh=${TCL_INCLUDEDIR}/unix
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		VERSION=${PORTVERSION:R} \
+		MAJOR=${PORTVERSION:R:R} \
+		SHORT=${PORTVERSION:R:S/.//}
 
 MANCOMPRESSED=	no
-MANN=		body.n class.n code.n configbody.n delete.n ensemble.n find.n
-MANN+=		is.n itcl.n itclvars.n local.n scope.n
+MANN=		body.itcl class.itcl code.itcl configbody.itcl delete.itcl ensemble.itcl find.itcl \
+		is.itcl itcl.itcl itclvars.itcl local.itcl scope.itcl
 MAN3=		Itcl_RegisterC.3 Itcl_Stack.3 Itcl_Class.3 Itcl_List.3 Itcl_Object.3 Itcl_Preserve.3
 
-ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}
-
 .include <bsd.port.pre.mk>
 
+post-patch:
+	${REINPLACE_CMD} -r '/^includedir/s|/include|/include/itcl${PORTVERSION:R}|' \
+	    ${WRKSRC}/${CONFIGURE_SCRIPT}
+
 post-build test:
 	cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
-		${TCLSH} tests/all.tcl -load "load ./${ITCL_LIB}"
+		${TCLSH} tests/all.tcl -load "load ./libitcl.so.1"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/
+	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
+	    ${PREFIX}/lib/libitcl.so.${PORTVERSION:R:R}
+	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
+	    ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so
+	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
+	    ${PREFIX}/lib/libitcl.so
 .for FILE in ${MAN3}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE:S/Itcl_//} ${PREFIX}/man/man3/${FILE}
 .endfor

Modified: head/lang/itcl/distinfo
==============================================================================
--- head/lang/itcl/distinfo	Tue Apr 30 14:14:36 2013	(r316933)
+++ head/lang/itcl/distinfo	Tue Apr 30 14:21:22 2013	(r316934)
@@ -1,2 +1,2 @@
-SHA256 (itcl3.4b1.tar.gz) = dc99fcf6c00b00774dbfb94ccc437ea3e6315a198645b6d2acf8acba8fdb4608
-SIZE (itcl3.4b1.tar.gz) = 306342
+SHA256 (itcl3.4.1.tar.gz) = 5330832ce72da97610497a58eca904287d0ff91f9ec741a4e4810d5b933c8568
+SIZE (itcl3.4.1.tar.gz) = 263316

Added: head/lang/itcl/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/itcl/files/patch-Makefile.in	Tue Apr 30 14:21:22 2013	(r316934)
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	2011-07-15 20:30:52.000000000 +0200
++++ Makefile.in	2013-04-30 15:46:51.000000000 +0200
+@@ -199,11 +199,12 @@
+ 	@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
+ 	@echo "Installing man pages in $(DESTDIR)$(mandir)"
+ 	@cd $(srcdir)/doc; for i in *.n; do \
+-	    echo "Installing $$i"; \
+-	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
++	    sfxname=`basename $$i | sed -e 's|.n$$|.itcl|'`; \
++	    echo "Installing $$i as $(DESTDIR)$(mandir)/mann/$$sfxname"; \
++	    rm -f $(DESTDIR)$(mandir)/mann/$$sfxname; \
+ 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+-		$$i > $(DESTDIR)$(mandir)/mann/$$i; \
+-	    chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
++		$$i > $(DESTDIR)$(mandir)/mann/$$sfxname; \
++	    chmod 444 $(DESTDIR)$(mandir)/mann/$$sfxname; \
+ 	done
+ 
+ test: binaries libraries
+@@ -378,7 +379,7 @@
+ 	  fi; \
+ 	done
+ 	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+-	$(INSTALL_DATA) itclConfig.sh $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) itclConfig.sh $(DESTDIR)$(pkglibdir)
+ 
+ #========================================================================
+ # Install binary executables (e.g. .exe files)

Modified: head/lang/itcl/pkg-plist
==============================================================================
--- head/lang/itcl/pkg-plist	Tue Apr 30 14:14:36 2013	(r316933)
+++ head/lang/itcl/pkg-plist	Tue Apr 30 14:21:22 2013	(r316934)
@@ -1,12 +1,14 @@
-include/itcl%%MAJOR%%.%%MINOR%%/itcl.h
-include/itcl%%MAJOR%%.%%MINOR%%/itclInt.h
-include/itcl%%MAJOR%%.%%MINOR%%/itclDecls.h
-include/itcl%%MAJOR%%.%%MINOR%%/itclIntDecls.h
+include/itcl%%VERSION%%/itcl.h
+include/itcl%%VERSION%%/itclInt.h
+include/itcl%%VERSION%%/itclDecls.h
+include/itcl%%VERSION%%/itclIntDecls.h
 lib/libitcl.so.%%MAJOR%%
 lib/libitcl.so
-lib/libitcl.a
-lib/itcl%%MAJOR%%.%%MINOR%%/itcl.tcl
-lib/itcl%%MAJOR%%.%%MINOR%%/itclConfig.sh
-lib/itcl%%MAJOR%%.%%MINOR%%/pkgIndex.tcl
- at dirrm include/itcl%%MAJOR%%.%%MINOR%%
- at dirrm lib/itcl%%MAJOR%%.%%MINOR%%
+lib/itcl%%VERSION%%/libitcl.so.1
+lib/itcl%%VERSION%%/libitcl%%SHORT%%.so
+lib/itcl%%VERSION%%/itcl.tcl
+lib/itcl%%VERSION%%/itclConfig.sh
+lib/itcl%%VERSION%%/libitclstub.a
+lib/itcl%%VERSION%%/pkgIndex.tcl
+ at dirrm include/itcl%%VERSION%%
+ at dirrm lib/itcl%%VERSION%%

More information about the svn-ports-all mailing list