10 files changed, 2 insertions, 174 deletions

diff --git a/MOVED b/MOVED
index accbd1e6f66f..83fceac8236b 100644
--- a/MOVED
+++ b/MOVED
@@ -3196,3 +3196,5 @@ devel/bonobo-conf||2012-01-08|Has expired: No more supported upstream, not depen
 www/typo343||2012-01-08|Has expired: Support will end in the near future, see http://typo3.org/download/packages/ for details
 devel/gnome-crash||2012-01-08|Has expired: No more supported upstream, not depend on anymore.
 x11-toolkits/gob||2012-01-08|Has expired: No more supported upstream, not depend on anymore.
+www/rubygem-htauth||2012-01-08|Has expired: broke for ~12 months
+www/instiki||2012-01-08|Has expired: has been marked ignore since 2010/09/16
diff --git a/www/Makefile b/www/Makefile
index acda5715061d..f8bb4fb9e90e 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -320,7 +320,6 @@
     SUBDIR += ilias3
     SUBDIR += imgsizer
     SUBDIR += impresscms
-    SUBDIR += instiki
     SUBDIR += interchange
     SUBDIR += ismail
     SUBDIR += iwebcal
@@ -1615,7 +1614,6 @@
     SUBDIR += rubygem-feedzirra
     SUBDIR += rubygem-haml
     SUBDIR += rubygem-hpricot
