From 46c9af33b362732adfc3d4e73edf8ddca567472f Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 4 Feb 2013 13:11:43 +0000
Subject: [PATCH] move CATEGORIES into Makefile.inc

---
 devel/eclipse/plugins/Makefile.inc            | 4 +++-
 devel/eclipse/plugins/emf/Makefile            | 4 ++--
 devel/eclipse/plugins/epic/Makefile           | 4 ++--
 devel/eclipse/plugins/findbugs/Makefile       | 4 ++--
 devel/eclipse/plugins/gef/Makefile            | 4 ++--
 devel/eclipse/plugins/ivyde/Makefile          | 4 ++--
 devel/eclipse/plugins/py-dev/Makefile         | 4 ++--
 devel/eclipse/plugins/rdt/Makefile            | 4 ++--
 devel/eclipse/plugins/struts-console/Makefile | 4 ++--
 devel/eclipse/plugins/subclipse/Makefile      | 4 ++--
 devel/eclipse/plugins/uml2/Makefile           | 4 ++--
 devel/eclipse/plugins/wtp/Makefile            | 4 ++--
 12 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/devel/eclipse/plugins/Makefile.inc b/devel/eclipse/plugins/Makefile.inc
index 1166f9f4bf6..8da583f77bd 100644
--- a/devel/eclipse/plugins/Makefile.inc
+++ b/devel/eclipse/plugins/Makefile.inc
@@ -1,3 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.1 2006/08/09 19:53:44 kurt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2013/02/04 13:11:43 jasper Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386
+
+CATEGORIES+=	devel/eclipse/plugins
diff --git a/devel/eclipse/plugins/emf/Makefile b/devel/eclipse/plugins/emf/Makefile
index 4737d8069f3..6e0cba29581 100644
--- a/devel/eclipse/plugins/emf/Makefile
+++ b/devel/eclipse/plugins/emf/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		Eclipse Modeling Framework (EMF)
 
 V=			2.2.3
 DISTNAME=		emf-sdo-xsd-SDK-${V}
 PKGNAME=		eclipse-plugin-emf-sdk-${V}
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 REVISION =		0
 
 HOMEPAGE=		http://www.eclipse.org/emf/
diff --git a/devel/eclipse/plugins/epic/Makefile b/devel/eclipse/plugins/epic/Makefile
index 109025bf006..daa79dff790 100644
--- a/devel/eclipse/plugins/epic/Makefile
+++ b/devel/eclipse/plugins/epic/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		Perl plugin for Eclipse IDE
 
@@ -6,7 +6,7 @@ V=			0.5.33
 DISTNAME=		org.epic.updatesite_${V}_20070406
 PKGNAME=		eclipse-plugin-epic-${V}
 REVISION=		1
-CATEGORIES=		devel/eclipse/plugins perl5
+CATEGORIES+=		perl5
 
 HOMEPAGE=		http://e-p-i-c.sourceforge.net/
 
diff --git a/devel/eclipse/plugins/findbugs/Makefile b/devel/eclipse/plugins/findbugs/Makefile
index cb472c63de4..6d56f78c27e 100644
--- a/devel/eclipse/plugins/findbugs/Makefile
+++ b/devel/eclipse/plugins/findbugs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		Eclipse plugin for Java program checker (bytecode analyzer)
 
@@ -8,7 +8,7 @@ DISTNAME=		edu.umd.cs.findbugs.plugin.eclipse_${V}.20070425
 EXTRACT_SUFX=           .zip
 PKGNAME=		eclipse-plugin-findbugs-${V}
 PKG_ARCH=		*
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 
 HOMEPAGE=		http://findbugs.sourceforge.net/
 
diff --git a/devel/eclipse/plugins/gef/Makefile b/devel/eclipse/plugins/gef/Makefile
index f0f86e004a9..b6bfafd42b9 100644
--- a/devel/eclipse/plugins/gef/Makefile
+++ b/devel/eclipse/plugins/gef/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		graphical editing environment for eclipse
 
 V=			3.2.2
 DISTNAME=		GEF-SDK-${V}
 PKGNAME=		eclipse-plugin-gef-sdk-${V}
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 REVISION =		0
 
 HOMEPAGE=		http://www.eclipse.org/gef/
diff --git a/devel/eclipse/plugins/ivyde/Makefile b/devel/eclipse/plugins/ivyde/Makefile
index 2c8fbb0c899..86f4f6da8a8 100644
--- a/devel/eclipse/plugins/ivyde/Makefile
+++ b/devel/eclipse/plugins/ivyde/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		IVY plug-in for Eclipse IDE
 
 VERSION=		1.2.0
 DISTNAME=		org.jayasoft.ivyde.eclipse_${VERSION}
 PKGNAME=		eclipse-plugin-ivyde-${VERSION}
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 EXTRACT_SUFX=		.zip
 REVISION =		0
 
