- update to use new bsd.gnustep.mk

Approved by:	gurkan@linuks.mine.nu

7 files changed, 12 insertions, 23 deletions

diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index fc4948bf940c..f75ff70f0080 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	camera
 PORTVERSION=	0.8
 CATEGORIES=	graphics
 MASTER_SITES=	http://home.gna.org/gsimageapps/ \
-		http://io.debian.net/~tar/ports/distfiles/
+		${MASTER_SITE_GNUSTEP_CH}
 DISTNAME=	Camera-${PORTVERSION}
 
 MAINTAINER=	gurkan@linuks.mine.nu
@@ -17,14 +17,13 @@ COMMENT=	GNUstep application for digital still cameras
 
 LIB_DEPENDS+=	gphoto2_port:${PORTSDIR}/graphics/libgphoto2
 
-WRKSRC=		${WRKDIR}/Camera
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
+
+WRKSRC=		${WRKDIR}/Camera
 
 .include <bsd.port.mk>
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 1e5e293a05f9..e720b4aa8d79 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -16,14 +16,11 @@ DISTNAME=	SlideShowKit-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	SlideShow Framework
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
-LDCONFIG_DIRS=	${LOCALLIBDIR}
-INSTALLS_SHLIB=	yes
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 .include <bsd.port.mk>
diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile
index fe6a8748e6e2..40fb8dfe3f7f 100644
--- a/graphics/imageviewer/Makefile
+++ b/graphics/imageviewer/Makefile
@@ -14,13 +14,10 @@ DISTNAME=	ImageViewer-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep Image Viewer
 
-GUN_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
 
 .include <bsd.port.mk>
diff --git a/graphics/photoclip/Makefile b/graphics/photoclip/Makefile
index 609f400523ad..2fc44106cd6d 100644
--- a/graphics/photoclip/Makefile
+++ b/graphics/photoclip/Makefile
@@ -9,19 +9,18 @@ PORTNAME=	photoclip
 PORTVERSION=	0.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vaisburd.net/PhotoClip/ \
-		http://io.debian.net/~tar/ports/distfiles/
+		${MASTER_SITE_GNUSTEP_CH}
 DISTNAME=	PhotoClip-${PORTVERSION}
 
 MAINTAINER=	gurkan@linuks.mine.nu
 COMMENT=	Simple image viewer and editor for GNUstep
 
-WRKSRC=		${WRKDIR}/PhotoClip
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
+
+WRKSRC=		${WRKDIR}/PhotoClip
 
 .include <bsd.port.mk>
diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index 9c87e2e1e052..91a7696e756f 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	popplerkit
 PORTVERSION=	0.0.${SNAPSHOT}
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/gsimageapps/PopplerKit/
-PKGNAMEPREFIX=	gnustep-
 DISTNAME=	PopplerKit-${SNAPSHOT}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -21,7 +20,7 @@ USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_GNOME=	gnomeprefix gnomehack gtk20
 
 SNAPSHOT=	20050720
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index 7f897444bf16..7b1ec1a56e81 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	Preview-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Simple image viewer
 
-WRKSRC=		${WRKDIR}/Preview
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
+
+WRKSRC=		${WRKDIR}/Preview
 
 .include <bsd.port.mk>
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 01876201c1af..85fe3e6b6053 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	PRICE-${PORTVERSION}
 MAINTAINER=	gurkan@linuks.mine.nu
 COMMENT=	Image filtering and manipulation using GNUstep
 
-WRKSRC=		${WRKDIR}/PRICE
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
+
+WRKSRC=		${WRKDIR}/PRICE
 
 .include <bsd.port.mk>