3 files changed, 22 insertions, 125 deletions

diff --git a/science/paje/Makefile b/science/paje/Makefile
index 751f58bee0a5..a28789d059da 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	paje
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.97
 CATEGORIES=	science gnustep
-MASTER_SITES=	http://download.fr2.forge.objectweb.org/ \
-		http://download.forge.objectweb.org/paje/ \
-		http://download.zh.forge.objectweb.org/paje/ \
-		${MASTER_SITE_GNUSTEP_CH}
+MASTER_SITES=	http://download.forge.objectweb.org/paje/ \
+		http://download.zh.forge.objectweb.org/paje/
 DISTNAME=	Paje_${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -26,4 +23,8 @@ USE_GNUSTEP_INSTALL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+post-patch:
+	${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DOMAIN|#GNUSTEP_INSTALLATION_DOMAIN|' \
+                ${WRKSRC}/GNUmakefile
+
 .include <bsd.port.mk>
diff --git a/science/paje/distinfo b/science/paje/distinfo
index d0b197806b24..d20be6842343 100644
--- a/science/paje/distinfo
+++ b/science/paje/distinfo
@@ -1,3 +1,3 @@
-MD5 (Paje_1.4.0.tar.gz) = dbf899cb78d23ebb5b2e575a4a0fe52a
-SHA256 (Paje_1.4.0.tar.gz) = b97863762c1057721575a26eea2968d88adffb5a2c75f783da7c6011cc5a78d5
-SIZE (Paje_1.4.0.tar.gz) = 791267
+MD5 (Paje_1.97.tar.gz) = 655f911ca3bb98eab553e48b5ef21bac
+SHA256 (Paje_1.97.tar.gz) = 057f338d7ab6f17fba4d9e496931359a350531622e7a724d8c61a88c1e416203
+SIZE (Paje_1.97.tar.gz) = 816458
diff --git a/science/paje/pkg-plist b/science/paje/pkg-plist
index da54b5e2541d..b57e123358ea 100644
--- a/science/paje/pkg-plist
+++ b/science/paje/pkg-plist
@@ -2,9 +2,11 @@ Local/Applications/Paje.app/Paje
 Local/Applications/Paje.app/Resources/Info-gnustep.plist
 Local/Applications/Paje.app/Resources/Paje.desktop
 Local/Applications/Paje.app/Resources/Paje.gorm/data.classes
+Local/Applications/Paje.app/Resources/Paje.gorm/data.info
 Local/Applications/Paje.app/Resources/Paje.gorm/objects.gorm
 Local/Applications/Paje.app/Resources/Paje.tiff
 Local/Applications/Paje.app/Resources/PajeEntityInspector.gorm/data.classes
+Local/Applications/Paje.app/Resources/PajeEntityInspector.gorm/data.info
 Local/Applications/Paje.app/Resources/PajeEntityInspector.gorm/objects.gorm
 Local/Applications/Paje.app/Resources/PajeInfo.plist
 Local/Applications/Paje.app/Resources/distant.tiff
@@ -12,84 +14,20 @@ Local/Applications/Paje.app/Resources/near.tiff
 Local/Applications/Paje.app/Resources/toselection.tiff
 Local/Applications/Paje.app/Resources/traceFilePaje.tiff
 Local/Applications/Paje.app/stamp.make
-Local/Library/Bundles/Paje/ContainerFilter.bundle/ContainerFilter
-Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources/ContainerSelector.gorm/data.classes
-Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources/ContainerSelector.gorm/objects.gorm
-Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/ContainerFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/EntityTypeFilter.bundle/EntityTypeFilter
-Local/Library/Bundles/Paje/EntityTypeFilter.bundle/Resources/EntityTypeSelector.gorm/data.classes
-Local/Library/Bundles/Paje/EntityTypeFilter.bundle/Resources/EntityTypeSelector.gorm/objects.gorm
-Local/Library/Bundles/Paje/EntityTypeFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/EntityTypeFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/FieldFilter.bundle/FieldFilter
-Local/Library/Bundles/Paje/FieldFilter.bundle/Resources/FieldFilter.gorm/data.classes
-Local/Library/Bundles/Paje/FieldFilter.bundle/Resources/FieldFilter.gorm/data.info
-Local/Library/Bundles/Paje/FieldFilter.bundle/Resources/FieldFilter.gorm/objects.gorm
-Local/Library/Bundles/Paje/FieldFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/FieldFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/FileReader.bundle/FileReader
-Local/Library/Bundles/Paje/FileReader.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/FileReader.bundle/stamp.make
-Local/Library/Bundles/Paje/General.bundle/General
-Local/Library/Bundles/Paje/General.bundle/Resources/HierarchyBrowser.gorm/data.classes
-Local/Library/Bundles/Paje/General.bundle/Resources/HierarchyBrowser.gorm/objects.gorm
-Local/Library/Bundles/Paje/General.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/General.bundle/Resources/PajeEntityInspector.gorm/data.classes
-Local/Library/Bundles/Paje/General.bundle/Resources/PajeEntityInspector.gorm/objects.gorm
-Local/Library/Bundles/Paje/General.bundle/Resources/SourceTextViewer.gorm/data.classes
-Local/Library/Bundles/Paje/General.bundle/Resources/SourceTextViewer.gorm/objects.gorm
-Local/Library/Bundles/Paje/General.bundle/stamp.make
-Local/Library/Bundles/Paje/ImbricationFilter.bundle/ImbricationFilter
-Local/Library/Bundles/Paje/ImbricationFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/ImbricationFilter.bundle/Resources/InsetLimit.gorm/data.classes
-Local/Library/Bundles/Paje/ImbricationFilter.bundle/Resources/InsetLimit.gorm/objects.gorm
-Local/Library/Bundles/Paje/ImbricationFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/OrderFilter.bundle/OrderFilter
-Local/Library/Bundles/Paje/OrderFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/OrderFilter.bundle/Resources/Order.gorm/data.classes
-Local/Library/Bundles/Paje/OrderFilter.bundle/Resources/Order.gorm/objects.gorm
-Local/Library/Bundles/Paje/OrderFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/PajeEventDecoder.bundle/PajeEventDecoder
-Local/Library/Bundles/Paje/PajeEventDecoder.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/PajeEventDecoder.bundle/stamp.make
-Local/Library/Bundles/Paje/PajeSimulator.bundle/PajeSimulator
-Local/Library/Bundles/Paje/PajeSimulator.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/PajeSimulator.bundle/stamp.make
-Local/Library/Bundles/Paje/ReductionFilter.bundle/ReductionFilter
-Local/Library/Bundles/Paje/ReductionFilter.bundle/Resources/BusyNode.gorm/data.classes
-Local/Library/Bundles/Paje/ReductionFilter.bundle/Resources/BusyNode.gorm/objects.gorm
-Local/Library/Bundles/Paje/ReductionFilter.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/ReductionFilter.bundle/stamp.make
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/STEntityTypeLayout.gorm/data.classes
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/STEntityTypeLayout.gorm/data.info
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/STEntityTypeLayout.gorm/objects.gorm
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm/data.classes
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm/distant.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm/near.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm/objects.gorm
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm/toselection.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/crosscursor.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/distant.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/near.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/toselection.tiff
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/SpaceTimeViewer
-Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/stamp.make
-Local/Library/Bundles/Paje/StatViewer.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/StatViewer.bundle/Resources/StatViewer.gorm/data.classes
-Local/Library/Bundles/Paje/StatViewer.bundle/Resources/StatViewer.gorm/data.info
-Local/Library/Bundles/Paje/StatViewer.bundle/Resources/StatViewer.gorm/objects.gorm
-Local/Library/Bundles/Paje/StatViewer.bundle/StatViewer
-Local/Library/Bundles/Paje/StatViewer.bundle/stamp.make
-Local/Library/Bundles/Paje/StorageController.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Paje/StorageController.bundle/StorageController
-Local/Library/Bundles/Paje/StorageController.bundle/stamp.make
+Local/Library/Headers/AggregatingFilter/AggregateEvent.h
+Local/Library/Headers/AggregatingFilter/AggregateLink.h
+Local/Library/Headers/AggregatingFilter/AggregateState.h
+Local/Library/Headers/AggregatingFilter/AggregateValue.h
+Local/Library/Headers/AggregatingFilter/AggregatingChunk.h
+Local/Library/Headers/AggregatingFilter/AggregatingChunkArray.h
+Local/Library/Headers/AggregatingFilter/AggregatingFilter.h
+Local/Library/Headers/AggregatingFilter/EntityAggregator.h
 Local/Library/Headers/ContainerFilter/ContainerSelector.h
 Local/Library/Headers/EntityTypeFilter/EntityTypeSelector.h
 Local/Library/Headers/FieldFilter/FieldFilter.h
 Local/Library/Headers/FieldFilter/FieldFilterDescriptor.h
 Local/Library/Headers/General/Association.h
+Local/Library/Headers/General/CStringCallBacks.h
 Local/Library/Headers/General/ChunkArray.h
 Local/Library/Headers/General/ColoredSwitchButtonCell.h
 Local/Library/Headers/General/Comparing.h
@@ -139,12 +77,8 @@ Local/Library/Headers/SpaceTimeViewer/Shape.h
 Local/Library/Headers/StatViewer/PieCell.h
 Local/Library/Headers/StatViewer/StatArray.h
 Local/Library/Headers/StatViewer/StatViewer.h
-Local/Library/Headers/StorageController/AggregateEvent.h
-Local/Library/Headers/StorageController/AggregateState.h
 Local/Library/Headers/StorageController/AnchorFilter.h
 Local/Library/Headers/StorageController/Encapsulate.h
-Local/Library/Headers/StorageController/EventAggregator.h
-Local/Library/Headers/StorageController/StateAggregator.h
 Local/Tools/Paje
 @dirrm Local/Library/Headers/StorageController
 @dirrm Local/Library/Headers/StatViewer
@@ -156,45 +90,7 @@ Local/Tools/Paje
 @dirrm Local/Library/Headers/FieldFilter
 @dirrm Local/Library/Headers/EntityTypeFilter
 @dirrm Local/Library/Headers/ContainerFilter
-@dirrm Local/Library/Bundles/Paje/StorageController.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/StorageController.bundle
-@dirrm Local/Library/Bundles/Paje/StatViewer.bundle/Resources/StatViewer.gorm
-@dirrm Local/Library/Bundles/Paje/StatViewer.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/StatViewer.bundle
-@dirrm Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/SpaceTime.gorm
-@dirrm Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources/STEntityTypeLayout.gorm
-@dirrm Local/Library/Bundles/Paje/SpaceTimeViewer.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/SpaceTimeViewer.bundle
-@dirrm Local/Library/Bundles/Paje/ReductionFilter.bundle/Resources/BusyNode.gorm
-@dirrm Local/Library/Bundles/Paje/ReductionFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/ReductionFilter.bundle
-@dirrm Local/Library/Bundles/Paje/PajeSimulator.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/PajeSimulator.bundle
-@dirrm Local/Library/Bundles/Paje/PajeEventDecoder.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/PajeEventDecoder.bundle
-@dirrm Local/Library/Bundles/Paje/OrderFilter.bundle/Resources/Order.gorm
-@dirrm Local/Library/Bundles/Paje/OrderFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/OrderFilter.bundle
-@dirrm Local/Library/Bundles/Paje/ImbricationFilter.bundle/Resources/InsetLimit.gorm
-@dirrm Local/Library/Bundles/Paje/ImbricationFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/ImbricationFilter.bundle
-@dirrm Local/Library/Bundles/Paje/General.bundle/Resources/SourceTextViewer.gorm
-@dirrm Local/Library/Bundles/Paje/General.bundle/Resources/PajeEntityInspector.gorm
-@dirrm Local/Library/Bundles/Paje/General.bundle/Resources/HierarchyBrowser.gorm
-@dirrm Local/Library/Bundles/Paje/General.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/General.bundle
-@dirrm Local/Library/Bundles/Paje/FileReader.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/FileReader.bundle
-@dirrm Local/Library/Bundles/Paje/FieldFilter.bundle/Resources/FieldFilter.gorm
-@dirrm Local/Library/Bundles/Paje/FieldFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/FieldFilter.bundle
-@dirrm Local/Library/Bundles/Paje/EntityTypeFilter.bundle/Resources/EntityTypeSelector.gorm
-@dirrm Local/Library/Bundles/Paje/EntityTypeFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/EntityTypeFilter.bundle
-@dirrm Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources/ContainerSelector.gorm
-@dirrm Local/Library/Bundles/Paje/ContainerFilter.bundle/Resources
-@dirrm Local/Library/Bundles/Paje/ContainerFilter.bundle
-@dirrm Local/Library/Bundles/Paje
+@dirrm Local/Library/Headers/AggregatingFilter
 @dirrm Local/Applications/Paje.app/Resources/PajeEntityInspector.gorm
 @dirrm Local/Applications/Paje.app/Resources/Paje.gorm
 @dirrm Local/Applications/Paje.app/Resources