-    SUBDIR += rubygem-htauth
     SUBDIR += rubygem-httparty
     SUBDIR += rubygem-httpclient
     SUBDIR += rubygem-innate
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
deleted file mode 100644
index 99eac0fb287e..000000000000
--- a/www/instiki/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	instiki
-# Date created:				4 January 2005
-# Whom:					Kelley Reynolds <kelley@insidesystems.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	instiki
-PORTVERSION=	0.18.1
-CATEGORIES=	www ruby
-MASTER_SITES=	LOCAL/wen
-DISTNAME=	parasew-instiki-0.18.1-0-g6a5b0e1
-
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	Easy to set up wiki clone implemented in ruby
-
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}iconv>=0:${PORTSDIR}/converters/ruby-iconv
-
-USE_RUBY=	yes
-USE_RAKE=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/parasew-instiki-6a5b0e1
-INSTIKIPORT?=	2500
-INSTIKIDIR?=	www/instiki
-INSTIKILOGDIR=	${INSTIKIDIR}/log
-INSTIKI_DB=	db/production.db.sqlite3
-INSTIKI_DB_FILE=	${INSTIKIDIR}/${INSTIKI_DB}
-
-IGNORE=		does not work
-DEPRECATED=	has been marked ignore since 2010/09/16
-EXPIRATION_DATE=	2012-01-02
-
-.include <bsd.port.pre.mk>
-
-USE_RC_SUBR=	${PORTNAME}
-PLIST=		${WRKDIR}/plist
-SUB_LIST=	INSTIKIPORT=${INSTIKIPORT}
-SUB_FILES+=	pkg-message
-
-post-extract:
-	${MV} ${WRKSRC}/${INSTIKI_DB} ${WRKSRC}/${INSTIKI_DB}.sample
-
-pre-install:
-	${FIND} -s -d ${WRKSRC} -type l | ${SED} "s?${WRKSRC}?${INSTIKIDIR}?g" >>${PLIST}
-	${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${INSTIKIDIR}?g" >>${PLIST}
-
-	@if [ ! -f ${PREFIX}/${INSTIKI_DB_FILE} ]; then \
-		${MKDIR} ${PREFIX}/${INSTIKIDIR}/db ; \
-		${CP} ${WRKSRC}/${INSTIKI_DB}.sample ${PREFIX}/${INSTIKI_DB_FILE} ; \
-		${ECHO_CMD} "${INSTIKI_DB_FILE}" >> ${PLIST} ; \
-	fi
-
-	@${ECHO} @dirrm ${INSTIKILOGDIR} >> ${PLIST}
-	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${INSTIKIDIR}?g" >> ${PLIST}
-
-do-install:
-	@${INSTALL} -d ${WWWDIR}
-	@${CP} -pR ${WRKSRC}/ ${WWWDIR}/
-
-	@${INSTALL} -d ${WWWDIR}/log
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/instiki/distinfo b/www/instiki/distinfo
deleted file mode 100644
index 07fb6f194e35..000000000000
--- a/www/instiki/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (parasew-instiki-0.18.1-0-g6a5b0e1.tar.gz) = 968fdb0e99659c070869b86de8cfd76f45ae0cb65f12dc6999d48ab7996ce399
-SIZE (parasew-instiki-0.18.1-0-g6a5b0e1.tar.gz) = 5450757
diff --git a/www/instiki/files/instiki.in b/www/instiki/files/instiki.in
deleted file mode 100644
index 7d97dfd89620..000000000000
--- a/www/instiki/files/instiki.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: instiki
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf[.local] to enable instiki:
-# instiki_enable (bool):      Set to "NO" by default
-#                             Set it to "YES" to enable instiki
-# instiki_flags (str):        Set to "--port %%INSTIKIPORT%% --daemon" by default.
-#                             Extra flags passed to start command
-#
-
-. /etc/rc.subr
-
-name="instiki"
-rcvar=${name}_enable
-start_cmd="${name}_start"
-status_cmd="${name}_status"
-stop_cmd="${name}_stop"
-
-#rcvar=`set_rcvar`
-
-command="%%WWWDIR%%/instiki.rb"
-#command_interpreter="/usr/bin/env"
-
-: ${instiki_enable="NO"}
-: ${instiki_flags="--port %%INSTIKIPORT%% --daemon"}
-
-instiki_pid=$(ps x | grep "ruby $command" | grep -v grep | awk '{ print $1 }' )
-sig_stop=KILL
-
-instiki_start()
-{
-    unset "start_cmd"
-    test -n "$instiki_pid" || run_rc_command start
-}
-
-instiki_status()
-{
-    if [ -n "$instiki_pid" ] ; then
-	echo "Instiki is running at pid: $instiki_pid"
-    else
-        echo "Instiki is not running."
-   fi
-}
-
-instiki_stop()
-{
-    test -n "$instiki_pid" && kill -$sig_stop $instiki_pid
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/www/instiki/files/pkg-message.in b/www/instiki/files/pkg-message.in
deleted file mode 100644
index 35e737c2b234..000000000000
--- a/www/instiki/files/pkg-message.in
+++ /dev/null
@@ -1,13 +0,0 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
-
-instiki has been installed in %%WWWDIR%%
-
-Please add:
-	instiki_enable="YES" 
-to your /etc/rc.conf 
-
-From a terminal do:
-	%%LOCALBASE%%/etc/rc.d/instiki start
-Point your browser to: http://localhost:2500 for setup.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
diff --git a/www/instiki/pkg-descr b/www/instiki/pkg-descr
deleted file mode 100644
index 04861e52fa06..000000000000
--- a/www/instiki/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Textile- and Markdown- based Wiki with its own webserver and SQLite
-database, which makes for simple installation and running.
-
-WWW:  http://www.instiki.org/show/HomePage
diff --git a/www/rubygem-htauth/Makefile b/www/rubygem-htauth/Makefile
deleted file mode 100644
index 6e9a7c617649..000000000000
--- a/www/rubygem-htauth/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Ports collection makefile for:	gem-color
-# Date created:				19 Apr 2008
-# Whom:					dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-
-PORTNAME=	htauth
-PORTVERSION=	1.0.3
-CATEGORIES=	www rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	Replacement for the Apache htdigest and htpasswd
-
-RUN_DEPENDS=	rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline
-
-BROKEN=	depends on exact version of rubygem-highline
-DEPRECATED=	broke for ~12 months
-EXPIRATION_DATE=	2011-01-02
-
-USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-USE_RAKE=	yes
-RUBYGEM_AUTOPLIST=  yes
-PLIST_FILES=	bin/htdigest-ruby bin/htpasswd-ruby
-
-.include <bsd.port.mk>
diff --git a/www/rubygem-htauth/distinfo b/www/rubygem-htauth/distinfo
deleted file mode 100644
index 7bd24b345516..000000000000
--- a/www/rubygem-htauth/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/htauth-1.0.3.gem) = 4a61bed5567ef2a2e153d41662d1a6772e8b63750d35e80816a79235a2003345
-SIZE (rubygem/htauth-1.0.3.gem) = 19968
diff --git a/www/rubygem-htauth/pkg-descr b/www/rubygem-htauth/pkg-descr
deleted file mode 100644
index 7b5559789523..000000000000
--- a/www/rubygem-htauth/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-HTAuth is a pure ruby replacement for the Apache support programs htdigest
-and htpasswd. Command line and API access are provided for access to
-htdigest and htpasswd files.
-
-Author: Jeremy Hinegardner (copiousfreetime)