Date: Wed, 13 Dec 2006 10:56:18 +0100 (CET) From: Martin Matuska <martin@matuska.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106663: [MAINTAINER UPDATE] lang/xotcl 1.5.3 Message-ID: <20061213095618.5AA643F425@mail.vx.sk> Resent-Message-ID: <200612131000.kBDA0GMx097952@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106663 >Category: ports >Synopsis: [MAINTAINER UPDATE] lang/xotcl 1.5.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 13 10:00:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE-p10 i386/amd64 >Description: This update enables actiweb, fixes Makefile.in for the install target and adds some patches. >How-To-Repeat: >Fix: diff -Nbur lang/xotcl.orig/Makefile lang/xotcl/Makefile --- lang/xotcl.orig/Makefile Tue Dec 12 16:15:51 2006 +++ lang/xotcl/Makefile Tue Dec 12 16:33:02 2006 @@ -7,6 +7,7 @@ PORTNAME= xotcl PORTVERSION= 1.5.3 +PORTREVISION= 1 CATEGORIES= lang tcl83 tcl84 MASTER_SITES= http://media.wu-wien.ac.at/download/ @@ -17,12 +18,13 @@ USE_TCL= yes USE_TCL_BUILD= yes ALL_TARGET= all test-nohttp -INSTALL_TARGET= install-binaries install-libraries +INSTALL_TARGET= install USE_LDCONFIG= yes USE_GMAKE= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} -OPTIONS= AOLSERVER "AOL server module" off \ +OPTIONS= ACTIWEB "Include actiweb" on \ + AOLSERVER "AOL server module" off \ THREADS "Force threaded build" off \ TUTORIAL "Install XOTcl tutorial" off @@ -34,11 +36,19 @@ .include <bsd.port.pre.mk> +.if defined(WITH_ACTIWEB) +CONFIGURE_ARGS+= --with-actiweb --with-gdbm=${LOCALBASE}/include,${LOCALBASE}/lib +LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm +PLIST_SUB+= ACTIWEB="" +.else +PLIST_SUB+= ACTIWEB="@comment " +.endif + .if defined(WITH_AOLSERVER) BUILD_DEPENDS+= ${LOCALBASE}/aolserver/bin/init.tcl:${PORTSDIR}/www/aolserver RUN_DEPENDS+= ${BUILD_DEPENDS} PLIST_SUB+= AOLSERVER="" -INSTALL_TARGET= install-aol +INSTALL_TARGET+= install-aol .else PLIST_SUB+= AOLSERVER="@comment " .endif diff -Nbur lang/xotcl.orig/files/patch-Makefile.in lang/xotcl/files/patch-Makefile.in --- lang/xotcl.orig/files/patch-Makefile.in Tue Dec 12 16:15:51 2006 +++ lang/xotcl/files/patch-Makefile.in Tue Dec 12 15:58:59 2006 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed Sep 27 16:21:56 2006 -+++ Makefile.in Wed Sep 27 16:43:46 2006 -@@ -261,11 +261,11 @@ +--- Makefile.in.orig Thu Sep 28 11:19:12 2006 ++++ Makefile.in Tue Dec 12 15:58:50 2006 +@@ -262,11 +262,11 @@ #======================================================================== # This rule installs platform-independent files, such as header files. #======================================================================== @@ -15,7 +15,7 @@ done; @echo "Installing Libraries to $(DESTDIR)$(pkglibdir)/" @for i in $(libdirs) ; do \ -@@ -283,7 +283,7 @@ +@@ -284,7 +284,7 @@ $(INSTALL_DATA) $(src_lib_dir)/$$i $(DESTDIR)$(pkglibdir)/$$i ; \ done; cat unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl @@ -24,7 +24,23 @@ @echo "Installing Applications to $(DESTDIR)$(pkglibdir)/apps/" @for i in $(appdirs) ; do \ echo " Installing $$i/" ; \ -@@ -534,7 +534,6 @@ +@@ -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 @@ else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ @@ -32,7 +48,7 @@ fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ -@@ -591,12 +590,12 @@ +@@ -592,12 +599,12 @@ rm -f $(DESTDIR)$(bindir)/$$p; \ done diff -Nbur lang/xotcl.orig/files/patch-configure lang/xotcl/files/patch-configure --- lang/xotcl.orig/files/patch-configure Thu Jan 1 01:00:00 1970 +++ lang/xotcl/files/patch-configure Tue Dec 12 14:23:10 2006 @@ -0,0 +1,11 @@ +--- 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 -Nbur lang/xotcl.orig/files/patch-configure.in lang/xotcl/files/patch-configure.in --- lang/xotcl.orig/files/patch-configure.in Thu Jan 1 01:00:00 1970 +++ lang/xotcl/files/patch-configure.in Tue Dec 12 14:23:53 2006 @@ -0,0 +1,11 @@ +--- 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 -Nbur lang/xotcl.orig/files/patch-library::store::XOTclGdbm::configure lang/xotcl/files/patch-library::store::XOTclGdbm::configure --- lang/xotcl.orig/files/patch-library::store::XOTclGdbm::configure Thu Jan 1 01:00:00 1970 +++ lang/xotcl/files/patch-library::store::XOTclGdbm::configure Tue Dec 12 14:51:52 2006 @@ -0,0 +1,11 @@ +--- 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 -Nbur lang/xotcl.orig/files/patch-library::store::XOTclGdbm::configure.in lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in --- lang/xotcl.orig/files/patch-library::store::XOTclGdbm::configure.in Thu Jan 1 01:00:00 1970 +++ lang/xotcl/files/patch-library::store::XOTclGdbm::configure.in Tue Dec 12 14:51:44 2006 @@ -0,0 +1,11 @@ +--- 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 -Nbur lang/xotcl.orig/pkg-plist lang/xotcl/pkg-plist --- lang/xotcl.orig/pkg-plist Tue Dec 12 16:15:51 2006 +++ lang/xotcl/pkg-plist Tue Dec 12 16:22:09 2006 @@ -1,3 +1,77 @@ +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/Agent.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/AgentManagement.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/HtmlPlace.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/HttpPlace.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/Invoker.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/PlaceAccessControl.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/SecureHtmlPlace.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/SecureHttpPlace.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/SendStrategy.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/UserMgt.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/WebAgent.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/WebDocument.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/WebObject.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/pageTemplate.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/actiweb/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/RDFCreator.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/RDFTriple.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/rdfExample.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/rdfRecreatorVisitor.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/rdf/xoRDF.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/registry/Registry.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/registry/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/JufGdbmStorage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/MemStorage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/MultiStorage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/Persistence.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/Storage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/TclGdbmStorage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/TextFileStorage.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/persistenceExample.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/store/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/printVisitor.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/sgml.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/xml.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/xml.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/xmlExample.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/xmlRecreatorVisitor.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/xml/xoXML.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/ChainOfResponsibility.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/OnCalleeProxy.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/Singleton.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/SortedComposite.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/adapter.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/composite.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/link.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/manager.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/observer.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/patterns/pkgIndex.tcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/AgentClient.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Counter.README +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Counter.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Counter2.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Counter3.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Counter4.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/FormsWithState.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/MC.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/Receiver.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/examples.README +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/securePlaceDemo.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/UNIVERSAL.css +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/UNIVERSAL.jpg +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/UNIVERSAL.rdf +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/UNIVERSAL.xotcl +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/server.key +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/actiweb/univ/server.pem +%%ACTIWEB%%lib/xotcl%%PORTVERSION%%/apps/persistence/persistenceTest.xotcl +%%ACTIWEB%%lib/xotclexpat0.9/libxotclexpat0.9.so +%%ACTIWEB%%lib/xotclexpat0.9/pkgIndex.tcl +%%ACTIWEB%%lib/xotclsdbm1.2/libxotclsdbm1.2.so +%%ACTIWEB%%lib/xotclsdbm1.2/pkgIndex.tcl +%%ACTIWEB%%lib/xotclgdbm1.2/libxotclgdbm1.2.so +%%ACTIWEB%%lib/xotclgdbm1.2/pkgIndex.tcl %%AOLSERVER%%aolserver/modules/tcl/xotcl.tcl bin/xotclsh include/xotcl%%PORTVERSION%%/xotcl.h @@ -161,6 +235,18 @@ %%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 +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/store +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/xml +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/patterns +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/apps/actiweb/univ +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/apps/actiweb +%%ACTIWEB%%@dirrm lib/xotcl%%PORTVERSION%%/apps/persistence +%%ACTIWEB%%@dirrm lib/xotclexpat0.9 +%%ACTIWEB%%@dirrm lib/xotclsdbm1.2 +%%ACTIWEB%%@dirrm lib/xotclgdbm1.2 @dirrm include/xotcl%%PORTVERSION%% @dirrm lib/xotcl%%PORTVERSION%%/apps/comm @dirrm lib/xotcl%%PORTVERSION%%/apps/scripts >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061213095618.5AA643F425>