8 files changed, 3 insertions, 50 deletions

diff --git a/MOVED b/MOVED
index 423cd8ae03a2..4f640fd7e082 100644
--- a/MOVED
+++ b/MOVED
@@ -1239,3 +1239,4 @@ korean/hlatexp-pkfonts300||2004-08-15|Port was unfetchable
 korean/hlatexp-pkfonts600||2004-08-15|Port was unfetchable
 misc/sword-modules||2004-08-17|Obsoleted
 print/tipa|print/latex-tipa|2004-08-18|Port renamed for better categorisation
+x11-toolkits/notif2|x11-themes/notif2|2004-08-20|Better category
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 03ce0ddbd567..1f6c9e177425 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -83,6 +83,7 @@
     SUBDIR += metacity-theme-iridium-rounded
     SUBDIR += metacity-theme-microgui
     SUBDIR += metacity-themes
+    SUBDIR += notif2
     SUBDIR += phase
     SUBDIR += qinx
     SUBDIR += qnxstyle
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 504287bd6ff0..9b70d1f2545c 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	notif2
 PORTVERSION=	1.0
 PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	notif210
 DISTNAME=	notif210-${GTKVERSION}
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index dde1a3447126..4302f3f25c1c 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -103,7 +103,6 @@
     SUBDIR += movingmotif
     SUBDIR += mowitz
     SUBDIR += neXtaw
-    SUBDIR += notif2
     SUBDIR += ocaml-lablgtk
     SUBDIR += open-motif
     SUBDIR += p5-GdkImlib
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
deleted file mode 100644
index 504287bd6ff0..000000000000
--- a/x11-toolkits/notif2/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	notif2
-# Date Created:				31 August 2001
-# Whom:				 	Cyrille Lefevre <clefevre@citeweb.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	notif2
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	notif210
-DISTNAME=	notif210-${GTKVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Notif2 GTK theme engine following the new Motif look and feel
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
-USE_GMAKE=	yes
-
-GTKVERSION=	1.2
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/notif2/distinfo b/x11-toolkits/notif2/distinfo
deleted file mode 100644
index 61f0209b7b84..000000000000
--- a/x11-toolkits/notif2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (notif210-1.2.tar.gz) = e117977d4d15e070da519b431045b701
-SIZE (notif210-1.2.tar.gz) = 98677
diff --git a/x11-toolkits/notif2/pkg-descr b/x11-toolkits/notif2/pkg-descr
deleted file mode 100644
index 59f10733e4e2..000000000000
--- a/x11-toolkits/notif2/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-A GTK Theme Engine. following the NEW look and feel of that ever so popular
-widget set: Motif 2.x.
-
-This code derives from the thinice theme by Tim Gerla <timg@means.net> and
-Tomas Ögren <stric@ing.umu.se>.
-
-Roberto Machorro <rmach@bigfoot.com>
-
-WWW: http://themes.freshmeat.net/projects/notif210/
diff --git a/x11-toolkits/notif2/pkg-plist b/x11-toolkits/notif2/pkg-plist
deleted file mode 100644
index 860e2a2771cb..000000000000
--- a/x11-toolkits/notif2/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD$
-lib/gtk/themes/engines/libnotif2.a
-lib/gtk/themes/engines/libnotif2.so
-lib/gtk/themes/engines/libnotif2.so.0
-share/themes/Notif2/ICON.png
-share/themes/Notif2/README.html
-share/themes/Notif2/gtk/gtkrc
-@dirrm share/themes/Notif2/gtk
-@dirrm share/themes/Notif2