2007-07-28 www/p5-Kwiki-plugins: already bundled in www/p5-Kwiki (0.39 or latter)

2007-07-28 www/p5-Kwiki-Icons-Gnome: already bundled in www/p5-Kwiki (0.39 or latter)

9 files changed, 4 insertions, 157 deletions

diff --git a/MOVED b/MOVED
index 4e2b91e92f3..09d13010eba 100644
--- a/MOVED
+++ b/MOVED
@@ -3133,3 +3133,7 @@ www/p5-Kwiki-Theme-ColumnLayout||2007-08-01|Has expired: already bundled in www/
 www/p5-Kwiki-UserName||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or latter)
 www/p5-Kwiki-UserPreferences||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or latter)
 www/p5-Kwiki-VimMode||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or latter)
+www/p5-Kwiki-plugins||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or latter)
+www/p5-Kwiki-Icons-Gnome||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or latter)
+
+
diff --git a/www/Makefile b/www/Makefile
index f5904079cc8..d1b652dfc1f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -788,8 +788,6 @@
     SUBDIR += p5-Jemplate
     SUBDIR += p5-Jifty
     SUBDIR += p5-Kwiki
-    SUBDIR += p5-Kwiki-Icons-Gnome
-    SUBDIR += p5-Kwiki-plugins
     SUBDIR += p5-LWP-Authen-Wsse
     SUBDIR += p5-LWPx-ParanoidAgent
     SUBDIR += p5-MasonX-Interp-WithCallbacks
