Index: head/x11-toolkits/hs-gtk+hs/Makefile =================================================================== --- head/x11-toolkits/hs-gtk+hs/Makefile (revision 67373) +++ head/x11-toolkits/hs-gtk+hs/Makefile (revision 67374) @@ -1,37 +1,47 @@ # New ports collection makefile for: gtk+hs # Date created: 23 August 2002 # Whom: Oliver Braun # # $FreeBSD$ # PORTNAME= gtk+hs -PORTVERSION= 0.11.5 -PORTREVISION= 1 +PORTVERSION= 0.14.10 CATEGORIES= x11-toolkits MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/gtk/ PKGNAMEPREFIX= hs- MAINTAINER= obraun@FreeBSD.org BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ c2hs:${PORTSDIR}/devel/hs-c2hs RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ c2hs:${PORTSDIR}/devel/hs-c2hs +.if defined(WITH_IHASKELL) +RUN_DEPENDS+= ports-config:${PORTSDIR}/devel/hs-hpl +.endif USE_GNOMENG= yes USE_GNOME= glib12 gtk12 USE_REINPLACE= yes HAS_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX} --enable-add-package +.if defined(WITH_IHASKELL) +CONFIGURE_ARGS+= --with-ih +.endif PLIST_SUB+= PORTVERSION="${PORTVERSION}" +pre-everything:: +.if !defined(WITH_IHASKELL) + @${ECHO_CMD} "To build gtk+hs with iHaskell define WITH_IHASKELL." +.endif + post-patch: - ${REINPLACE_CMD} -e 's/gtk-config/gtk12-config/g ; \ + @${REINPLACE_CMD} -e 's/gtk-config/gtk12-config/g ; \ s/glib-config/glib12-config/g' ${WRKSRC}/configure .include Property changes on: head/x11-toolkits/hs-gtk+hs/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/x11-toolkits/hs-gtk+hs/distinfo =================================================================== --- head/x11-toolkits/hs-gtk+hs/distinfo (revision 67373) +++ head/x11-toolkits/hs-gtk+hs/distinfo (revision 67374) @@ -1 +1 @@ -MD5 (gtk+hs-0.11.5.tar.gz) = 5594eef25b1f5ea64bd0ee59135d251b +MD5 (gtk+hs-0.14.10.tar.gz) = 9e17c1f39b235586d2713efb91e017e7 Property changes on: head/x11-toolkits/hs-gtk+hs/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-gtk+hs/files/patch-configure =================================================================== --- head/x11-toolkits/hs-gtk+hs/files/patch-configure (revision 67373) +++ head/x11-toolkits/hs-gtk+hs/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig Sun Sep 15 21:05:20 2002 -+++ configure Sun Sep 15 21:06:38 2002 -@@ -1265,7 +1265,7 @@ - else - ${GHC-ghc} --version > conftestghc 2>&1 - cat conftestghc >&5 -- gtkhs_cv_ghc_version=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.]\+\).*/\1/p'` -+ gtkhs_cv_ghc_version=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.][0-9.]*\).*/\1/p'` - rm -fr conftest* - if test "$gtkhs_cv_ghc_version" = "" - then Property changes on: head/x11-toolkits/hs-gtk+hs/files/patch-configure ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-toolkits/hs-gtk+hs/files/patch-Makefile =================================================================== --- head/x11-toolkits/hs-gtk+hs/files/patch-Makefile (nonexistent) +++ head/x11-toolkits/hs-gtk+hs/files/patch-Makefile (revision 67374) @@ -0,0 +1,11 @@ +--- Makefile.orig Sun Sep 22 23:12:57 2002 ++++ Makefile Sun Sep 22 23:14:03 2002 +@@ -184,7 +184,7 @@ + endif + ifeq ($(ENABLE_ADD_PACKAGE),yes) + $(DESTDIR)$(bindir)/gtkhs-config --package-conf\ +- | $(GHCPKG) --add-package ++ | $(GHCPKG) --update-package --auto-ghci-libs + endif + + # admin targets Property changes on: head/x11-toolkits/hs-gtk+hs/files/patch-Makefile ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11-toolkits/hs-gtk+hs/pkg-plist =================================================================== --- head/x11-toolkits/hs-gtk+hs/pkg-plist (revision 67373) +++ head/x11-toolkits/hs-gtk+hs/pkg-plist (revision 67374) @@ -1,123 +1,142 @@ bin/gtkhs-config +lib/gtk+hs-%%PORTVERSION%%/ghc5/gtkhs.conf +lib/gtk+hs-%%PORTVERSION%%/ghc5/gdkHS.o +lib/gtk+hs-%%PORTVERSION%%/ghc5/glibHS.o +lib/gtk+hs-%%PORTVERSION%%/ghc5/gtkHS.o +lib/gtk+hs-%%PORTVERSION%%/ghc5/libgdkHS.a +lib/gtk+hs-%%PORTVERSION%%/ghc5/libglibHS.a +lib/gtk+hs-%%PORTVERSION%%/ghc5/libgtkHS.a lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/Gdk.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkColor.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkDrawable.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkEvents.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkFont.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkGC.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkMarsh.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkPixmap.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkTypes.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkVisual.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkWindow.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GConfig.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GLib.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GList.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GMarsh.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GModule.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GThread.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GTimer.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib/GTypes.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/Gtk.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkAccelGroup.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkAdjustment.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkAdjustmentSignal.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkAlignment.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkBin.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkBox.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkButton.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkButtonSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCList.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCListSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCTree.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCheckButton.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCheckMenuItem.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCheckMenuItemSignal.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCombo.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCompat.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkContainer.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkData.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkDrawingArea.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkEditable.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkEditableSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkEntry.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkEnums.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkEventBox.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkFileSel.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkFrame.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHandleBox.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHBox.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHPaned.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHScale.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHScrollbar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHSeparator.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkItem.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkItemSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkLabel.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkList.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkListItem.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkListSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMain.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMainSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMarsh.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMenu.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMenuBar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMenuItem.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMenuItemSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkMisc.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkNotebook.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkObject.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkObjectSignal.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkOptionMenu.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkPaned.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkPixmap.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkProgress.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkProgressBar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkRadioButton.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkRadioMenuItem.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkRange.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkRuler.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkScale.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkScrollbar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkScrolledWindow.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkSeparator.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkSignal.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkStatusBar.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkStatusbar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkStyle.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTable.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkText.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkToggleButton.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkToggleButtonSignal.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTooltips.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTree.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTreeItem.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTreeItemSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTypeUtils.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVBox.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVPaned.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVScale.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVScrollbar.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVSeparator.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVersion.hi +lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkViewport.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkWidget.hi -lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkWidgetSignal.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkWindow.hi lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAdjustmentSignal_stub.h -lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkButtonSignal_stub.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkButton_stub.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCheckMenuItemSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCListSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCList_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCTree_stub.h -lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEditableSignal_stub.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEditable_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkItemSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkListSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMenuItemSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkObjectSignal_stub.h -lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkToggleButtonSignal_stub.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkToggleButton_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTreeItemSignal_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTypeUtils_stub.h -lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkWidgetSignal_stub.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkWidget_stub.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gMarsh.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkAdjustment.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkCTree.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkFileSel.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkHaskell.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkObject.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkStyle.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkToggleButton.h +lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkTooltips.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkWidget.h lib/gtk+hs-%%PORTVERSION%%/ghc5/include/haskell.h -lib/gtk+hs-%%PORTVERSION%%/ghc5/libgdkHS.a -lib/gtk+hs-%%PORTVERSION%%/ghc5/libglibHS.a -lib/gtk+hs-%%PORTVERSION%%/ghc5/libgtkHS.a @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/include @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5 @dirrm lib/gtk+hs-%%PORTVERSION%% +@exec %D/bin/gtkhs-config --package-conf | %D/bin/ghc-pkg -u -g +@unexec %D/bin/ghc-pkg -r gtkhs Property changes on: head/x11-toolkits/hs-gtk+hs/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property