From 779603523440b261d6b9d9cedda80f274bdfdddd Mon Sep 17 00:00:00 2001 From: mm Date: Thu, 16 Aug 2007 08:57:03 +0000 Subject: - Update to 1.5.4 - Remove PORTDOCS from pkg-plist Approved by: garga (mentor, implicit) --- lang/xotcl/Makefile | 11 ++++---- lang/xotcl/distinfo | 6 ++--- lang/xotcl/files/patch-Makefile.in | 24 +++-------------- lang/xotcl/files/patch-configure | 11 -------- lang/xotcl/files/patch-configure.in | 11 -------- .../patch-library::store::XOTclGdbm::configure | 11 -------- .../patch-library::store::XOTclGdbm::configure.in | 11 -------- lang/xotcl/pkg-plist | 30 ---------------------- 8 files changed, 12 insertions(+), 103 deletions(-) delete mode 100644 lang/xotcl/files/patch-configure delete mode 100644 lang/xotcl/files/patch-configure.in delete mode 100644 lang/xotcl/files/patch-library::store::XOTclGdbm::configure delete mode 100644 lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in (limited to 'lang/xotcl') diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile index 1a33961133fe..8ec29ff4afd6 100644 --- a/lang/xotcl/Makefile +++ b/lang/xotcl/Makefile @@ -6,15 +6,14 @@ # PORTNAME= xotcl -PORTVERSION= 1.5.3 -PORTREVISION= 5 +PORTVERSION= 1.5.4 CATEGORIES?= lang tcl84 MASTER_SITES= http://media.wu-wien.ac.at/download/ MAINTAINER= mm@FreeBSD.org COMMENT= Object-oriented scripting language based on Tcl -USE_TCL= 84+ +USE_TCL= 84 USE_TCL_THREADS= yes INSTALL_TARGET= install @@ -32,6 +31,8 @@ OPTIONS= ACTIWEB "Include actiweb" on \ AOLSERVERBASE?= aolserver .endif +PORTDOCS= * + .include .if defined(AOLSERVER_XOTCL) @@ -92,12 +93,10 @@ post-install: -exec ${INSTALL_DATA} ${WRKSRC}/{} ${EXAMPLESDIR}/tutorial/html \; .endif .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} ${DOCSDIR}/announces + ${MKDIR} ${DOCSDIR} .for FILE in COPYRIGHT ChangeLog README README.aol doc/TODO ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor - @cd ${WRKSRC}; ${FIND} doc/ -name 'Announce-*' -type f \ - -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DOCSDIR}/announces \; .endif .if !defined(NO_INSTALL_MANPAGES) ${INSTALL_MAN} ${WRKSRC}/man/xotclsh.1 ${PREFIX}/man/man1/ diff --git a/lang/xotcl/distinfo b/lang/xotcl/distinfo index d06dbdf3857b..d4aa3d49b0b7 100644 --- a/lang/xotcl/distinfo +++ b/lang/xotcl/distinfo @@ -1,3 +1,3 @@ -MD5 (xotcl-1.5.3.tar.gz) = ed246596550812375ff4461c07b89bcb -SHA256 (xotcl-1.5.3.tar.gz) = f2393a1a3dc81509215a5ab1548b063a1dd60423a331eae3c106b0a38b85f4ae -SIZE (xotcl-1.5.3.tar.gz) = 1961146 +MD5 (xotcl-1.5.4.tar.gz) = c3fc4b49f279c9de3fe8ae6e8200719d +SHA256 (xotcl-1.5.4.tar.gz) = c2a6bc76857d0fe7a74e7ba11886489f9b64b902191a581065c08a638f4e3646 +SIZE (xotcl-1.5.4.tar.gz) = 1851041 diff --git a/lang/xotcl/files/patch-Makefile.in b/lang/xotcl/files/patch-Makefile.in index dcfd077c8198..3fe90d8d4afc 100644 --- a/lang/xotcl/files/patch-Makefile.in +++ b/lang/xotcl/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Sep 28 11:19:12 2006 -+++ Makefile.in Tue Dec 12 15:58:50 2006 +--- Makefile.in.orig 2007-08-06 13:35:56.000000000 +0200 ++++ Makefile.in 2007-08-13 16:13:07.000000000 +0200 @@ -262,11 +262,11 @@ #======================================================================== # This rule installs platform-independent files, such as header files. @@ -24,23 +24,7 @@ @echo "Installing Applications to $(DESTDIR)$(pkglibdir)/apps/" @for i in $(appdirs) ; do \ echo " Installing $$i/" ; \ -@@ -292,7 +292,15 @@ - mkdir -p $(DESTDIR)$(pkglibdir)/apps/$$i; \ - chmod 755 $(DESTDIR)$(pkglibdir)/apps/$$i; \ - for j in $(src_app_dir)/$$i/* ; do \ -+ if test -d $$j; then \ -+ mkdir -p $(DESTDIR)$(pkglibdir)/$$j; \ -+ chmod 755 $(DESTDIR)$(pkglibdir)/$$j; \ -+ for k in $$j/* ; do \ -+ $(INSTALL) $$k $(DESTDIR)$(pkglibdir)/$$j ; \ -+ done; \ -+ else \ - $(INSTALL) $$j $(DESTDIR)$(pkglibdir)/apps/$$i/; \ -+ fi; \ - done; \ - done; - @for i in $(appsrc) ; do \ -@@ -535,7 +543,6 @@ +@@ -543,7 +543,6 @@ else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ @@ -48,7 +32,7 @@ fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ -@@ -592,12 +599,12 @@ +@@ -600,12 +599,12 @@ rm -f $(DESTDIR)$(bindir)/$$p; \ done diff --git a/lang/xotcl/files/patch-configure b/lang/xotcl/files/patch-configure deleted file mode 100644 index 945173dd370f..000000000000 --- a/lang/xotcl/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Dec 12 14:22:44 2006 -+++ configure Tue Dec 12 14:22:59 2006 -@@ -11206,7 +11206,7 @@ - for subdir in ${subdirs} - do - echo "==================== configure $subdir =====================" -- if test x"${srcdir}" == x. ; then -+ if test x"${srcdir}" = x. ; then - confdir=. - else - mkdir -p $subdir diff --git a/lang/xotcl/files/patch-configure.in b/lang/xotcl/files/patch-configure.in deleted file mode 100644 index 9a649e5827ee..000000000000 --- a/lang/xotcl/files/patch-configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig Tue Dec 12 14:23:37 2006 -+++ configure.in Tue Dec 12 14:23:42 2006 -@@ -439,7 +439,7 @@ - for subdir in ${subdirs} - do - echo "==================== configure $subdir =====================" -- if test x"${srcdir}" == x. ; then -+ if test x"${srcdir}" = x. ; then - confdir=. - else - mkdir -p $subdir diff --git a/lang/xotcl/files/patch-library::store::XOTclGdbm::configure b/lang/xotcl/files/patch-library::store::XOTclGdbm::configure deleted file mode 100644 index d3d818616621..000000000000 --- a/lang/xotcl/files/patch-library::store::XOTclGdbm::configure +++ /dev/null @@ -1,11 +0,0 @@ ---- library/store/XOTclGdbm/configure.orig Tue Dec 12 14:50:53 2006 -+++ library/store/XOTclGdbm/configure Tue Dec 12 14:51:03 2006 -@@ -6150,7 +6150,7 @@ - # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS - # and PKG_TCL_SOURCES. - #----------------------------------------------------------------------- --if test ! "${with_gdbm}" == no; then -+if test ! "${with_gdbm}" = no; then - GDBM_INC_DIR="`echo $with_gdbm |cut -f1 -d,`" - GDBM_LIB_DIR="`echo $with_gdbm |cut -f2 -d, -s`" - fi diff --git a/lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in b/lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in deleted file mode 100644 index 07fa88ff1fbf..000000000000 --- a/lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- library/store/XOTclGdbm/configure.in.orig Tue Dec 12 14:50:49 2006 -+++ library/store/XOTclGdbm/configure.in Tue Dec 12 14:51:09 2006 -@@ -87,7 +87,7 @@ - # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS - # and PKG_TCL_SOURCES. - #----------------------------------------------------------------------- --if test ! "${with_gdbm}" == no; then -+if test ! "${with_gdbm}" = no; then - GDBM_INC_DIR="`echo $with_gdbm |cut -f1 -d,`" - GDBM_LIB_DIR="`echo $with_gdbm |cut -f2 -d, -s`" - fi diff --git a/lang/xotcl/pkg-plist b/lang/xotcl/pkg-plist index 31285b44a1d4..b9f0154ef6d0 100644 --- a/lang/xotcl/pkg-plist +++ b/lang/xotcl/pkg-plist @@ -142,34 +142,6 @@ lib/xotcl%%PORTVERSION%%/serialize/ScriptCreator.xotcl lib/xotcl%%PORTVERSION%%/serialize/Serializer.xotcl lib/xotcl%%PORTVERSION%%/serialize/pkgIndex.tcl lib/xotcl%%PORTVERSION%%/xotclConfig.sh -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.aol -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-0.9.3 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-0.9.4 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.0.1 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.0.2 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.1.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.1.1 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.2.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.1 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.3 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.4 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.5 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.6 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.7 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.8 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.3.9 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.4.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.4.1 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.5.0 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.5.1 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.5.2 -%%PORTDOCS%%%%DOCSDIR%%/announces/Announce-1.5.3 %%TUTORIAL%%%%EXAMPLESDIR%%/tutorial/html/JufGdbmStorage-xotcl.html %%TUTORIAL%%%%EXAMPLESDIR%%/tutorial/html/MemStorage-xotcl.html %%TUTORIAL%%%%EXAMPLESDIR%%/tutorial/html/MultiStorage-xotcl.html @@ -232,8 +204,6 @@ lib/xotcl%%PORTVERSION%%/xotclConfig.sh %%TUTORIAL%%@dirrm %%EXAMPLESDIR%%/tutorial/pdf %%TUTORIAL%%@dirrm %%EXAMPLESDIR%%/tutorial %%TUTORIAL%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/announces -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/actiweb %%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/rdf %%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/registry -- cgit