10 files changed, 12 insertions, 31 deletions

diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 6272a7b69a1f..d7e11d455bc3 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -14,14 +14,12 @@ DISTNAME=	Affiche-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Affiche allows people to stick notes
 
-WRKSRC=		${WRKDIR}/Affiche
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC=		${WRKDIR}/Affiche
 
 .include <bsd.port.mk>
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 74144c5d4d97..3b4ed5b1b6fb 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -9,19 +9,17 @@ PORTNAME=	charmap
 PORTVERSION=	0.2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.nongnu.org/charmap/ \
-		http://io.debian.net/~tar/ports/distfiles/
+		${MASTER_SITE_GNUSTEP_CH}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gurkan@linuks.mine.nu
 COMMENT=	Character map for GNUstep
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-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/deskutils/displaycalibrator/Makefile b/deskutils/displaycalibrator/Makefile
index 89f0875d1d69..5bbef6f2022d 100644
--- a/deskutils/displaycalibrator/Makefile
+++ b/deskutils/displaycalibrator/Makefile
@@ -13,13 +13,10 @@ MASTER_SITES=	http://www.linuks.mine.nu/displaycalibrator/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Frontend to xgamma
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
-ALL_TARGET=
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnustep-notebook/Makefile b/deskutils/gnustep-notebook/Makefile
index b21a980fdddd..3b5ae5d2ca69 100644
--- a/deskutils/gnustep-notebook/Makefile
+++ b/deskutils/gnustep-notebook/Makefile
@@ -15,12 +15,10 @@ DISTNAME=	NoteBook-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A place to store notes in an organized manner
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnuwash/Makefile b/deskutils/gnuwash/Makefile
index d2a422844242..a3f8bbd9d851 100644
--- a/deskutils/gnuwash/Makefile
+++ b/deskutils/gnuwash/Makefile
@@ -15,14 +15,12 @@ DISTNAME=	${PORTNAME}.app_${PORTVERSION}.orig
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Configurable GNUstep timer application
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 23887d845af8..ab3588762925 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An online help viewer for GNUstep programs
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
 
 .include <bsd.port.mk>
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index 7641eff27253..a6d542158d45 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -14,13 +14,10 @@ MASTER_SITE_SUBDIR=	usr-apps
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Free clone of KlipFolio for GNUstep
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
-ALL_TARGET=
 
 .include <bsd.port.mk>
diff --git a/deskutils/preferencepanes/Makefile b/deskutils/preferencepanes/Makefile
index 2025576104db..c7c9342ddabc 100644
--- a/deskutils/preferencepanes/Makefile
+++ b/deskutils/preferencepanes/Makefile
@@ -14,14 +14,14 @@ DISTNAME=	systempreferences-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	PreferencePanes framework for GNUstep
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/PreferencePanes
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
 DEFAULT_LIBVERSION=	1.0.0
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/PreferencePanes
 
 .include <bsd.port.mk>
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 97f85945a39f..2b07a602a471 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -17,15 +17,12 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep workspace manager
 
 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
-LDCONFIG_DIRS=	${LOCALLIBDIR}
-INSTALLS_SHLIB=	yes
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 MODIFY=		GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
 		Modules/Keyboard/GNUmakefile.preamble \
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index db56ae2a7f09..9ee331e4f78f 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES=	http://www.gnustep.it/enrico/system-preferences/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	System Preferences application for GNUstep
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_BACK=	yes
-MAKEFILE=	GNUmakefile
 USE_GNUSTEP_SYSTEM_LIBS+=	PreferencePanes:${PREFERENCEPANES_PORT}
-PREFERENCEPANES_PORT?=	deskutils/preferencepanes
+
 USE_GNUSTEP_MAKE_DIRS=	SystemPreferences Modules
 
+PREFERENCEPANES_PORT?=	deskutils/preferencepanes
+
 .include <bsd.port.mk>