aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deskutils/etoile-dictionaryreader/Makefile7
-rw-r--r--deskutils/etoile-dictionaryreader/distinfo6
-rw-r--r--deskutils/etoile-menuserver/Makefile8
-rw-r--r--deskutils/etoile-menuserver/distinfo6
-rw-r--r--deskutils/etoile-menuserver/pkg-plist98
-rw-r--r--deskutils/etoile-systemconfig/Makefile5
-rw-r--r--deskutils/etoile-systemconfig/distinfo6
-rw-r--r--deskutils/etoile-systemconfig/pkg-plist4
-rw-r--r--deskutils/etoile-ui/Makefile11
-rw-r--r--deskutils/etoile-ui/distinfo6
-rw-r--r--deskutils/etoile-ui/pkg-descr9
-rw-r--r--deskutils/etoile-ui/pkg-plist72
-rw-r--r--devel/etoile-unitkit/Makefile8
-rw-r--r--devel/etoile-unitkit/distinfo6
-rw-r--r--devel/etoile-unitkit/pkg-plist36
-rw-r--r--editors/etoile-typewriter/Makefile7
-rw-r--r--editors/etoile-typewriter/distinfo6
-rw-r--r--graphics/popplerkit/Makefile17
-rw-r--r--graphics/popplerkit/distinfo6
-rw-r--r--graphics/popplerkit/pkg-descr6
-rw-r--r--graphics/popplerkit/pkg-plist71
-rw-r--r--graphics/vindaloo/Makefile12
-rw-r--r--graphics/vindaloo/distinfo6
-rw-r--r--graphics/vindaloo/pkg-plist1
-rw-r--r--textproc/etoile-lucenekit/Makefile12
-rw-r--r--textproc/etoile-lucenekit/distinfo6
-rw-r--r--textproc/etoile-lucenekit/pkg-descr6
-rw-r--r--textproc/etoile-ogrekit/Makefile5
-rw-r--r--textproc/etoile-ogrekit/distinfo6
-rw-r--r--textproc/etoile-ogrekit/pkg-plist2
-rw-r--r--x11-themes/etoile-azbackground/Makefile4
-rw-r--r--x11-themes/etoile-azbackground/distinfo6
-rw-r--r--x11-themes/etoile-iconkit/Makefile7
-rw-r--r--x11-themes/etoile-iconkit/distinfo6
-rw-r--r--x11-themes/etoile-iconkit/pkg-descr8
-rw-r--r--x11-themes/etoile-iconkit/pkg-plist1
-rw-r--r--x11/etoile-idle/Makefile3
-rw-r--r--x11/etoile-idle/distinfo6
-rw-r--r--x11/etoile-xwindowserverkit/Makefile5
-rw-r--r--x11/etoile-xwindowserverkit/distinfo6
-rw-r--r--x11/etoile-xwindowserverkit/pkg-plist1
41 files changed, 311 insertions, 199 deletions
diff --git a/deskutils/etoile-dictionaryreader/Makefile b/deskutils/etoile-dictionaryreader/Makefile
index fef72985925a..830015b3a370 100644
--- a/deskutils/etoile-dictionaryreader/Makefile
+++ b/deskutils/etoile-dictionaryreader/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= dictionaryreader
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= deskutils gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,13 +15,17 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Dict client for GNUstep
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
+USE_GNUSTEP_LOCAL_LIBS+= EtoileUI:${ETOILE_UI_PORT}
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/User/DictionaryReader
+ETOILE_UI_PORT?= deskutils/etoile-ui
+
.include <bsd.port.mk>
diff --git a/deskutils/etoile-dictionaryreader/distinfo b/deskutils/etoile-dictionaryreader/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-dictionaryreader/distinfo
+++ b/deskutils/etoile-dictionaryreader/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index f0de63b4b260..93ba9181820d 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= menuserver
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= deskutils gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,13 +15,14 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project MenuServer application
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
-USE_GNUSTEP_SYSTEM_LIBS+= WorkspaceCommKit:${ETOILE_SYSTEM_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= SystemConfig:${SYSTEMCONFIG_PORT}
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/MenuServer
@@ -30,6 +30,6 @@ ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include
ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
-ETOILE_SYSTEM_PORT?= sysutils/etoile-system
+SYSTEMCONFIG_PORT?= deskutils/etoile-systemconfig
.include <bsd.port.mk>
diff --git a/deskutils/etoile-menuserver/distinfo b/deskutils/etoile-menuserver/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-menuserver/distinfo
+++ b/deskutils/etoile-menuserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-menuserver/pkg-plist b/deskutils/etoile-menuserver/pkg-plist
index 9b934f5ccbd6..ac7ec3ceab6a 100644
--- a/deskutils/etoile-menuserver/pkg-plist
+++ b/deskutils/etoile-menuserver/pkg-plist
@@ -1,49 +1,49 @@
-Local/Applications/EtoileMenuServer.app/EtoileMenuServer
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/AboutEtoileEntry
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.rtf
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.tiff
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.classes
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.info
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/objects.gorm
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/ApplicationsEntry
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.classes
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.info
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/objects.gorm
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/ClockMenulet
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/stamp.make
-Local/Applications/EtoileMenuServer.app/Resources/Etoile.tiff
-Local/Applications/EtoileMenuServer.app/Resources/EtoileLogo.tiff
-Local/Applications/EtoileMenuServer.app/Resources/EtoileLogoH.tiff
-Local/Applications/EtoileMenuServer.app/Resources/EtoileMenuServer.desktop
-Local/Applications/EtoileMenuServer.app/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarFiller.tiff
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarLeftEdge.tiff
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/SystemPreferencesEntry
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/stamp.make
-Local/Tools/EtoileMenuServer
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources
-@dirrm Local/Applications/EtoileMenuServer.app
+System/Applications/EtoileMenuServer.app/EtoileMenuServer
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/AboutEtoileEntry
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.rtf
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.tiff
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.classes
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.info
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/objects.gorm
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/ApplicationsEntry
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.classes
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.info
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/objects.gorm
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/ClockMenulet
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/Etoile.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileLogo.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileLogoH.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileMenuServer.desktop
+System/Applications/EtoileMenuServer.app/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/MenuBarFiller.tiff
+System/Applications/EtoileMenuServer.app/Resources/MenuBarLeftEdge.tiff
+System/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/SystemPreferencesEntry
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/stamp.make
+System/Tools/EtoileMenuServer
+@dirrm System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources
+@dirrm System/Applications/EtoileMenuServer.app
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index 306405af0c25..97928271e3d1 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= systemconfig
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= deskutils gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,6 +15,7 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Framework which provides a way to set system preferences
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,6 +23,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+DEFAULT_LIBVERSION= 0.2
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/SystemConfig
diff --git a/deskutils/etoile-systemconfig/distinfo b/deskutils/etoile-systemconfig/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-systemconfig/distinfo
+++ b/deskutils/etoile-systemconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-systemconfig/pkg-plist b/deskutils/etoile-systemconfig/pkg-plist
index 94a316e972ef..010b8d644dc7 100644
--- a/deskutils/etoile-systemconfig/pkg-plist
+++ b/deskutils/etoile-systemconfig/pkg-plist
@@ -1,11 +1,15 @@
Local/Library/Frameworks/SystemConfig.framework/Headers
Local/Library/Frameworks/SystemConfig.framework/Resources
Local/Library/Frameworks/SystemConfig.framework/SystemConfig
+Local/Library/Frameworks/SystemConfig.framework/SystemConfig.framework
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCConfig.h
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCKeyboard.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCMachineInfo.h
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCMonitor.h
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCMouse.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCPower.h
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCSound.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/X11Keyboard.h
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/SystemConfig
Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/libSystemConfig.so
diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index 97744926df52..8ff34afd2dda 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= ui
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= deskutils gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,15 +15,21 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project EtoileUI framework
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-DEFAULT_LIBVERSION= 0.1
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+USE_GNUSTEP_LOCAL_LIBS+= EtoileFoundation:${FOUNDATION_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= CoreObject:${COREOBJECT_PORT}
+DEFAULT_LIBVERSION= 0.4
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/EtoileUI
+FOUNDATION_PORT?= devel/etoile-foundation
+COREOBJECT_PORT?= devel/etoile-coreobject
+
.include <bsd.port.mk>
diff --git a/deskutils/etoile-ui/distinfo b/deskutils/etoile-ui/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-ui/distinfo
+++ b/deskutils/etoile-ui/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-ui/pkg-descr b/deskutils/etoile-ui/pkg-descr
index 4c82da32eaad..1de8ad8147ad 100644
--- a/deskutils/etoile-ui/pkg-descr
+++ b/deskutils/etoile-ui/pkg-descr
@@ -1,3 +1,10 @@
-EtoileUI framework
+EtoileUI is a high-level OOUI toolkit that provides a uniform tree
+representation for graphical objects on top of the AppKit. All User Interface
+concerns such as layouts, event handlers, styles, model objects etc. intends
+to be implemented as pluggable aspects. It also shares the same interfaces as
+other CoreObject systems. The combination of these three key features makes
+possible to inspect and reshape both User Interface and model objects at
+runtime through direct manipulation. It comes with a library of layouts
+where each one encapsulate a custom and pluggable UI presentation.
WWW: http://www.etoile-project.org/
diff --git a/deskutils/etoile-ui/pkg-plist b/deskutils/etoile-ui/pkg-plist
index 706df16f869b..443568d2e601 100644
--- a/deskutils/etoile-ui/pkg-plist
+++ b/deskutils/etoile-ui/pkg-plist
@@ -1,12 +1,78 @@
Local/Library/Frameworks/EtoileUI.framework/EtoileUI
+Local/Library/Frameworks/EtoileUI.framework/EtoileUI.framework
Local/Library/Frameworks/EtoileUI.framework/Headers
Local/Library/Frameworks/EtoileUI.framework/Resources
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/EtoileUI
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/Controls+Etoile.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETApplication.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETBrowserLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETCompatibility.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETComputedLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainer+Controller.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainers.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETEvent.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETFlowLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETFreeLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETInspecting.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETInspector.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Events.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Factory.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Reflection.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemBuilder.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemGroup+Mutation.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemGroup.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutLine.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLineLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectBrowserLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectRegistry+EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETOutlineLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPaneLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPaneSwitcherLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPersistencyController.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPickboard.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStackLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStyle.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStyleRenderer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETTableLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETTextEditorLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETView.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETViewModelLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETWindowItem.h
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileCompatibility.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/FSBrowserCell.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/GNUstep.h
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSBezierPathCappedBoxes.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSImage+Etoile.h
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSImage+NiceScaling.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSView+Etoile.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSWindow+Etoile.h
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKNibOwner.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKPluginsRegistry+Icons.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/objects.gorm
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/objects.gorm
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so.%%LIBVERSION%%
Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so.%%MAJORLIBVERSION%%
@@ -16,6 +82,12 @@ Local/Library/Headers/EtoileUI
Local/Library/Libraries/libEtoileUI.so
Local/Library/Libraries/libEtoileUI.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libEtoileUI.so.%%LIBVERSION%%
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm
@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources
@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers
@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index 4e40e6149efb..5018121a8bec 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= unitkit
-PORTVERSION= 1.1
-PORTREVISION= 2
+PORTVERSION= 1.3
CATEGORIES= devel gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
-DISTNAME= etoile-0.2
+DISTNAME= etoile-0.4.0
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project UnitKit test framework on GNUstep
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,7 +23,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-WRKSRC= ${WRKDIR}/Etoile-0.2
+WRKSRC= ${WRKDIR}/Etoile-0.4.0
USE_GNUSTEP_MAKE_DIRS+= Frameworks/UnitKit
.include <bsd.port.mk>
diff --git a/devel/etoile-unitkit/distinfo b/devel/etoile-unitkit/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/devel/etoile-unitkit/distinfo
+++ b/devel/etoile-unitkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/devel/etoile-unitkit/pkg-plist b/devel/etoile-unitkit/pkg-plist
index b2de9b184500..94af0a1c9d32 100644
--- a/devel/etoile-unitkit/pkg-plist
+++ b/devel/etoile-unitkit/pkg-plist
@@ -1,28 +1,28 @@
Local/Library/Frameworks/UnitKit.framework/Headers
Local/Library/Frameworks/UnitKit.framework/Resources
Local/Library/Frameworks/UnitKit.framework/UnitKit
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKRunner.h
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTask.h
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTest.h
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTestHandler.h
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UnitKit.h
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj/UKRunner.strings
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj/UKTestHandler.strings
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/UnitKit
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers/UKRunner.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers/UKTask.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers/UKTest.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers/UKTestHandler.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers/UnitKit.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/UKRunner.strings
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/UKTestHandler.strings
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/UnitKit
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/libUnitKit.so
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/libUnitKit.so.%%MAJORVERSION%%
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/libUnitKit.so.%%VERSION%%
Local/Library/Frameworks/UnitKit.framework/Versions/Current
Local/Library/Frameworks/UnitKit.framework/libUnitKit.so
Local/Library/Headers/UnitKit
Local/Library/Libraries/libUnitKit.so
-Local/Library/Libraries/libUnitKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libUnitKit.so.%%LIBVERSION%%
+Local/Library/Libraries/libUnitKit.so.%%MAJORVERSION%%
+Local/Library/Libraries/libUnitKit.so.%%VERSION%%
Local/Tools/ukrun
-@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj
-@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORVERSION%%
@dirrm Local/Library/Frameworks/UnitKit.framework/Versions
@dirrm Local/Library/Frameworks/UnitKit.framework
diff --git a/editors/etoile-typewriter/Makefile b/editors/etoile-typewriter/Makefile
index 53d2bcab2981..206caea9a6b5 100644
--- a/editors/etoile-typewriter/Makefile
+++ b/editors/etoile-typewriter/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= typewriter
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= editors gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,15 +15,19 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= General text editor for plain and rich format text
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= OgreKit:${OGREKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= ScriptKit:${SCRIPTKIT_PORT}
USE_GNUSTEP_MAKE_DIRS+= Services/User/Typewriter
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
+
OGREKIT_PORT?= textproc/etoile-ogrekit
+SCRIPTKIT_PORT?= lang/etoile-scriptkit
.include <bsd.port.mk>
diff --git a/editors/etoile-typewriter/distinfo b/editors/etoile-typewriter/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/editors/etoile-typewriter/distinfo
+++ b/editors/etoile-typewriter/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index c1390c530168..fe69b2a01a6d 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= popplerkit
-PORTVERSION= 0.0.${SNAPSHOT}
-PORTREVISION= 3
+PORTVERSION= 1.0.1
CATEGORIES= graphics gnustep
-MASTER_SITES= http://download.gna.org/gsimageapps/PopplerKit/
-DISTNAME= PopplerKit-${SNAPSHOT}
+MASTER_SITES= http://download.gna.org/etoile/
+DISTNAME= etoile-0.4.0
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Framework that supports rendering of PDF content
LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
@@ -24,12 +24,7 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_GNOME= gnomeprefix gnomehack gtk20
-SNAPSHOT= 20050720
-WRKSRC= ${WRKDIR}/PopplerKit
-ADDITIONAL_CPPFLAGS+= -DPOPPLER_0_5
-
-post-patch:
- ${REINPLACE_CMD} -e 's|poppler-cairo|poppler-cairo-broken|' \
- ${WRKSRC}/config.sh
+WRKSRC= ${WRKDIR}/Etoile-0.4.0
+USE_GNUSTEP_MAKE_DIRS+= Frameworks/PopplerKit
.include <bsd.port.mk>
diff --git a/graphics/popplerkit/distinfo b/graphics/popplerkit/distinfo
index 9c97e3a2049c..2c1e8a612c54 100644
--- a/graphics/popplerkit/distinfo
+++ b/graphics/popplerkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PopplerKit-20050720.tar.gz) = b6f055e3574b94b7d05c2d793a573c98
-SHA256 (PopplerKit-20050720.tar.gz) = c62b21dd236a9dfaf13ccd27ecf38f9c150323efcc6237d71dbbc21690aae6ab
-SIZE (PopplerKit-20050720.tar.gz) = 1724697
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/graphics/popplerkit/pkg-descr b/graphics/popplerkit/pkg-descr
index 7c66198ade91..fc218872cccb 100644
--- a/graphics/popplerkit/pkg-descr
+++ b/graphics/popplerkit/pkg-descr
@@ -1,4 +1,10 @@
PopplerKit is a Framework for accessing and rendering PDF content.
It is based on the poppler library.
+Features:
+- Render PDF content.
+- Extract text from a PDF document.
+- Access a PDF document's outline.
+- Search in PDF documents.
+
WWW: http://home.gna.org/gsimageapps/
diff --git a/graphics/popplerkit/pkg-plist b/graphics/popplerkit/pkg-plist
index d450bedf2dc5..8570365d0be2 100644
--- a/graphics/popplerkit/pkg-plist
+++ b/graphics/popplerkit/pkg-plist
@@ -1,43 +1,46 @@
GNUstep/Local/Library/Frameworks/PopplerKit.framework/Headers
GNUstep/Local/Library/Frameworks/PopplerKit.framework/PopplerKit
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/PopplerKit.framework
GNUstep/Local/Library/Frameworks/PopplerKit.framework/Resources
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCachingRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerCairoImageRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDirectBufferedRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDocument+Rendering.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerDocument.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerFontManager.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerKit.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerPage.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers/PopplerSplashRenderer.h
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/PopplerKit
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/d050000l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n019024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n021024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022003l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022004l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022023l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/n022024l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources/s050000l.pfb
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/libPopplerKit.so.%%LIBVERSION%%
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerCachingRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerCairoImageRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDirectBufferedRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDocument+Rendering.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerDocument.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerFontManager.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerKit.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerPage.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerSplashRenderer.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerTextHit.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers/PopplerTextSearch.h
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/PopplerKit
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/d050000l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n019024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n021024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022003l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022004l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022023l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/n022024l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources/s050000l.pfb
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/libPopplerKit.so.%%VERSION%%
GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/Current
GNUstep/Local/Library/Frameworks/PopplerKit.framework/libPopplerKit.so
GNUstep/Local/Library/Headers/PopplerKit
GNUstep/Local/Library/Libraries/libPopplerKit.so
-GNUstep/Local/Library/Libraries/libPopplerKit.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libPopplerKit.so.%%LIBVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Resources
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0/Headers
-@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/1.0
+GNUstep/Local/Library/Libraries/libPopplerKit.so.%%MAJORVERSION%%
+GNUstep/Local/Library/Libraries/libPopplerKit.so.%%VERSION%%
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions/%%MAJORVERSION%%
@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework/Versions
@dirrm GNUstep/Local/Library/Frameworks/PopplerKit.framework
diff --git a/graphics/vindaloo/Makefile b/graphics/vindaloo/Makefile
index 658f9e1590ca..5ba053e68439 100644
--- a/graphics/vindaloo/Makefile
+++ b/graphics/vindaloo/Makefile
@@ -7,23 +7,27 @@
PORTNAME= vindaloo
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnustep
-MASTER_SITES= http://download.gna.org/gsimageapps/Vindaloo/
-DISTNAME= Vindaloo-${PORTVERSION}
+MASTER_SITES= http://download.gna.org/etoile/
+DISTNAME= etoile-0.4.0
MAINTAINER= dinoex@FreeBSD.org
COMMENT= PDF Reader for GNUstep
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= PopplerKit:${POPPLERKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= IconKit:${ICONKIT_PORT}
-WRKSRC= ${WRKDIR}/Vindaloo
+WRKSRC= ${WRKDIR}/Etoile-0.4.0
+USE_GNUSTEP_MAKE_DIRS+= Services/User/Vindaloo
POPPLERKIT_PORT?= graphics/popplerkit
+ICONKIT_PORT?= x11-themes/etoile-iconkit
.include <bsd.port.mk>
diff --git a/graphics/vindaloo/distinfo b/graphics/vindaloo/distinfo
index 5af2bbc4f958..2c1e8a612c54 100644
--- a/graphics/vindaloo/distinfo
+++ b/graphics/vindaloo/distinfo
@@ -1,3 +1,3 @@
-MD5 (Vindaloo-0.2.tar.gz) = f59cedf003b3dee544c2c3bb42709077
-SHA256 (Vindaloo-0.2.tar.gz) = a008d212ec9b8e74cf5aac6fcb8ef46bbe77eeb9cc31ce7f66656b96bf0771d9
-SIZE (Vindaloo-0.2.tar.gz) = 1727460
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/graphics/vindaloo/pkg-plist b/graphics/vindaloo/pkg-plist
index dd6cd1933522..3170de8bcb5b 100644
--- a/graphics/vindaloo/pkg-plist
+++ b/graphics/vindaloo/pkg-plist
@@ -16,6 +16,7 @@ Local/Applications/Vindaloo.app/Resources/Last.png
Local/Applications/Vindaloo.app/Resources/Next.png
Local/Applications/Vindaloo.app/Resources/Previous.png
Local/Applications/Vindaloo.app/Resources/Vindaloo.desktop
+Local/Applications/Vindaloo.app/Resources/Vindaloo.tif
Local/Applications/Vindaloo.app/Resources/ZoomIn.png
Local/Applications/Vindaloo.app/Resources/ZoomOut.png
Local/Applications/Vindaloo.app/Vindaloo
diff --git a/textproc/etoile-lucenekit/Makefile b/textproc/etoile-lucenekit/Makefile
index d7d1fddfdb63..bf157d33451a 100644
--- a/textproc/etoile-lucenekit/Makefile
+++ b/textproc/etoile-lucenekit/Makefile
@@ -6,13 +6,11 @@
#
PORTNAME= lucenekit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 2
+PORTVERSION= 0.4.0
CATEGORIES= textproc gnustep
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
-DISTNAME= Etoile-${SNAPSHOT}
+DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project OgreKit framework
@@ -26,8 +24,8 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= OgreKit:${OGREKIT_PORT}
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+DEFAULT_LIBVERSION= 0.1.1
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/LuceneKit
OGREKIT_PORT?= textproc/etoile-ogrekit
diff --git a/textproc/etoile-lucenekit/distinfo b/textproc/etoile-lucenekit/distinfo
index 545ac18e8091..2c1e8a612c54 100644
--- a/textproc/etoile-lucenekit/distinfo
+++ b/textproc/etoile-lucenekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/textproc/etoile-lucenekit/pkg-descr b/textproc/etoile-lucenekit/pkg-descr
index 6ce53c5ceef1..c2f3d4374c1e 100644
--- a/textproc/etoile-lucenekit/pkg-descr
+++ b/textproc/etoile-lucenekit/pkg-descr
@@ -1,6 +1,4 @@
-
-Lucene is a high-performance, full-featured text search engine library in Java.
-LuceneKit is a class-to-class port of Lucene in GNUstep. It is a technology
-suitable for nearly any application that requires full-text search.
+Lucene is a high-performance, full-featured text search engine library. It is a
+technology suitable for nearly any application that requires full-text search.
WWW: http://www.etoile-project.org/
diff --git a/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index d7779b65573f..743c75ea216f 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= ogrekit
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= textproc gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -18,6 +17,7 @@ COMMENT= Etoile Project OgreKit framework
LIB_DEPENDS= onig:${PORTSDIR}/${ONIGURUMA4_PORT}
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,6 +25,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+DEFAULT_LIBVERSION= 1.2.1
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/OgreKit
ADDITIONAL_OBJCFLAGS+= -DONIGURUMA_4
diff --git a/textproc/etoile-ogrekit/distinfo b/textproc/etoile-ogrekit/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/textproc/etoile-ogrekit/distinfo
+++ b/textproc/etoile-ogrekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/textproc/etoile-ogrekit/pkg-plist b/textproc/etoile-ogrekit/pkg-plist
index d4b9e2d4e945..5e810a5fe0aa 100644
--- a/textproc/etoile-ogrekit/pkg-plist
+++ b/textproc/etoile-ogrekit/pkg-plist
@@ -1,5 +1,6 @@
Local/Library/Frameworks/OgreKit.framework/Headers
Local/Library/Frameworks/OgreKit.framework/OgreKit
+Local/Library/Frameworks/OgreKit.framework/OgreKit.framework
Local/Library/Frameworks/OgreKit.framework/Resources
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSString_OgreKitAdditions.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGAttributedString.h
@@ -15,6 +16,7 @@ Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGReplaceExpression.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGString.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindAllThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanel.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanelController.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultBranch.h
Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultLeaf.h
diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index 2293d60ae738..74d012b90026 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= azbackground
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= x11-themes gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,6 +15,7 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Small GNUstep application to set xwindow background
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
diff --git a/x11-themes/etoile-azbackground/distinfo b/x11-themes/etoile-azbackground/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-azbackground/distinfo
+++ b/x11-themes/etoile-azbackground/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 9f302d9c18e7..eac7eebde0cb 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= iconkit
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= x11-themes gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,6 +15,9 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project IconKit framework
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
+
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -24,6 +26,7 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= UnitKit:${UNITKIT_PORT}
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+DEFAULT_LIBVERSION= 0.2
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/IconKit
diff --git a/x11-themes/etoile-iconkit/distinfo b/x11-themes/etoile-iconkit/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-iconkit/distinfo
+++ b/x11-themes/etoile-iconkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/x11-themes/etoile-iconkit/pkg-descr b/x11-themes/etoile-iconkit/pkg-descr
index b1742cf5200f..b5e6b15a8728 100644
--- a/x11-themes/etoile-iconkit/pkg-descr
+++ b/x11-themes/etoile-iconkit/pkg-descr
@@ -1,5 +1,7 @@
-This IconKit framework is used to create icons using different elements.
-It helps keeping consistency accross a set of icons (for example,
-using the same background..) and permit to easily create icons "families".
+This framework provides icon theming and various facilities to create icons at
+run-time by compositing by different elements.
+The icon compositing is very useful for the consistency accross a set of icons
+(for example, using the same background) and permit to easily create icon
+families. IconKit icon themes are a complement to Camaelon widget themes.
WWW: http://www.etoile-project.org/
diff --git a/x11-themes/etoile-iconkit/pkg-plist b/x11-themes/etoile-iconkit/pkg-plist
index b0ccf59e4a90..06ba12a31f87 100644
--- a/x11-themes/etoile-iconkit/pkg-plist
+++ b/x11-themes/etoile-iconkit/pkg-plist
@@ -1,5 +1,6 @@
Local/Library/Frameworks/IconKit.framework/Headers
Local/Library/Frameworks/IconKit.framework/IconKit
+Local/Library/Frameworks/IconKit.framework/IconKit.framework
Local/Library/Frameworks/IconKit.framework/Resources
Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconTheme.h
Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/IconKit
diff --git a/x11/etoile-idle/Makefile b/x11/etoile-idle/Makefile
index 7195dd2bbcfe..2778cb2a0aaa 100644
--- a/x11/etoile-idle/Makefile
+++ b/x11/etoile-idle/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= idle
-PORTVERSION= 0.2
+PORTVERSION= 0.4.0
CATEGORIES= x11 gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -17,6 +17,7 @@ COMMENT= Etoile Project Idle event generator
BUILD_DEPENDS= ${LOCALBASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/scrnsaverproto
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
diff --git a/x11/etoile-idle/distinfo b/x11/etoile-idle/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11/etoile-idle/distinfo
+++ b/x11/etoile-idle/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index b80c9ec2f364..742e334e9af9 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xwindowserverkit
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= x11 gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,6 +15,7 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project XWindowServerKit frameowrk
+USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,6 +23,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+DEFAULT_LIBVERSION= 0.1.1
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/XWindowServerKit
ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/etoile-xwindowserverkit/distinfo b/x11/etoile-xwindowserverkit/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11/etoile-xwindowserverkit/distinfo
+++ b/x11/etoile-xwindowserverkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/x11/etoile-xwindowserverkit/pkg-plist b/x11/etoile-xwindowserverkit/pkg-plist
index 864886a0ffd1..88b2c072fc22 100644
--- a/x11/etoile-xwindowserverkit/pkg-plist
+++ b/x11/etoile-xwindowserverkit/pkg-plist
@@ -12,6 +12,7 @@ System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%
System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%LIBVERSION%%
System/Library/Frameworks/XWindowServerKit.framework/Versions/Current
System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit
+System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit.framework
System/Library/Frameworks/XWindowServerKit.framework/libXWindowServerKit.so
System/Library/Headers/XWindowServerKit
System/Library/Libraries/libXWindowServerKit.so