diff --git a/www/p5-Kwiki-Icons-Gnome/Makefile b/www/p5-Kwiki-Icons-Gnome/Makefile
deleted file mode 100644
index 0c37c16fb0a..00000000000
--- a/www/p5-Kwiki-Icons-Gnome/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	p5-Kwiki-Icons-Gnome
-# Date created:				Feb 16 2005
-# Whom:	      				Mark Foster <mark@foster.cc>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Kwiki-Icons-Gnome
-PORTVERSION=	0.15
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Kwiki
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	mark@foster.cc
-COMMENT=	Kwiki Gnome Icons plugin
-
-BUILD_DEPENDS=	${SITE_PERL}/Kwiki.pm:${PORTSDIR}/www/p5-Kwiki
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-BROKEN=		Broken dependency
-
-PERL_CONFIGURE=	yes
-
-MAN3=		Kwiki::Icons::Gnome.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/p5-Kwiki-Icons-Gnome/distinfo b/www/p5-Kwiki-Icons-Gnome/distinfo
deleted file mode 100644
index 182aa58f246..00000000000
--- a/www/p5-Kwiki-Icons-Gnome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Kwiki-Icons-Gnome-0.15.tar.gz) = 9c17f2279acde598abae6824f6124aa7
-SHA256 (Kwiki-Icons-Gnome-0.15.tar.gz) = 4e8e6932724b9061f2516808136386e5d7fb78beedc9601bcf18ccd9e3b47a27
-SIZE (Kwiki-Icons-Gnome-0.15.tar.gz) = 16026
diff --git a/www/p5-Kwiki-Icons-Gnome/pkg-descr b/www/p5-Kwiki-Icons-Gnome/pkg-descr
deleted file mode 100644
index 6c89f667a50..00000000000
--- a/www/p5-Kwiki-Icons-Gnome/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Kwiki::Icons::Gnome - Kwiki Gnome Icons Plugin
-
-WWW: http://cpan.uwinnipeg.ca/dist/Kwiki-Icons-Gnome 
-Author:	Brian Ingerson <INGY at cpan.org>
diff --git a/www/p5-Kwiki-Icons-Gnome/pkg-message b/www/p5-Kwiki-Icons-Gnome/pkg-message
deleted file mode 100644
index a078aac409e..00000000000
--- a/www/p5-Kwiki-Icons-Gnome/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-/* ================================================================= */
-Note: 
-	Kwiki-Icons-Gnome plugin installed! Now you should add
-	to your kwiki in kwiki installation directory:
-
-$ cd cgi-bin/my-kwiki
-$ kwiki -add Kwiki::Icons::Gnome
-
-/* ================================================================= */
diff --git a/www/p5-Kwiki-Icons-Gnome/pkg-plist b/www/p5-Kwiki-Icons-Gnome/pkg-plist
deleted file mode 100644
index db976134bf4..00000000000
--- a/www/p5-Kwiki-Icons-Gnome/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/Kwiki/Icons/Gnome.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons
-@dirrmtry %%SITE_PERL%%/Kwiki/Icons/
diff --git a/www/p5-Kwiki-plugins/Makefile b/www/p5-Kwiki-plugins/Makefile
deleted file mode 100644
index 59cc1c664da..00000000000
--- a/www/p5-Kwiki-plugins/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# New ports collection makefile for:	p5-Kwiki-plugins
-# Date created:				Aug 18 2004
-# Whom:	      				Cheng-Lung Sung <clsung@dragon2.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Kwiki-plugins
-PORTVERSION=	1.0
-CATEGORIES=	www perl5
-MASTER_SITES=	# empty
-PKGNAMEPREFIX=	p5-
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
-
-MAINTAINER=	clsung@FreeBSD.org
-COMMENT=	"meta-port" for Kwiki Plugins
-
-BUILD_DEPENDS=	${SITE_PERL}/Kwiki.pm:${PORTSDIR}/www/p5-Kwiki
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-OPTIONS=	ARCHIVERCS		"Page Archival Using RCS" on \
-		ARCHIVESVK		"Page Archival Using SVK" off \
-		ATOM			"Atom Plugin" off \
-		GDGRAPHGENERATOR	"GD Graph Generator" off \
-		NEWPAGE			"New Page Plugin" on \
-		REVISIONS		"Revisions Plugin" on \
-		RECENTCHANGES		"Recent Changes Plugin" on \
-		RECENTCHANGESRSS	"RSS Plugin" on \
-		SEARCH			"Search Plugin" on \
-		USERNAME		"User Name Plugin" on \
-		USERPREFERENCES		"User Preferences Plugin" on
-
-NO_BUILD=	yes
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ARCHIVERCS)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/Archive/Rcs.pm:${PORTSDIR}/www/p5-Kwiki-Archive-Rcs
-.endif
-
-.if defined(WITH_ARCHIVESVK)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/Archive/SVK.pm:${PORTSDIR}/www/p5-Kwiki-Archive-SVK
-.endif
-
-.if defined(WITH_ATOM)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/Atom.pm:${PORTSDIR}/www/p5-Kwiki-Atom
-.endif
-
-.if defined(WITH_GDGRAPHGENERATOR)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/GDGraphGenerator.pm:${PORTSDIR}/www/p5-Kwiki-GDGraphGenerator
-.endif
-
-.if defined(WITH_NEWPAGE)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/NewPage.pm:${PORTSDIR}/www/p5-Kwiki-NewPage
-.endif
-
-.if defined(WITH_REVISIONS)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/Revisions.pm:${PORTSDIR}/www/p5-Kwiki-Revisions
-.endif
-
-.if defined(WITH_RECENTCHANGES)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/RecentChanges.pm:${PORTSDIR}/www/p5-Kwiki-RecentChanges
-.endif
-
-.if defined(WITH_RECENTCHANGESRSS)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/RecentChangesRSS.pm:${PORTSDIR}/www/p5-Kwiki-RecentChangesRSS
-.endif
-
-.if defined(WITH_SEARCH)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/Search.pm:${PORTSDIR}/www/p5-Kwiki-Search
-.endif
-
-.if defined(WITH_USERNAME)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/UserName.pm:${PORTSDIR}/www/p5-Kwiki-UserName
-.endif
-
-.if defined(WITH_USERPREFERENCES)
-RUN_DEPENDS+=	${SITE_PERL}/Kwiki/UserPreferences.pm:${PORTSDIR}/www/p5-Kwiki-UserPreferences
-.endif
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		This port requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-do-build:
-	        @${DO_NADA}
-
-do-install:
-	        @${DO_NADA}
-
-.include <bsd.port.post.mk>
diff --git a/www/p5-Kwiki-plugins/pkg-descr b/www/p5-Kwiki-plugins/pkg-descr
deleted file mode 100644
index cf8a081bede..00000000000
--- a/www/p5-Kwiki-plugins/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Here is a meta-port for a set of Kwiki plugins.
-
-WWW:	http://www.kwiki.org/
-
-- Cheng-Lung Sung
-clsung@FreeBSD.org