5 files changed, 93 insertions, 8 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