- Fix bsd.twiki.mk a bit

- Add a couple of new extensions:
- TopicVarsPlugin for inter-topic variables
- SubscribePlugin for quick subscription to topics

10 files changed, 81 insertions, 1 deletions

diff --git a/www/Makefile b/www/Makefile
index 4d4bc1671311..2dcbb3d9efa0 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1328,11 +1328,13 @@
     SUBDIR += twiki-SlideShowPlugin
     SUBDIR += twiki-SmiliesPlugin
     SUBDIR += twiki-SpreadSheetPlugin
+    SUBDIR += twiki-SubscribePlugin
     SUBDIR += twiki-TWikiUserMappingContrib
     SUBDIR += twiki-TablePlugin
     SUBDIR += twiki-TagMePlugin
     SUBDIR += twiki-TinyMCEPlugin
     SUBDIR += twiki-TipsContrib
+    SUBDIR += twiki-TopicVarsPlugin
     SUBDIR += twiki-TwistyContrib
     SUBDIR += twiki-TwistyPlugin
     SUBDIR += twiki-WysiwygPlugin
diff --git a/www/twiki-SubscribePlugin/Makefile b/www/twiki-SubscribePlugin/Makefile
new file mode 100644
index 000000000000..ac669593f5f1
--- /dev/null
+++ b/www/twiki-SubscribePlugin/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	twiki-SubscribePlugin
+# Date created:		30 April 2008
+#
+# $FreeBSD$
+#
+
+PORTNAME=	SubscribePlugin
+SVNREV=		16430
+
+COMMENT=	Add an easy subscription link to topics
+
+TWDEP=	MailerContrib>=13511
+
+.include "${.CURDIR}/../twiki/bsd.twiki.mk"
+.include <bsd.port.mk>
diff --git a/www/twiki-SubscribePlugin/distinfo b/www/twiki-SubscribePlugin/distinfo
new file mode 100644
index 000000000000..ede5ec0f0aa9
--- /dev/null
+++ b/www/twiki-SubscribePlugin/distinfo
@@ -0,0 +1,3 @@
+MD5 (twiki/SubscribePlugin-0.0.16430.tar.bz2) = a5421dbc5dbf9a99647b7ffc65155563
+SHA256 (twiki/SubscribePlugin-0.0.16430.tar.bz2) = 8b1d80d50ad01674023f71b42e5432f409da20ad63885baef9ca6eb5d53aae84
+SIZE (twiki/SubscribePlugin-0.0.16430.tar.bz2) = 29219
diff --git a/www/twiki-SubscribePlugin/pkg-descr b/www/twiki-SubscribePlugin/pkg-descr
new file mode 100644
index 000000000000..13c0b3e630b5
--- /dev/null
+++ b/www/twiki-SubscribePlugin/pkg-descr
@@ -0,0 +1,6 @@
+This is a companion plugin to the MailerContrib. It allows you to
+trivially add a "Subscribe me" link to topics to get subscribed to
+changes.
+
+Author: Crawford Currie
+WWW: http://twiki.org/cgi-bin/view/Plugins/SubscribePlugin
diff --git a/www/twiki-SubscribePlugin/pkg-plist b/www/twiki-SubscribePlugin/pkg-plist
new file mode 100644
index 000000000000..ebb5c733d73e
--- /dev/null
+++ b/www/twiki-SubscribePlugin/pkg-plist
@@ -0,0 +1,19 @@
+%%TWDIR%%/data/TWiki/SubscribePlugin.txt
+%%TWDIR%%/data/TWiki/VarSUBSCRIBE.txt
+%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/DEPENDENCIES
+%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/MANIFEST
+%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/build.pl
+%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin.pm
+%%TWDIR%%/pub/TWiki/SubscribePlugin/logo.gif
+%%TWDIR%%/pub/TWiki/SubscribePlugin/wikiringlogo20x20.png
+@dirrm %%TWDIR%%/data/TWiki
+@dirrm %%TWDIR%%/data
+@dirrm %%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin
+@dirrm %%TWDIR%%/lib/TWiki/Plugins
+@dirrm %%TWDIR%%/lib/TWiki
+@dirrm %%TWDIR%%/lib
+@dirrm %%TWDIR%%/pub/TWiki/SubscribePlugin
+@dirrm %%TWDIR%%/pub/TWiki
+@dirrm %%TWDIR%%/pub
+@dirrm %%TWDIR%%
+@dirrmtry share/twiki
diff --git a/www/twiki-TopicVarsPlugin/Makefile b/www/twiki-TopicVarsPlugin/Makefile
new file mode 100644
index 000000000000..14f8a221a99a
--- /dev/null
+++ b/www/twiki-TopicVarsPlugin/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	twiki-TopicVarsPlugin
+# Date created:		30 April 2008
+#
+# $FreeBSD$
+#
+
+PORTNAME=	TopicVarsPlugin
+SVNREV=		16417b
+# with modifications, to be committed to SVN
+
+COMMENT=	Create externally usable variables in any topic
+
+.include "${.CURDIR}/../twiki/bsd.twiki.mk"
+.include <bsd.port.mk>
diff --git a/www/twiki-TopicVarsPlugin/distinfo b/www/twiki-TopicVarsPlugin/distinfo
new file mode 100644
index 000000000000..572fd4466d93
--- /dev/null
+++ b/www/twiki-TopicVarsPlugin/distinfo
@@ -0,0 +1,3 @@
+MD5 (twiki/TopicVarsPlugin-0.0.16417b.tar.bz2) = 00d5951393fb6f2a3ffec8c6fe446681
+SHA256 (twiki/TopicVarsPlugin-0.0.16417b.tar.bz2) = 0d0557876fc06faa7ab8cb6a4f5f403d1d9376b8982ba492d5fb8993903ae317
+SIZE (twiki/TopicVarsPlugin-0.0.16417b.tar.bz2) = 3995
diff --git a/www/twiki-TopicVarsPlugin/pkg-descr b/www/twiki-TopicVarsPlugin/pkg-descr
new file mode 100644
index 000000000000..b05e78e8b8b2
--- /dev/null
+++ b/www/twiki-TopicVarsPlugin/pkg-descr
@@ -0,0 +1,5 @@
+Set variables in arbitrary topics and refer to them from other topics
+within the same web or wiki.
+
+Author: Tripp Lilley
+WWW: http://twiki.org/cgi-bin/view/Plugins/TopicVarsPlugin
diff --git a/www/twiki-TopicVarsPlugin/pkg-plist b/www/twiki-TopicVarsPlugin/pkg-plist
new file mode 100644
index 000000000000..afa67a20f78f
--- /dev/null
+++ b/www/twiki-TopicVarsPlugin/pkg-plist
@@ -0,0 +1,13 @@
+%%TWDIR%%/data/TWiki/TopicVarsPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/DEPENDENCIES
+%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/MANIFEST
+%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/build.pl
+%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin.pm
+@dirrm %%TWDIR%%/data/TWiki
+@dirrm %%TWDIR%%/data
+@dirrm %%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin
+@dirrm %%TWDIR%%/lib/TWiki/Plugins
+@dirrm %%TWDIR%%/lib/TWiki
+@dirrm %%TWDIR%%/lib
+@dirrm %%TWDIR%%
+@dirrmtry share/twiki
diff --git a/www/twiki/bsd.twiki.mk b/www/twiki/bsd.twiki.mk
index bd29ca4b440c..b13b701aca8a 100644
--- a/www/twiki/bsd.twiki.mk
+++ b/www/twiki/bsd.twiki.mk
@@ -77,7 +77,7 @@ make-port:
 	echo "# New ports collection makefile for:	$$pnam" > Makefile &&\
 	date '+# Date created:%t%t%e %B %Y' >> Makefile &&\
 	echo '#' >> Makefile &&\
-	echo '# $$FreeBSD$$' >> Makefile &&\
+	echo '# $$''FreeBSD$$' >> Makefile &&\
 	echo '#' >> Makefile &&\
 	echo >> Makefile &&\
 	echo "PORTNAME=	$$nnam" >> Makefile &&\