From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 23 12:20:39 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BFE716A4CE for ; Sun, 23 Nov 2003 12:20:39 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2696443FEA for ; Sun, 23 Nov 2003 12:20:23 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hANKKMFY074662 for ; Sun, 23 Nov 2003 12:20:22 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hANKKMbs074661; Sun, 23 Nov 2003 12:20:22 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 23 Nov 2003 12:20:22 -0800 (PST) Resent-Message-Id: <200311232020.hANKKMbs074661@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Guy Coleman" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27AC716A4CF for ; Sun, 23 Nov 2003 12:18:06 -0800 (PST) Received: from heisenberg.zen.co.uk (heisenberg.zen.co.uk [212.23.8.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id C342443FDF for ; Sun, 23 Nov 2003 12:18:04 -0800 (PST) (envelope-from ) Received: from 82-68-137-254.dsl.in-addr.zen.co.uk ([82.68.137.254] helo=82-68-137-251.dsl.in-addr.zen.co.uk) by heisenberg.zen.co.uk with esmtp (Exim 4.22) id 1AO0gF-0000Pi-48; Sun, 23 Nov 2003 20:18:03 +0000 Message-Id: <1069618699@82-68-137-251.dsl.in-addr.zen.co.uk> Date: Sun, 23 Nov 2003 20:18:19 -0000 From: "Guy Coleman" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: gtk-send-pr 0.2 cc: obraun@haskell.org Subject: ports/59618: [Maintainer update] devel/hs-uni: Update to new CVS code X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2003 20:20:39 -0000 >Number: 59618 >Category: ports >Synopsis: [Maintainer update] devel/hs-uni: Update to new CVS code >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: Sun Nov 23 12:20:21 PST 2003 >Closed-Date: >Last-Modified: >Originator: Guy Coleman >Release: FreeBSD 5.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD fire 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #6: Mon Nov 3 22:02:04 GMT 2003 gtc00u@fire:/usr/obj/vol1/src-RELENG_5_1/sys/FIRE i386 >Description: Update to work with the new cvs tarball on the HTk website, and allow choosing of TCL/Tk version when compiling. >How-To-Repeat: n/a >Fix: --- hs-uni-diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/hs-uni/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 9 Jun 2003 20:51:20 -0000 1.1 +++ Makefile 19 Nov 2003 23:50:25 -0000 @@ -7,6 +7,7 @@ PORTNAME= uni PORTVERSION= 0.99 +PORTREVISION= 1 CATEGORIES= devel haskell MASTER_SITES= http://www.informatik.uni-bremen.de/htk/download/ PKGNAMEPREFIX= hs- @@ -15,30 +16,69 @@ MAINTAINER= gtchask@mm.st COMMENT= A tool integration framework for Haskell, including Htk -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ - wish8.3:${PORTSDIR}/x11-toolkits/tk83 +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc6 +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc6 + +.include + +.if defined(WITH_TK_VER) +.if ${WITH_TK_VER} == "8.0" +RUN_DEPENDS+= wish8.0:${PORTSDIR}/x11-toolkits/tk80 +.elif ${WITH_TK_VER} == "8.1" +RUN_DEPENDS+= wish8.1:${PORTSDIR}/x11-toolkits/tk81 +.elif ${WITH_TK_VER} == "8.2" +RUN_DEPENDS+= wish8.2:${PORTSDIR}/x11-toolkits/tk82 +.elif ${WITH_TK_VER} == "8.3" +RUN_DEPENDS+= wish8.3:${PORTSDIR}/x11-toolkits/tk83 +.else +RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 +.endif # ${WITH_TK_VER} == +.else +RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 +.endif # defined WITH_TK_VER USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-HTk WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= boot packages +pre-everything:: +.if !defined(WITH_TK_VER) + @${ECHO_MSG} + @${ECHO_MSG} "If you want to depend on a particular version of" + @${ECHO_MSG} "Tk hit Ctrl-C now and use \"make WITH_TK_VER=val\"" + @${ECHO_MSG} "Values available: 8.0, 8.1, 8.2, 8.3 and 8.4" + @${ECHO_MSG} + @${ECHO_MSG} "Default is 8.4" + @${ECHO_MSG} +.endif + do-install: @${MKDIR} ${PREFIX}/lib/uni @cd ${WRKSRC} && ${GMAKE} prepareexports @cd ${WRKSRC} && ${GMAKE} -s --no-print-directory exportnames | \ ${SED} 'y/ /\n/; /^$$/d ; s+${PORTNAME}/++g' | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/uni - @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < ${FILESDIR}/ghchtk > ${WRKSRC}/ghchtk - @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < ${FILESDIR}/ghcihtk > ${WRKSRC}/ghcihtk - @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < ${FILESDIR}/uni-package.conf > ${WRKSRC}/uni-package.conf + + @cd ${PREFIX}/lib/uni && ${FIND} . -type d -print0 | \ + ${XARGS} -0 ${CHMOD} 755 # ugly, but necessary + + @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < \ + ${FILESDIR}/ghchtk > ${WRKSRC}/ghchtk + @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < \ + ${FILESDIR}/ghcihtk > ${WRKSRC}/ghcihtk + @${SED} 's|#PWD|${PREFIX}/lib/uni|g' < \ + ${FILESDIR}/uni-package.conf > ${WRKSRC}/uni-package.conf @${INSTALL_DATA} ${WRKSRC}/uni-package.conf ${PREFIX}/lib/uni @${INSTALL_SCRIPT} ${WRKSRC}/ghchtk ${PREFIX}/bin @${INSTALL_SCRIPT} ${WRKSRC}/ghcihtk ${PREFIX}/bin - @${CAT} ${PKGMESSAGE} -.include + @${ECHO_MSG} + @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' + @${ECHO_MSG} + +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/hs-uni/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 9 Jun 2003 20:51:20 -0000 1.1 +++ distinfo 14 Nov 2003 23:17:11 -0000 @@ -1 +1 @@ -MD5 (uni-0.99-src.tar.gz) = cc083f42fa3460dde97687f4d69220a3 +MD5 (uni-0.99-src.tar.gz) = 4de90299132570bb2db010e917d985be Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/devel/hs-uni/pkg-message,v retrieving revision 1.1 diff -u -r1.1 pkg-message --- pkg-message 9 Jun 2003 20:51:20 -0000 1.1 +++ pkg-message 5 Sep 2003 21:21:05 -0000 @@ -1,5 +1,14 @@ The workbench has been installed into ${PREFIX}/lib/uni. The two helper scripts ghchtk and ghcihtk have been installed into -${PREFIX}/bin and can be used to easily add the Htk package-conf to the + + %%PREFIX%%/bin + +and can be used to easily add the Htk package-conf to the ghc(i) command line. + +You may need to set the UNIWISH environment variable to point to the +version of wish that you are using. For example, for the tk83 port: + +export UNIWISH=wish8.3 (sh) +setenv UNIWISH wish8.3 (csh) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/hs-uni/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 9 Jun 2003 20:51:20 -0000 1.1 +++ pkg-plist 19 Nov 2003 20:20:37 -0000 @@ -2,17 +2,6 @@ bin/ghcihtk lib/uni/bdb-package.options.in lib/uni/configure -lib/uni/davinci/DaVinciBasic.hi -lib/uni/davinci/DaVinciGraph.hi -lib/uni/davinci/DaVinciTypes.hi -lib/uni/davinci/libuni-davinci.a -lib/uni/davinci/test/MainDepend.hs -lib/uni/davinci/test/TestDaVinci.hs -lib/uni/davinci/test/TestDaVinciDouble.hs -lib/uni/davinci/test/TestGraphEditor.hs -lib/uni/davinci/test/TestGraphEditor2.hs -lib/uni/davinci/test/TestGraphEditorRemote.hs -lib/uni/davinci/uni-davinci.o lib/uni/events/After.hi lib/uni/events/Cells.hi lib/uni/events/Channels.hi @@ -43,30 +32,8 @@ lib/uni/events/test/libuni-events-test.a lib/uni/events/test/uni-events-test.o lib/uni/events/uni-events.o -lib/uni/graphs/DisplayGraph.hi -lib/uni/graphs/GetAttributes.hi -lib/uni/graphs/Graph.hi -lib/uni/graphs/GraphConfigure.hi -lib/uni/graphs/GraphConnection.hi -lib/uni/graphs/GraphDisp.hi -lib/uni/graphs/GraphEditor.hi -lib/uni/graphs/GraphEditorRemote.hi -lib/uni/graphs/GraphEditorService.hi -lib/uni/graphs/MainGraphEditorServer.hs -lib/uni/graphs/NewNames.hi -lib/uni/graphs/RemoveAncestors.hi -lib/uni/graphs/SimpleGraph.hi -lib/uni/graphs/libuni-graphs.a -lib/uni/graphs/test/DrawDepend.hi -lib/uni/graphs/test/GraphDispTest.hi -lib/uni/graphs/test/Hasse.hi -lib/uni/graphs/test/RemoveAncestorsTest.hi -lib/uni/graphs/test/TestGetAttributes.hs -lib/uni/graphs/test/TestGetAttributes2.hs -lib/uni/graphs/test/TopSort.hi -lib/uni/graphs/test/libuni-graphs-test.a -lib/uni/graphs/test/uni-graphs-test.o -lib/uni/graphs/uni-graphs.o +lib/uni/ghchtk.export +lib/uni/ghcihtk.export lib/uni/htk/examples/canvas/Mainblobs.hs lib/uni/htk/examples/canvas/MaincanvasEx.hs lib/uni/htk/examples/canvas/MaingoBoard.hs @@ -86,6 +53,7 @@ lib/uni/htk/examples/simple/Mainhello4.hs lib/uni/htk/examples/simple/MainlistEx.hs lib/uni/htk/examples/simple/MainmenuEx.hs +lib/uni/htk/examples/simple/MainsimpleButton.hs lib/uni/htk/examples/simple/Maintexttag.hs lib/uni/htk/examples/tix/Mainpanedwindow.hs lib/uni/htk/examples/tix/Maintixwidgets.hs @@ -93,7 +61,10 @@ lib/uni/htk/examples/toolkit/Mainfiledialog.hs lib/uni/htk/examples/toolkit/Mainlogwin.hs lib/uni/htk/examples/toolkit/Mainmarkup.hs +lib/uni/htk/examples/toolkit/Mainnewfiledialog.hs +lib/uni/htk/examples/toolkit/MainsimpleListBox.hs lib/uni/htk/examples/toolkit/Mainsimpleform.hs +lib/uni/htk/examples/toolkit/Mainsimpleform2.hs lib/uni/htk/examples/toolkit/Mainsimplemenu.hs lib/uni/htk/examples/toolkit/Mainspinbutton.hs lib/uni/htk/examples/toolkit/Maintreelist.hs @@ -186,6 +157,7 @@ lib/uni/htk/imports/Selection.hi lib/uni/htk/imports/Separator.hi lib/uni/htk/imports/SimpleForm.hi +lib/uni/htk/imports/SimpleListBox.hi lib/uni/htk/imports/Slider.hi lib/uni/htk/imports/Space.hi lib/uni/htk/imports/SpinButton.hi @@ -218,8 +190,10 @@ lib/uni/includes/default_options.h lib/uni/includes/new_object.h lib/uni/includes/runWish.h +lib/uni/install lib/uni/mk/FixFileNames lib/uni/mk/boilerplate.mk.in +lib/uni/mk/latex.mk lib/uni/mk/machinedep.mk.in lib/uni/mk/suffix.mk lib/uni/mk/var.mk @@ -231,13 +205,16 @@ lib/uni/posixutil/MainrunCommand.c lib/uni/posixutil/ProcessClasses.hi lib/uni/posixutil/SafeSystem.hi +lib/uni/posixutil/daVinci.debug.in lib/uni/posixutil/libuni-posixutil.a +lib/uni/posixutil/log lib/uni/posixutil/runCommand lib/uni/posixutil/test/ChildProcessTest.hi lib/uni/posixutil/test/ExecProcessTest.hi lib/uni/posixutil/test/libuni-posixutil-test.a lib/uni/posixutil/test/uni-posixutil-test.o lib/uni/posixutil/uni-posixutil.o +lib/uni/posixutil/wish.debug.in lib/uni/reactor/BSem.hi lib/uni/reactor/InfoBus.hi lib/uni/reactor/Lock.hi @@ -246,20 +223,16 @@ lib/uni/reactor/VSem.hi lib/uni/reactor/libuni-reactor.a lib/uni/reactor/uni-reactor.o -lib/uni/server/CallServer.hi -lib/uni/server/EchoService.hi -lib/uni/server/HostsPorts.hi -lib/uni/server/MultiServer.hi -lib/uni/server/Notification.hi -lib/uni/server/Server.hi -lib/uni/server/ServiceClass.hi -lib/uni/server/Testserver.hs -lib/uni/server/libuni-server.a -lib/uni/server/uni-server.o lib/uni/uni-package.conf lib/uni/uni-package.conf.export lib/uni/util/AtomString.hi +lib/uni/util/Binary.hi +lib/uni/util/BinaryAll.hi +lib/uni/util/BinaryExtras.hi +lib/uni/util/BinaryInstances.hi +lib/uni/util/BinaryUtils.hi lib/uni/util/Broadcaster.hi +lib/uni/util/Bytes.hi lib/uni/util/Cache.hi lib/uni/util/CacheTable.hi lib/uni/util/CommandStringSub.hi @@ -272,6 +245,8 @@ lib/uni/util/ExtendedPrelude.hi lib/uni/util/FileNames.hi lib/uni/util/FileSystem.hi +lib/uni/util/HostName.hi +lib/uni/util/ICStringLen.hi lib/uni/util/IOExtras.hi lib/uni/util/IntPlus.hi lib/uni/util/KeyedChanges.hi @@ -289,8 +264,13 @@ lib/uni/util/Sink.hi lib/uni/util/SmallSet.hi lib/uni/util/Sources.hi +lib/uni/util/Store.hi +lib/uni/util/StrError.hi +lib/uni/util/StringSkip.hi +lib/uni/util/TSem.hi lib/uni/util/TempFile.hi lib/uni/util/Thread.hi +lib/uni/util/ThreadDict.hi lib/uni/util/UnionFind.hi lib/uni/util/UniqueFile.hi lib/uni/util/UniqueString.hi @@ -298,10 +278,12 @@ lib/uni/util/VariableMap.hi lib/uni/util/VariableSet.hi lib/uni/util/VariableSetBlocker.hi +lib/uni/util/VisitedSet.hi lib/uni/util/WBFiles.hi lib/uni/util/WaitOnN.hi lib/uni/util/libuni-util.a lib/uni/util/test/Huffman.hi +lib/uni/util/test/TestBinary.hs lib/uni/util/test/TestDynamics.hs lib/uni/util/test/TestDynamics2.hs lib/uni/util/test/TestFact.hs @@ -312,9 +294,10 @@ lib/uni/util/test/libuni-util-test.a lib/uni/util/test/uni-util-test.o lib/uni/util/uni-util.o +@dirrm share/nls/en_US.US-ASCII +@dirrm share/nls/POSIX @dirrm lib/uni/util/test @dirrm lib/uni/util -@dirrm lib/uni/server @dirrm lib/uni/reactor @dirrm lib/uni/posixutil/test @dirrm lib/uni/posixutil @@ -330,10 +313,6 @@ @dirrm lib/uni/htk/examples/canvas @dirrm lib/uni/htk/examples @dirrm lib/uni/htk -@dirrm lib/uni/graphs/test -@dirrm lib/uni/graphs @dirrm lib/uni/events/test @dirrm lib/uni/events -@dirrm lib/uni/davinci/test -@dirrm lib/uni/davinci @dirrm lib/uni --- hs-uni-diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: