8 files changed, 107 insertions, 24 deletions

diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 0be7cdb79cca..bc08ef263148 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gworkspace
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.8.7
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
+#MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP}
+MASTER_SITE_SUBDIR=	usr-apps
 PKGNAMESUFFIX=	-gwmetadata${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -29,7 +30,7 @@ USE_SQLITE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-WRKSRC=		${WRKDIR}/GWorkspace-${PORTVERSION}/GWMetadata
+WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
 CONFIGURE_ARGS+=	--with-sqlite-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-sqlite-library=${LOCALBASE}/lib
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
@@ -38,4 +39,12 @@ DEFAULT_LIBVERSION=	0.1.0
 GWORKSPACE_PORT?=	deskutils/gworkspace
 PREFERENCEPANES_PORT?=	deskutils/preferencepanes
 
+post-patch:
+	${CP} ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile.in \
+		${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile
+	${CP} ${FILESDIR}/Preferences-GNUmakefile \
+		${WRKSRC}/Preferences/GNUmakefile
+	${CP} ${FILESDIR}/MDFinder-GNUmakefile \
+		${WRKSRC}/MDFinder/GNUmakefile
+
 .include <bsd.port.mk>
diff --git a/deskutils/gworkspace-gwmetadata/distinfo b/deskutils/gworkspace-gwmetadata/distinfo
index a6b5da0a30be..fd0ad435cd84 100644
--- a/deskutils/gworkspace-gwmetadata/distinfo
+++ b/deskutils/gworkspace-gwmetadata/distinfo
@@ -1,3 +1,3 @@
-MD5 (gworkspace-0.8.6.tar.gz) = 16dc6b077517b60897cc0d057bb803f5
-SHA256 (gworkspace-0.8.6.tar.gz) = 50fff3595d6034223a6735822dd63121842d33f9e6d00f4197e5c8a9488365ea
-SIZE (gworkspace-0.8.6.tar.gz) = 2394844
+MD5 (gworkspace-0.8.7.tar.gz) = 3ce24f086a155e00b236fe2984ffe450
+SHA256 (gworkspace-0.8.7.tar.gz) = 07658133c88bb0609ed153080fd414583ce7ecb3e50a893c7c813687e1e5abab
+SIZE (gworkspace-0.8.7.tar.gz) = 3935841
diff --git a/deskutils/gworkspace-gwmetadata/files/MDFinder-GNUmakefile b/deskutils/gworkspace-gwmetadata/files/MDFinder-GNUmakefile
new file mode 100644
index 000000000000..d0123436453a
--- /dev/null
+++ b/deskutils/gworkspace-gwmetadata/files/MDFinder-GNUmakefile
@@ -0,0 +1,36 @@
+# Install into the system root by default
+GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+RPM_DISABLE_RELOCATABLE=YES
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+PACKAGE_NAME = MDFinder
+VERSION = 0.1
+
+APP_NAME = MDFinder
+MDFinder_PRINCIPAL_CLASS = MDFinder
+MDFinder_APPLICATION_ICON=MDFinder.tiff
+
+MDFinder_HAS_RESOURCE_BUNDLE = yes
+
+MDFinder_RESOURCE_FILES = \
+    Resources/Images/* \
+    Resources/English.lproj 
+
+MDFinder_LANGUAGES = Resources/English 
+
+# The Objective-C source files to be compiled
+
+MDFinder_OBJC_FILES = main.m \
+                  MDFinder.m 
+
+ADDITIONAL_GUI_LIBS += -lMDKit
+ADDITIONAL_GUI_LIBS += -lFSNode
+                  				 
+-include GNUmakefile.preamble
+
+-include GNUmakefile.local
+
+include $(GNUSTEP_MAKEFILES)/application.make
+
+-include GNUmakefile.postamble
diff --git a/deskutils/gworkspace-gwmetadata/files/Preferences-GNUmakefile b/deskutils/gworkspace-gwmetadata/files/Preferences-GNUmakefile
new file mode 100644
index 000000000000..c3517d76d674
--- /dev/null
+++ b/deskutils/gworkspace-gwmetadata/files/Preferences-GNUmakefile
@@ -0,0 +1,41 @@
+# Install into the system root by default
+GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+RPM_DISABLE_RELOCATABLE=YES
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+BUNDLE_NAME = MDIndexing
+BUNDLE_EXTENSION = .prefPane
+
+MDIndexing_HAS_RESOURCE_BUNDLE = yes
+
+OBJCFLAGS += -Wall
+
+MDIndexing_OBJC_FILES = \
+MDIndexing.m \
+CategoriesEditor.m \
+CategoryView.m \
+StartAppWin.m
+
+MDIndexing_PRINCIPAL_CLASS = MDIndexing
+
+MDIndexing_RESOURCE_FILES = \
+Info.plist \
+MDIndexing.tiff \
+Resources/categories.plist \
+Resources/Images/* \
+Resources/English.lproj 
+
+ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
+  ADDITIONAL_GUI_LIBS += -lGSPreferencePanes
+else
+  ADDITIONAL_GUI_LIBS += -lPreferencePanes
+endif
+
+include $(GNUSTEP_MAKEFILES)/bundle.make
+
+-include GNUmakefile.preamble
+-include GNUmakefile.postamble
+
+
+
diff --git a/deskutils/gworkspace-gwmetadata/pkg-plist b/deskutils/gworkspace-gwmetadata/pkg-plist
index 3c055d7227a4..5bb898dafc07 100644
--- a/deskutils/gworkspace-gwmetadata/pkg-plist
+++ b/deskutils/gworkspace-gwmetadata/pkg-plist
@@ -24,7 +24,6 @@ System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/MDIndexing.go
 System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/MDIndexing.gorm/data.info
 System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/MDIndexing.gorm/objects.gorm
 System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/StartAppWin.gorm/data.classes
-System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/StartAppWin.gorm/data.info
 System/Library/Bundles/MDIndexing.prefPane/Resources/English.lproj/StartAppWin.gorm/objects.gorm
 System/Library/Bundles/MDIndexing.prefPane/Resources/Info-gnustep.plist
 System/Library/Bundles/MDIndexing.prefPane/Resources/Info.plist
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 04c862a7956e..c1809d8e0da2 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gworkspace
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.8.7
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
+#MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP}
+MASTER_SITE_SUBDIR=	usr-apps
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep workspace manager
@@ -22,7 +23,6 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-WRKSRC=		${WRKDIR}/GWorkspace-${PORTVERSION}
 GNU_CONFIGURE=	yes
 ADDITIONAL_LDFLAGS+=	-L${WRKSRC}/FSNode/FSNode.framework/Versions/A
 DEFAULT_LIBVERSION2=	0.1.0
@@ -39,6 +39,9 @@ PLIST_SUB+=	PDFVIEW=""
 USE_GHOSTSCRIPT=	yes
 .endif
 
+pre-configure:
+	${RM} -rf ${WRKSRC}/GWMetadata
+
 post-install:
 	${CP} ${WRKSRC}/Inspector/ContentViewersProtocol.h \
 		${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/Inspector.framework/Versions/${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}/Headers/ContentViewersProtocol.h
diff --git a/deskutils/gworkspace/distinfo b/deskutils/gworkspace/distinfo
index a6b5da0a30be..fd0ad435cd84 100644
--- a/deskutils/gworkspace/distinfo
+++ b/deskutils/gworkspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (gworkspace-0.8.6.tar.gz) = 16dc6b077517b60897cc0d057bb803f5
-SHA256 (gworkspace-0.8.6.tar.gz) = 50fff3595d6034223a6735822dd63121842d33f9e6d00f4197e5c8a9488365ea
-SIZE (gworkspace-0.8.6.tar.gz) = 2394844
+MD5 (gworkspace-0.8.7.tar.gz) = 3ce24f086a155e00b236fe2984ffe450
+SHA256 (gworkspace-0.8.7.tar.gz) = 07658133c88bb0609ed153080fd414583ce7ecb3e50a893c7c813687e1e5abab
+SIZE (gworkspace-0.8.7.tar.gz) = 3935841
diff --git a/deskutils/gworkspace/pkg-plist b/deskutils/gworkspace/pkg-plist
index c42800c72e52..854272452728 100644
--- a/deskutils/gworkspace/pkg-plist
+++ b/deskutils/gworkspace/pkg-plist
@@ -26,7 +26,6 @@ System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/da
 System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/DesktopPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/English.lproj/DesktopPref.gorm/data.info
@@ -74,7 +73,6 @@ System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd
 System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/TabbedShelf-develop.tiff
 System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/dummy.tiff
 System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/HistoryPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/English.lproj/HistoryPref.gorm/data.info
@@ -90,25 +88,20 @@ System/Applications/GWorkspace.app/Resources/English.lproj/LSFolder.gorm/data.in
 System/Applications/GWorkspace.app/Resources/English.lproj/LSFolder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/data.classes
-System/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/data.info
 System/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/data.info
@@ -126,6 +119,7 @@ System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_osx.tiff
 System/Applications/GWorkspace.app/Resources/FileManager.tiff
 System/Applications/GWorkspace.app/Resources/French.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/GWorkspace.desktop
+System/Applications/GWorkspace.app/Resources/GWorkspaceInfo.plist
 System/Applications/GWorkspace.app/Resources/German.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Hungarian.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Info-gnustep.plist
@@ -236,10 +230,8 @@ System/Applications/GWorkspace.app/stamp.make
 System/Applications/Recycler.app/Recycler
 System/Applications/Recycler.app/Resources/English.lproj/Localizable.strings
 System/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/data.classes
-System/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/data.info
 System/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/objects.gorm
 System/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/data.classes
-System/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/data.info
 System/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/objects.gorm
 System/Applications/Recycler.app/Resources/Info-gnustep.plist
 System/Applications/Recycler.app/Resources/Recycler.desktop
@@ -306,6 +298,7 @@ System/Library/Bundles/FolderViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/FolderViewer.inspector/Resources/InspectorInfo.plist
 System/Library/Bundles/FolderViewer.inspector/stamp.make
 System/Library/Bundles/IBViewViewer.inspector/IBViewViewer
+System/Library/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 System/Library/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 System/Library/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 System/Library/Bundles/IBViewViewer.inspector/Resources/Info-gnustep.plist
@@ -315,6 +308,7 @@ System/Library/Bundles/ImageThumbnailer.thumb/ImageThumbnailer
 System/Library/Bundles/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
 System/Library/Bundles/ImageThumbnailer.thumb/stamp.make
 System/Library/Bundles/ImageViewer.inspector/ImageViewer
+System/Library/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 System/Library/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 System/Library/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 System/Library/Bundles/ImageViewer.inspector/Resources/Info-gnustep.plist
@@ -324,6 +318,7 @@ System/Library/Bundles/MDModuleAnnotations.mdm/MDModuleAnnotations
 System/Library/Bundles/MDModuleAnnotations.mdm/Resources/Info-gnustep.plist
 System/Library/Bundles/MDModuleAnnotations.mdm/stamp.make
 System/Library/Bundles/NSColorViewer.inspector/NSColorViewer
+System/Library/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 System/Library/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 System/Library/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 System/Library/Bundles/NSColorViewer.inspector/Resources/Info-gnustep.plist