Merge abiword(-plugins)-devel into abiword(-plugins) and

remove abiword(-plugins)-devel.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4938 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 9 insertions, 10 deletions

diff --git a/RMPORTS b/RMPORTS
index 00778de29..3a4b2bfb2 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -1,3 +1,5 @@
 mail/ximian-connector|mail/evolution-exchange|%%DATE%%|POOF! Now it's called evolution-exchange!
 editors/gedit-plugins||%%DATE%%|This component is unmaintained, and has succumbed to code rot
 www/pyphany||%%DATE%%|Has been merged into epiphany
+editors/abiword-devel|editors/abiword|%%DATE%%|Has been merged into abiword
+editors/abiword-plugins-devel|editors/abiword-plugins|%%DATE%%|Has been merged into abiword-plugins
diff --git a/editors/abiword-plugins-devel/Makefile b/editors/abiword-plugins/Makefile
index 6c08393c4..1c26fdf32 100644
--- a/editors/abiword-plugins-devel/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -3,7 +3,7 @@
 # Whom:					FreeBSD GNOME Team <gnome@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/abiword-plugins-devel/Makefile,v 1.4 2005/10/04 19:30:02 mezz Exp $
+#   $MCom$
 #
 
 PORTNAME=	abiword
@@ -11,14 +11,14 @@ PORTVERSION=	2.4.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
-PKGNAMESUFFIX=	-plugins-devel
+PKGNAMESUFFIX=	-plugins
 DIST_SUBDIR=	AbiWord
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multi-plugins for AbiWord
 
-BUILD_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword-devel
-RUN_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword-devel
+BUILD_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
+RUN_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
 
 CONFLICTS=	abiword-plugins-[0-9]*
 
@@ -35,7 +35,7 @@ CONFIGURE_ARGS=	--disable-all
 MAKEFILE=	GNUmakefile
 
 WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abiword-plugins
-MD5_FILE=	${.CURDIR}/../abiword-devel/distinfo
+MD5_FILE=	${.CURDIR}/../abiword/distinfo
 
 ABIVERSION=	2.4
 PLIST_SUB+=	ABIVERSION=${ABIVERSION}
diff --git a/editors/abiword-plugins-devel/pkg-descr b/editors/abiword-plugins/pkg-descr
index e2e64357c..e2e64357c 100644
--- a/editors/abiword-plugins-devel/pkg-descr
+++ b/editors/abiword-plugins/pkg-descr
diff --git a/editors/abiword-plugins-devel/pkg-plist b/editors/abiword-plugins/pkg-plist
index af019200e..af019200e 100644
--- a/editors/abiword-plugins-devel/pkg-plist
+++ b/editors/abiword-plugins/pkg-plist
diff --git a/editors/abiword-devel/Makefile b/editors/abiword/Makefile
index 24bd14962..51656a489 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/abiword-devel/Makefile,v 1.4 2005/10/04 19:30:01 mezz Exp $
+#   $MCom$
 #
 
 PORTNAME=	abiword
@@ -11,7 +11,6 @@ PORTVERSION=	2.4.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
-PKGNAMESUFFIX=	-devel
 DISTNAME=	abiword-${PORTVERSION}
 DIST_SUBDIR=	AbiWord
 
@@ -25,8 +24,6 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		wv-1.0.0:${PORTSDIR}/textproc/wv \
 		fribidi.0:${PORTSDIR}/converters/fribidi
 
-CONFLICTS=	abiword-[0-9]*
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -71,7 +68,7 @@ PLIST_SUB+=		DICT:=""
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=		libgnomeui
 CONFIGURE_ARGS+=	--enable-gnome
-PKGNAMESUFFIX=		-devel-gnome
+PKGNAMESUFFIX=		-gnome
 GNOME_ENABLED=		yes
 .endif
 
diff --git a/editors/abiword-devel/distinfo b/editors/abiword/distinfo
index 13e2c040b..13e2c040b 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword/distinfo
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in
index 6385aea4d..6385aea4d 100644
--- a/editors/abiword-devel/files/patch-GNUmakefile.in
+++ b/editors/abiword/files/patch-GNUmakefile.in
diff --git a/editors/abiword-devel/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index a8faac36b..a8faac36b 100644
--- a/editors/abiword-devel/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword/files/patch-an
index 54d3de78e..54d3de78e 100644
--- a/editors/abiword-devel/files/patch-an
+++ b/editors/abiword/files/patch-an
diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword/files/patch-aq
index 98ce28093..98ce28093 100644
--- a/editors/abiword-devel/files/patch-aq
+++ b/editors/abiword/files/patch-aq
diff --git a/editors/abiword-devel/files/patch-ar b/editors/abiword/files/patch-ar
index 5832a8dee..5832a8dee 100644
--- a/editors/abiword-devel/files/patch-ar
+++ b/editors/abiword/files/patch-ar
diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
index d892f8e33..d892f8e33 100644
--- a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
index 97fad9259..97fad9259 100644
--- a/editors/abiword-devel/files/patch-src_af_util_xp_ut_string_class.cpp
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
diff --git a/editors/abiword-devel/pkg-descr b/editors/abiword/pkg-descr
index 44abfdaab..44abfdaab 100644
--- a/editors/abiword-devel/pkg-descr
+++ b/editors/abiword/pkg-descr
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword/pkg-plist
index b9f5dd811..b9f5dd811 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword/pkg-plist