diff --git a/devel/eclipse/plugins/py-dev/Makefile b/devel/eclipse/plugins/py-dev/Makefile
index 45350472f4e..b37f79469d1 100644
--- a/devel/eclipse/plugins/py-dev/Makefile
+++ b/devel/eclipse/plugins/py-dev/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT =	Python development plug-in for Eclipse
 
@@ -9,7 +9,7 @@ DISTNAME =	org.python.pydev.feature-${V}.${SVN}
 PKGNAME =	py-dev-${V}
 REVISION =	2
 
-CATEGORIES =	devel lang/python
+CATEGORIES +=	lang/python
 
 HOMEPAGE =	http://pydev.sourceforge.net/
 
diff --git a/devel/eclipse/plugins/rdt/Makefile b/devel/eclipse/plugins/rdt/Makefile
index a61df095cae..a1d01f1aa6e 100644
--- a/devel/eclipse/plugins/rdt/Makefile
+++ b/devel/eclipse/plugins/rdt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		Ruby Development Tools for Eclipse IDE
 
@@ -6,7 +6,7 @@ V=			0.8.0
 DISTNAME=		org.rubypeople.rdt-0.8.0.604272100PRD
 PKGNAME=		eclipse-plugin-rdt-${V}
 REVISION=		3
-CATEGORIES=		devel/eclipse/plugins lang/ruby
+CATEGORIES+=		lang/ruby
 
 HOMEPAGE=		http://rubyeclipse.sourceforge.net/
 
diff --git a/devel/eclipse/plugins/struts-console/Makefile b/devel/eclipse/plugins/struts-console/Makefile
index 4c134802fd6..3501902ef24 100644
--- a/devel/eclipse/plugins/struts-console/Makefile
+++ b/devel/eclipse/plugins/struts-console/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/02/04 13:06:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		configuration tool for Struts web framework
 
@@ -7,7 +7,7 @@ DISTNAME=		struts-console-${V}
 PKGNAME=		eclipse-plugin-struts-console-${V}
 REVISION =		1
 
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES?=		java
 
 HOMEPAGE=		http://www.jamesholmes.com/struts/console/
 
diff --git a/devel/eclipse/plugins/subclipse/Makefile b/devel/eclipse/plugins/subclipse/Makefile
index 591b5d08dee..1f015a7f7b3 100644
--- a/devel/eclipse/plugins/subclipse/Makefile
+++ b/devel/eclipse/plugins/subclipse/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2013/02/04 13:06:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		SubVersion plug-in for Eclipse IDE
 
 V=			1.2.1
 DISTNAME=		site-${V}
 PKGNAME=		eclipse-plugin-subclipse-${V}
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 EXTRACT_SUFX=		.zip
 REVISION =		1
 
diff --git a/devel/eclipse/plugins/uml2/Makefile b/devel/eclipse/plugins/uml2/Makefile
index 167bd85d3d3..b0d3c444224 100644
--- a/devel/eclipse/plugins/uml2/Makefile
+++ b/devel/eclipse/plugins/uml2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/11 16:32:27 fgsch Exp $
+# $OpenBSD: Makefile,v 1.9 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		UML diagram framework for Eclipse
 
 V=			2.0.3
 DISTNAME=		uml2-SDK-${V}
 PKGNAME=		eclipse-plugin-uml2-sdk-${V}
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 
 HOMEPAGE=		http://www.eclipse.org/uml2/
 
diff --git a/devel/eclipse/plugins/wtp/Makefile b/devel/eclipse/plugins/wtp/Makefile
index 9de048ada51..61bf9035b08 100644
--- a/devel/eclipse/plugins/wtp/Makefile
+++ b/devel/eclipse/plugins/wtp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2011/09/11 16:32:27 fgsch Exp $
+# $OpenBSD: Makefile,v 1.10 2013/02/04 13:11:43 jasper Exp $
 
 COMMENT=		Web Tools Platform for Eclipse
 
@@ -6,7 +6,7 @@ V=			1.5.4
 DISTNAME=		wtp-sdk-R-${V}-200705021353
 PKGNAME=		eclipse-plugin-wtp-sdk-${V}
 REVISION =		0
-CATEGORIES=		devel/eclipse/plugins java
+CATEGORIES+=		java
 EXTRACT_SUFX=		.zip
 PKG_ARCH=		*