o Take over maintainership on previous maintainers request

o Uphold hier(7)
o Add rc.d(8) rc.subr(8) script
o Fix several warnings
o Change default rss channels to BSD based ones:
  - http://www.freebsd.org/
  - http://www.freshports.org/
  - http://www.oreillynet.com/pub/au/73
  - http://bsdnews.com/
o Fetch an updated full channel list from the Internet if none
  previously exist
o Add fork(2)/exec(3) browser support with signal(3) SIGCHLD handling
o AmphetaDesk now allows per user configurations. Due to that, it
  now requires a user with a home directory so that. One can use
  the rc.d script to choose a user to launch AmphetaDesk from startup
  or just to run it normally from any user other than root
o Bump PORTREVISION

Approved by:	Kenneth Stailey <kstailey@yahoo.com> (previous maintainer)

16 files changed, 639 insertions, 275 deletions

diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 3f72b1933f73..9ecbdcc8911f 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME=	amphetadesk
 PORTVERSION=	0.93.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-src-v${PORTVERSION}
 
-MAINTAINER=	kstailey@yahoo.com
+MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	RSS client that serves HTTP to your local web browser
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+RUN_DEPENDS=	\
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
@@ -26,137 +28,95 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
+USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 
-post-extract:
-	@ ${INSTALL_SCRIPT} ${FILESDIR}/AmphetaDesk ${WRKSRC}
+.ifndef(NOPORTDOCS)
+PORTDOCS=	\
+		*
+.endif
 
 post-patch:
-	@ ${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 -x ${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/perl|${PERL}|'
-	@ ${REINPLACE_CMD} -E -e 's|%%ADESK%%|${ADESK}|' ${WRKSRC}/AmphetaDesk
-
-# fit in 80 colums via macro reductions
-# srcs
-AWRK=		${WRKSRC}/lib/AmphetaDesk
-TWRK=		${WRKSRC}/lib/Text
-DWRK=		${WRKSRC}/docs
-IWRK=		${DWRK}/images
-DATA=		${WRKSRC}/data
-LIST=		${DATA}/lists/services-channels-recent.xml
-TMPL=		${WRKSRC}/templates
-DEFL=		${TMPL}/default
-GUI=		${DEFL}/gui
-DIMG		=${DEFL}/images
+	@${FIND} ${WRKSRC} -type f -print0 | \
+		${XARGS} -0 -x -n 10 \
+		${REINPLACE_CMD} -E \
+		-e 's|([[:space:]]+)(AmphetaDesk)|\1AmphetaDesk::\2|g' \
+		-e 's|([[:space:]]*)(Text::Template)|\1AmphetaDesk::\2|g' \
+		-e 's|([[:space:]]*)(XML::Simple)|\1AmphetaDesk::\2|g' \
+		-e 's|^.*use[[:space:]]*FindBin.*$$||' \
+		-e "s|\([\$$]Bin|\(\$$ENV{'DIRNAME'}|g"
+	@${REINPLACE_CMD} -E \
+		-e 's|%%DATADIR%%|${DATADIR}|' \
+		-e 's|%%DOCSDIR%%|${DOCSDIR}|' \
+		${WRKSRC}/lib/AmphetaDesk/Settings.pm
+# rc.d
+	@${SED}  \
+		-e 's|%%PREFIX%%|${PREFIX}|' \
+		-e "s|%%PERL%%|${PERL}|" \
+		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
 
-# dests
-ADESK_DOC=	${PREFIX}/share/doc/AmphetaDesk
-ADESK_IMG=	${ADESK_DOC}/images
-ADESK=		${SITE_PERL}/AmphetaDesk
-ADESK_OS=	${ADESK}/OS
-ADESK_DATA=	${ADESK}/data
-ADESK_LIST=	${ADESK_DATA}/lists
-ADESK_TMPL=	${ADESK}/templates
-ADESK_DEFL=	${ADESK_TMPL}/default
-ADESK_GUI=	${ADESK_DEFL}/gui
-ADESK_DIMG=	${ADESK_DEFL}/images
+post-configure:
+	@${REINPLACE_CMD} -E \
+		-e 's|^.*/usr/bin/perl.*$$||' \
+		${WRKSRC}/AmphetaDesk.pl
+	@${SED} \
+		-e "s|%%PREFIX%%|${PREFIX}|" \
+		-e 's|%%DATADIR%%|${DATADIR}|' \
+		-e "s|%%PERL%%|${PERL}|" \
+		${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
 
 do-install:
-	@ ${MKDIR} ${ADESK}
-	@ ${MKDIR} ${ADESK_OS}
-	@ ${MKDIR} ${ADESK_DOC}
-	@ ${MKDIR} ${ADESK_IMG}
-	@ ${MKDIR} ${ADESK_LIST}
-	@ ${MKDIR} ${ADESK_TMPL}
-	@ ${MKDIR} ${ADESK_DEFL}
-	@ ${MKDIR} ${ADESK_GUI}
-	@ ${MKDIR} ${ADESK_DIMG}
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/AmphetaDesk	   ${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/AmphetaDesk.pl	   ${ADESK}
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/AmphetaDesk.pm 	   ${SITE_PERL}
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/README.txt     	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Channels.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/ChannelsList.pm      	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/MyChannels.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Settings.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Templates.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Utilities.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Versioning.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/WWW.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/WebServer.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/OS/Linux.pm	       	   ${ADESK_OS}
-	@ ${INSTALL_DATA} ${DWRK}/CHANGELOG	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/LICENSE	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/README.txt	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/TODO		       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/build.html	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/files_and_dirs.html  	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/finding_more.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/give_thanks.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/history.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/index.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/kudos.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/naming.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/news.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/news.xml		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/screenshots.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/skinning.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/version.txt		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/website_integration.html ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/whats_new.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_my_services.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_my_settings.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_services_lists.html  ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${IWRK}/bkgrnd.gif      	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/fyuze.gif       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/globe.gif       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/livejournal.jpg 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/logo-88x31.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/logo.gif        	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/mailarchive.gif 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/meerkat.jpg     	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/moreover.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/network54.gif   	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/newsisfree.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/nwfusion.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/quicktopic.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/racingnews.jpg  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/sherch.jpg      	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/snewp.jpg       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/syndic8.gif     	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml.gif	  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml_pill.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml_radio.gif   	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/yahoogroups.gif 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${DATA}/README.txt		   ${ADESK_DATA}
-	@ ${INSTALL_DATA} ${LIST}			   ${ADESK_LIST}
-	@ ${INSTALL_DATA} ${TMPL}/README.txt		   ${ADESK_TMPL}
-	@ ${INSTALL_DATA} ${DEFL}/add_a_channel.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/index.html		   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/my_channels.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/my_settings.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/popup.html		   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/tpl_footer.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/tpl_header.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${GUI}/linux_icon.png		   ${ADESK_GUI}
-	@ ${INSTALL_DATA} ${GUI}/linux_logo.png		   ${ADESK_GUI}
-	@ ${INSTALL_DATA} ${DIMG}/bkgrnd.gif   		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/delete.gif   		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/email.gif    		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/globe.gif    		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/logo.gif		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/xml.gif		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/xml_radio.gif		   ${ADESK_DIMG}
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
+## create site_perl
+# dirs
+	@${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk
+	@cd ${WRKSRC}/lib && \
+		${FIND} * -type d ! -empty -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+# files
+	@cd ${WRKSRC}/lib && \
+		${FIND} * -type f -name "*pm" -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+# script
+	@${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \
+		${PREFIX}/bin/AmphetaDesk-real
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
+		${PREFIX}/bin/AmphetaDesk
+## docs
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for ext in html txt xml
+	@${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+.endfor
+	@${MKDIR} ${DOCSDIR}/images
+.for ext in gif jpg
+	@${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \
+		${DOCSDIR}/images
+.endfor
 .endif
+## lists
+	@${MKDIR} ${DATADIR}/lists
+	@${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \
+		${DATADIR}/lists
+## templates
+# dirs
+	@cd ${WRKSRC} && \
+		${FIND} templates -type d ! -empty -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${MKDIR} ${DATADIR}/{}
+# files
+.for ext in gif html ico png pict 
+	@cd ${WRKSRC} && \
+		${FIND} templates -type f -name "*.${ext}" -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${INSTALL_DATA} {} ${DATADIR}/{}
+.endfor
+# rc.d
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/amphetadesk/files/AmphetaDesk b/www/amphetadesk/files/AmphetaDesk
deleted file mode 100644
index 28fe5aea8e1d..000000000000
--- a/www/amphetadesk/files/AmphetaDesk
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-
-if [ `id -un` = root ]; then
-    echo Running AmphetaDesk as root is not recommended.
-    echo Aborting.
-    exit 1
-fi
-
-export AM_DIR=$HOME/.AmphetaDesk
-
-if [ ! -d $AM_DIR ]; then
-    if [ -e $AM_DIR ]; then
-	echo Cannot make $AM_DIR directory for something is in the way.
-	echo Aborting.
-	exit 1
-    else
-	mkdir $AM_DIR
-	if [ ! -d $AM_DIR ]; then
-	    echo Cannot make $AM_DIR directory.
-	    echo Aborting.
-	    exit 1
-	fi
-    fi
-fi
-
-echo Diagnostic output goes to $AM_DIR/AmphetaDesk.log
-
-cd %%ADESK%%
-
-if [ ! -f ${AM_DIR}/data/lists/services-channels-recent.xml ] ; then
-    find data -depth -print | cpio -pdum ${AM_DIR}
-fi
-
-exec ./AmphetaDesk.pl
diff --git a/www/amphetadesk/files/amphetadesk.in b/www/amphetadesk/files/amphetadesk.in
new file mode 100644
index 000000000000..330554953316
--- /dev/null
+++ b/www/amphetadesk/files/amphetadesk.in
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
+
+# PROVIDE: amphetadesk
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable amphetadesk:
+#
+#amphetadesk_enable="YES"
+#amphetadesk_user=""
+#amphetadesk_pidfile=""
+#
+
+. /etc/rc.subr
+
+name="amphetadesk"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/AmphetaDesk"
+procname="%%PERL%%"
+
+load_rc_config "${name}"
+: ${amphetadesk_enable="NO"}
+: ${amphetadesk_user=""}
+
+if [ -n "${amphetadesk_user}" ]; then
+  eval realpath ~${amphetadesk_user} >/dev/null 2>&1 &&
+    amphetadesk_homedir="$(eval realpath ~${amphetadesk_user})"
+fi
+
+if [ -n "${amphetadesk_user}" -a -z "${amphetadesk_pidfile}" -a -n "${amphetadesk_homedir}" ]; then
+  amphetadesk_pidfile="${amphetadesk_homedir}/.${name}/AmphetaDesk.pid"
+fi
+
+pidfile="${amphetadesk_pidfile:-${HOME}/.${name}/AmphetaDesk.pid}"
+
+start_cmd="start_cmd"
+
+start_precmd="amphetadesk_check_vars"
+stop_precmd="amphetadesk_check_vars"
+status_precmd="amphetadesk_check_vars"
+
+amphetadesk_check_vars()
+{
+  if [ -z "${amphetadesk_user}" ]; then
+    amphetadesk_user=$(whoami)
+  fi
+
+  if [ "x${amphetadesk_user}" = "xroot" ]; then
+    err 1 "You have to set amphetadesk_user to a non-root user for security reasons"
+  fi
+}
+
+start_cmd()
+{
+  su -l ${amphetadesk_user} \
+	-c "env PIDFILE=${pidfile} ${command} &"
+}
+
+run_rc_command "$1"
diff --git a/www/amphetadesk/files/amphetadesk.sh b/www/amphetadesk/files/amphetadesk.sh
new file mode 100644
index 000000000000..330554953316
--- /dev/null
+++ b/www/amphetadesk/files/amphetadesk.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
+
+# PROVIDE: amphetadesk
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable amphetadesk:
+#
+#amphetadesk_enable="YES"
+#amphetadesk_user=""
+#amphetadesk_pidfile=""
+#
+
+. /etc/rc.subr
+
+name="amphetadesk"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/AmphetaDesk"
+procname="%%PERL%%"
+
+load_rc_config "${name}"
+: ${amphetadesk_enable="NO"}
+: ${amphetadesk_user=""}
+
+if [ -n "${amphetadesk_user}" ]; then
+  eval realpath ~${amphetadesk_user} >/dev/null 2>&1 &&
+    amphetadesk_homedir="$(eval realpath ~${amphetadesk_user})"
+fi
+
+if [ -n "${amphetadesk_user}" -a -z "${amphetadesk_pidfile}" -a -n "${amphetadesk_homedir}" ]; then
+  amphetadesk_pidfile="${amphetadesk_homedir}/.${name}/AmphetaDesk.pid"
+fi
+
+pidfile="${amphetadesk_pidfile:-${HOME}/.${name}/AmphetaDesk.pid}"
+
+start_cmd="start_cmd"
+
+start_precmd="amphetadesk_check_vars"
+stop_precmd="amphetadesk_check_vars"
+status_precmd="amphetadesk_check_vars"
+
+amphetadesk_check_vars()
+{
+  if [ -z "${amphetadesk_user}" ]; then
+    amphetadesk_user=$(whoami)
+  fi
+
+  if [ "x${amphetadesk_user}" = "xroot" ]; then
+    err 1 "You have to set amphetadesk_user to a non-root user for security reasons"
+  fi
+}
+
+start_cmd()
+{
+  su -l ${amphetadesk_user} \
+	-c "env PIDFILE=${pidfile} ${command} &"
+}
+
+run_rc_command "$1"
diff --git a/www/amphetadesk/files/patch-AM_DIR b/www/amphetadesk/files/patch-AM_DIR
deleted file mode 100644
index b0fd613c5c82..000000000000
--- a/www/amphetadesk/files/patch-AM_DIR
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/AmphetaDesk.pm.DIST	Tue Nov  5 06:06:05 2002
-+++ lib/AmphetaDesk.pm	Thu Apr  8 23:17:19 2004
-@@ -71,7 +71,8 @@
- 
-    # delete the logfile if it's over 250k,
-    # then reopen it and try to redir STDERR.
--   my $logfile = catfile($Bin, "AmphetaDesk.log");
-+   my $envtmp = $ENV{AM_DIR};
-+   my $logfile = catfile($envtmp, "AmphetaDesk.log");
-    if (-e $logfile) { unlink $logfile if -s $logfile > 250000; }
-    open (LOG, ">>$logfile") or die "AmphetaDesk couldn't open the logfile for logging: $!";
-    open(STDERR,">&LOG") or die "AmphetaDesk couldn't redirect errors to the logfile: $!";
-@@ -81,7 +82,7 @@
-    # load our settings. this routine is located in Settings.pm
-    # and takes care of determining the OS, finding all the paths
-    # to the relevant files, as well as making sure everything exists.
--   load_my_settings( catfile($Bin, "data", "mySettings.xml") );
-+   load_my_settings( catfile($envtmp, "data", "mySettings.xml") );
- 
-    # load our os specific libraries. if we don't know, use the Linux
-    # libraries, which currently default to STDOUT for all gui processing.
diff --git a/www/amphetadesk/files/patch-defaults b/www/amphetadesk/files/patch-defaults
deleted file mode 100644
index 75c5c66b670b..000000000000
--- a/www/amphetadesk/files/patch-defaults
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/AmphetaDesk/Settings.pm.DIST	Mon Oct 28 12:40:41 2002
-+++ lib/AmphetaDesk/Settings.pm	Thu Apr  8 23:29:33 2004
-@@ -105,7 +105,8 @@
-    $SETTINGS{app_contact}                     = "Morbus Iff";
-    $SETTINGS{app_email}                       = "morbus\@disobey.com";
-    $SETTINGS{app_os}                          = $^O;
--   $SETTINGS{dir_data}                        = catdir($Bin, "data");
-+   my $envtmp = $ENV{AM_DIR};
-+   $SETTINGS{dir_data}                        = catdir($envtmp, "data");
-    $SETTINGS{dir_docs}                        = catdir($Bin, "docs");
-    $SETTINGS{dir_templates}                   = catdir($Bin, "templates", "default");
-    $SETTINGS{dir_gui}                         = catdir($SETTINGS{dir_templates}, "gui");
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk.pm
new file mode 100644
index 000000000000..fb7a9aba60a9
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk.pm
@@ -0,0 +1,10 @@
+--- lib/AmphetaDesk.pm.orig	Mon Oct 10 17:02:41 2005
++++ lib/AmphetaDesk.pm	Mon Oct 10 17:02:45 2005
+@@ -40,7 +40,6 @@
+ 
+ # where are we?
+ use FindBin qw($Bin);
+-BEGIN { unshift(@INC, catdir($Bin, "lib")); }
+ 
+ ###############################################################################
+ # init - creates the environment and sets up the queue based loop.            #
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::ChannelsList.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::ChannelsList.pm
new file mode 100644
index 000000000000..7ac4b6817145
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::ChannelsList.pm
@@ -0,0 +1,23 @@
+--- lib/AmphetaDesk/ChannelsList.pm.orig	Tue Oct 11 01:12:48 2005
++++ lib/AmphetaDesk/ChannelsList.pm	Tue Oct 11 01:35:03 2005
+@@ -18,6 +18,7 @@
+ use strict; $|++;
+ use AmphetaDesk::Settings;
+ use AmphetaDesk::Utilities;
++use AmphetaDesk::WWW;
+ use XML::Parser;
+ require Exporter;
+ use vars qw( @ISA @EXPORT );
+@@ -103,6 +104,12 @@
+    # my logfile is aroused.
+    note("Loading our channel list from " .
+         get_setting("names_file_services_channels") . ".");
++
++   # fetch updated version if none exists locally
++   if (! -e (get_setting("files_services_channels")) ) {
++     my $l = new AmphetaDesk::WWW;
++     $l->getstore( "http://www.disobey.com/amphetadesk/lists/services-channels-recent.xml", (get_setting("files_services_channels")) );
++   }
+ 
+    # get an new instance of the parser,
+    # register handlers, then parse.
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::MyChannels.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::MyChannels.pm
new file mode 100644
index 000000000000..0ba21e58c8e3
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::MyChannels.pm
@@ -0,0 +1,97 @@
+--- lib/AmphetaDesk/MyChannels.pm.orig	Tue Oct 29 03:17:50 2002
++++ lib/AmphetaDesk/MyChannels.pm	Tue Oct 11 18:41:38 2005
+@@ -359,9 +359,11 @@
+ 
+    # count 'em.
+    my $total_count = count_my_channels;
++   if ($total_count) {
+    note("There was a total of $total_count subscribed channels.");
+    note("We dance a drunken jig of epic proportions! " . 
+            "<shake> <jiggle> <keRAASH!>...") if $total_count > 100;
++   }
+ 
+    # resave the channels list
+    # with the latest dates.
+@@ -558,50 +560,41 @@
+           title           => "Disobey.com's AmphetaDesk - News and Updates",
+           xmlurl          => "http://www.disobey.com/amphetadesk/news.xml"
+         },
+-        "http://www.moreover.com/cgi-local/page?index_naturalhealth+rss" => {
+-          date_added      => "2002-03-01 00:00:00",
+-          date_downloaded => "2002-03-01 00:00:00",
+-          description     => "Consumer: top stories - news headlines from around the web, refreshed every 15 minutes.",
+-          filename        => "consumernaturalhealt.xml",
+-          htmlurl         => "http://www.moreover.com/",
+-          title           => "Consumer: natural health news",
+-          xmlurl          => "http://www.moreover.com/cgi-local/page?index_naturalhealth+rss"
+-        },
+-        "http://www.gamegrene.com/rss/gamegrene.xml" => {
+-          date_added      => "2002-03-01 00:00:00",
+-          date_downloaded => "2002-03-01 00:00:00",
+-          description     => "Filled with unique and interesting computer, tabletop, card, and roleplaying game columns, as well as daily news from the gaming community, Gamegrene.com is the perfect choice for the gamer who's sick of the typical.",
+-          filename        => "gamegrenecom.xml",
+-          htmlurl         => "http://www.gamegrene.com/",
+-          title           => "Game Green? Games Phobia? Gamegrene.com!",
+-          xmlurl          => "http://www.gamegrene.com/rss/gamegrene.xml"
++        "http://www.freebsd.org/news/news.rdf" => {
++          date_added      => "2005-10-11 00:00:00",
++          date_downloaded => "2005-10-11 00:00:00",
++          description     => "News from the FreeBSD Project",
++          filename        => "freebsdprojectnews.xml",
++          htmlurl         => "http://www.FreeBSD.org/news/",
++          title           => "FreeBSD Project News",
++          xmlurl          => "http://www.freebsd.org/news/news.rdf"
+         },
+-        "http://www.lockergnome.com/lockergnome.xml" => {
+-          date_added      => "2002-03-01 00:00:00",
+-          date_downloaded => "2002-03-01 00:00:00",
+-          description     => "Free Technology E-mail Newsletters - Packed with 32-bit downloads (freeware / shareware), MP3s, multimedia, fonts, updates, tips, tricks, computer news, and more! We cater to curious users.",
+-          filename        => "lockergnome.xml",
+-          htmlurl         => "http://www.lockergnome.com/",
+-          title           => "Lockergnome",
+-          xmlurl          => "http://www.lockergnome.com/lockergnome.xml"
++        "http://www.freshports.org/news.php" => {
++          date_added      => "2005-10-11 00:00:00",
++          date_downloaded => "2005-10-11 00:00:00",
++          description     => "he easiest place to find ports",
++          filename        => "freshportstheplacefo.xml",
++          htmlurl         => "http://www.FreshPorts.org/",
++          title           => "FreshPorts -- The Place For Ports",
++          xmlurl          => "http://www.freshports.org/news.php"
+         },
+-        "http://www.researchbuzz.com/researchbuzz.rss" => {
+-          date_added      => "2002-03-01 00:00:00",
+-          date_downloaded => "2002-03-01 00:00:00",
+-          description     => "News and information on search engines and other Internet research resources.",
+-          filename        => "researchbuzz.xml",
+-          htmlurl         => "http://www.researchbuzz.com/",
+-          title           => "ResearchBuzz",
+-          xmlurl          => "http://www.researchbuzz.com/researchbuzz.rss"
++        "http://www.oreillynet.com/feeds/author/?x-au=73&amp;x-mimetype=application/rdf+xm" => {
++          date_added      => "2005-10-11 00:00:00",
++          date_downloaded => "2005-10-11 00:00:00",
++          description     => "Dru Lavigne's O'Reilly Network Items: Weblogs, Articles, Hacks and Books",
++          filename        => "drulavigneoreillynet.xml",
++          htmlurl         => "http://www.oreillynet.com/pub/au/73",
++          title           => "Dru Lavigne, O'Reilly Network",
++          xmlurl          => "http://www.oreillynet.com/feeds/author/?x-au=73&amp;x-mimetype=application/rdf+xm"
+         },
+-        "http://www.reutershealth.com/eline.rss" => {
+-          date_added      => "2002-03-01 00:00:00",
+-          date_downloaded => "2002-03-01 00:00:00",
+-          description     => "A daily look at the top consumer-oriented health-related news stories.",
+-          filename        => "reutershealtheline.xml",
+-          htmlurl         => "http://www.reutershealth.com/",
+-          title           => "Reuters Health eLine",
+-          xmlurl          => "http://www.reutershealth.com/eline.rss"
++        "http://daily.daemonnews.org/ddn.rdf.php3" => {
++          date_added      => "2005-10-11 00:00:00",
++          date_downloaded => "2005-10-11 00:00:00",
++          description     => "Daemon News PHP News System",
++          filename        => "bsdnews.xml",
++          htmlurl         => "http://bsdnews.com",
++          title           => "BSD News",
++          xmlurl          => "http://daily.daemonnews.org/ddn.rdf.php3"
+         }
+       );
+ 
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm
new file mode 100644
index 000000000000..0c5d3c670b76
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::OS::Linux.pm
@@ -0,0 +1,71 @@
+--- lib/AmphetaDesk/OS/Linux.pm.orig	Thu May 23 23:35:38 2002
++++ lib/AmphetaDesk/OS/Linux.pm	Tue Oct 11 18:46:17 2005
+@@ -15,11 +15,26 @@
+ use strict;
+ use AmphetaDesk::Settings;
+ use AmphetaDesk::Utilities;
++use POSIX ":sys_wait_h";
++use POSIX ":unistd_h";
+ require Exporter;
+ use vars qw( @ISA @EXPORT );
+ @ISA = qw( Exporter );
+ @EXPORT = qw( gui_init gui_listen gui_note open_url );
+ 
++# taken from perlipc man page
++sub sigchild {
++  my $child;
++
++  # If a second child dies while in the signal handler caused by the
++  # first death, we won't get another signal. So must loop here else
++  # we will leave the unreaped child as a zombie. And the next time
++  # two children die we get another zombie. And so on.
++  while (($child = waitpid(-1,WNOHANG)) > 0) {}
++
++  $SIG{CHLD} = \&sigchild;
++}
++
+ ###############################################################################
+ # gui_init - start the gui and display the window.                            #
+ ###############################################################################
+@@ -105,8 +120,41 @@
+    # construct our url.
+    my $url = "http://127.0.0.1:" . get_setting("urls_port") . "/index.html";
+ 
++   # default browser
++   my $browser;
++
+    # we spit out our suggestion just to catch all instances.
+    note("If your browser doesn't load, go to <$url>.", 1);
++
++   # what browser?
++   if ($ENV{'BROWSER'}) {
++     $browser = $ENV{'BROWSER'};
++   } else {
++     if (get_setting("user_browser_path")) {
++       $browser = get_setting("user_browser_path");
++     }
++   }
++
++   if ( ($browser) && ( (-x $browser) || (-X $browser) ) ) {
++     note("Your environment states that $browser is your default program.");
++
++     $SIG{CHLD} = \&sigchild;
++
++     if (fork() == 0) {
++       my @args = ("$browser", "$url");
++
++       setsid();
++       close(STDIN);
++       close(STDOUT);
++       close(STDERR);
++
++       exec(@args) == 0
++         or note("The browser <$browser> does not exist. Please select another.");
++
++       exit 1;
++     }
++
++   }
+ 
+    return 1;
+ 
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::Settings.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::Settings.pm
new file mode 100644
index 000000000000..abf0a19ec287
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::Settings.pm
@@ -0,0 +1,23 @@
+--- lib/AmphetaDesk/Settings.pm.orig	Mon Oct 28 14:40:19 2002
++++ lib/AmphetaDesk/Settings.pm	Mon Oct 10 17:05:56 2005
+@@ -33,7 +33,6 @@
+ 
+ # where are we?
+ use FindBin qw($Bin);
+-BEGIN { unshift(@INC, catdir($Bin, "lib")); }
+ 
+ # where we store our
+ # in-memory settings.
+@@ -105,9 +104,9 @@
+    $SETTINGS{app_contact}                     = "Morbus Iff";
+    $SETTINGS{app_email}                       = "morbus\@disobey.com";
+    $SETTINGS{app_os}                          = $^O;
+-   $SETTINGS{dir_data}                        = catdir($Bin, "data");
+-   $SETTINGS{dir_docs}                        = catdir($Bin, "docs");
+-   $SETTINGS{dir_templates}                   = catdir($Bin, "templates", "default");
++   $SETTINGS{dir_data}                        = catdir($ENV{'HOME'}, ".amphetadesk", "data");
++   $SETTINGS{dir_docs}                        = "%%DOCSDIR%%";
++   $SETTINGS{dir_templates}                   = catdir("%%DATADIR%%", "templates", "default");
+    $SETTINGS{dir_gui}                         = catdir($SETTINGS{dir_templates}, "gui");
+    $SETTINGS{dir_data_channels}               = catdir($SETTINGS{dir_data}, "channels");
+    $SETTINGS{dir_data_lists}                  = catdir($SETTINGS{dir_data}, "lists");
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::Utilities.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::Utilities.pm
new file mode 100644
index 000000000000..efa3380c5d85
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::Utilities.pm
@@ -0,0 +1,29 @@
+--- lib/AmphetaDesk/Utilities.pm.orig	Sun Oct  9 19:45:59 2005
++++ lib/AmphetaDesk/Utilities.pm	Sun Oct  9 19:51:44 2005
+@@ -112,7 +112,7 @@
+    $hour = sprintf "%02.0d", $hour;
+ 
+    # print the entry to our log file.
+-   print LOG "[$hour:$min:$sec] $message\n";
++   print LOG "[$hour:$min:$sec] $message\n" if fileno LOG;
+ 
+    # and save the message in our response log
+    # if the message is also being sent to the gui.
+@@ -127,7 +127,7 @@
+       $os = "MacOS"   if $^O =~ /Mac/;
+       $os = "Windows" if $^O =~ /Win/;
+       $os = "Linux" unless defined $os;
+-      my $packname = "AmphetaDesk::OS::";
++      my $packname = "AmphetaDesk::AmphetaDesk::OS::";
+       my $funcname = "::gui_note";
+       &{ $packname. $os . $funcname }($message) if $gui;
+    }
+@@ -151,7 +151,7 @@
+       $os = "MacOS"   if $^O =~ /Mac/;
+       $os = "Windows" if $^O =~ /Win/;
+       $os = "Linux" unless defined $os;
+-      my $packname = "AmphetaDesk::OS::";
++      my $packname = "AmphetaDesk::AmphetaDesk::OS::";
+       my $funcname = "::gui_note";
+       &{ $packname. $os . $funcname }($message);
+    }
diff --git a/www/amphetadesk/files/patch-lib::AmphetaDesk::WWW.pm b/www/amphetadesk/files/patch-lib::AmphetaDesk::WWW.pm
new file mode 100644
index 000000000000..c6c78d128b9f
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::AmphetaDesk::WWW.pm
@@ -0,0 +1,22 @@
+--- lib/AmphetaDesk/WWW.pm.orig	Tue Oct 29 03:30:40 2002
++++ lib/AmphetaDesk/WWW.pm	Mon Oct 10 14:16:59 2005
+@@ -103,7 +103,9 @@
+       $req->proxy_authorization_basic($un, $pw); }
+ 
+    # set our referer and grab our URL.
++   if (get_setting("user_http_referer")) {
+    $req->referer( get_setting("user_http_referer") );
++   }
+    my $res = $ua->request($req);
+ 
+    # did things go happily or sadly?
+@@ -171,7 +173,9 @@
+       $req->proxy_authorization_basic($un, $pw); }
+ 
+    # set our referer and grab our URL.
++   if (get_setting("user_http_referer")) {
+    $req->referer( get_setting("user_http_referer") );
++   }
+    my $res = $ua->request($req);
+ 
+    # did things go happily or sadly?
diff --git a/www/amphetadesk/files/patch-lib::XML::Simple.pm b/www/amphetadesk/files/patch-lib::XML::Simple.pm
new file mode 100644
index 000000000000..16b92d8f0192
--- /dev/null
+++ b/www/amphetadesk/files/patch-lib::XML::Simple.pm
@@ -0,0 +1,36 @@
+--- lib/XML/Simple.pm.orig	Sun Oct  9 20:08:35 2005
++++ lib/XML/Simple.pm	Sun Oct  9 20:22:07 2005
+@@ -880,7 +880,7 @@
+     $encoded->{$ref} = $ref;
+   }
+   else {
+-    if($named) {
++    if(($named) && ($ref) && ($self) && ($self->escape_value($ref))) {
+       return(join('',
+               $indent, '<', $name, '>',
+ 	      ($self->{opt}->{noescape} ? $ref : $self->escape_value($ref)),
+@@ -888,7 +888,11 @@
+ 	    ));
+     }
+     else {
++      if ($ref) {
+       return("$ref$nl");
++      } else {
++        return("$nl");
++      }
+     }
+   }
+ 
+@@ -1013,10 +1017,12 @@
+ 
+   my($data) = @_;
+ 
++  if (defined($data)) {
+   $data =~ s/&/&amp;/sg;
+   $data =~ s/</&lt;/sg;
+   $data =~ s/>/&gt;/sg;
+   $data =~ s/"/&quot;/sg;
++  }
+ 
+   return($data);
+ }
diff --git a/www/amphetadesk/files/wrapper.sh b/www/amphetadesk/files/wrapper.sh
new file mode 100644
index 000000000000..e3533cafcef1
--- /dev/null
+++ b/www/amphetadesk/files/wrapper.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Under a BSDL license. Copyright 2005. Mario S F Ferreira <lioux@FreeBSD.org>
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME="${HOME}/.amphetadesk"
+PERL="%%PERL%%"
+DATADIR="%%DATADIR%%"
+
+PROGRAM_PIDFILE="${PIDFILE:-${DIRNAME}/${PROGRAM##*/}.pid}"
+
+if [ `id -un` = root ]; then
+  echo "PROBLEM. Running AmphetaDesk as root is not recommended."
+  exit 1
+fi
+
+if [ -z "${HOME}" -o ! -d "${HOME}" ]
+then
+  echo "PROBLEM. User does not have a valid home directory [${HOME}]"
+  exit 1
+fi
+
+if [ ! -d "${DIRNAME}/data/lists" ]
+then
+  mkdir -p "${DIRNAME}/data/lists"
+fi
+
+if [ ! -d "${DIRNAME}/data/lists" ]
+then
+  echo "PROBLEM. Cannot create directory ${DIRNAME}."
+  echo "Make sure you have the proper permissions to create it and try again."
+  exit 1
+else
+  ln -sf "${PREFIX}/${PROGRAM##*/}-real" "${DIRNAME}/${PROGRAM##*/}"
+fi
+
+#if [ -d "${DATADIR}/lists" ]; then
+#  cp -n "${DATADIR}/lists/"* "${DIRNAME}/data/lists"
+#fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+  echo "Running under ${DIRNAME}"
+  cd "${DIRNAME}" &&
+  {
+    {
+    env \
+    DIRNAME="${DIRNAME}" \
+    ${PERL} "./${PROGRAM##*/}" "${@}" ; 
+    } &
+  } &&
+  echo $! > "${PROGRAM_PIDFILE}" &&
+  exit 0 ||
+  {
+    echo "PROBLEM starting the application."
+    exit 1
+  }
+}
diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist
index 9460ef03f9b8..4ecbcbe46dce 100644
--- a/www/amphetadesk/pkg-plist
+++ b/www/amphetadesk/pkg-plist
@@ -1,86 +1,57 @@
 bin/AmphetaDesk
-share/doc/AmphetaDesk/CHANGELOG
-share/doc/AmphetaDesk/LICENSE
-share/doc/AmphetaDesk/README.txt
-share/doc/AmphetaDesk/TODO
-share/doc/AmphetaDesk/build.html
-share/doc/AmphetaDesk/files_and_dirs.html
-share/doc/AmphetaDesk/finding_more.html
-share/doc/AmphetaDesk/give_thanks.html
-share/doc/AmphetaDesk/history.html
-share/doc/AmphetaDesk/index.html
-share/doc/AmphetaDesk/kudos.html
-share/doc/AmphetaDesk/naming.html
-share/doc/AmphetaDesk/news.html
-share/doc/AmphetaDesk/news.xml
-share/doc/AmphetaDesk/screenshots.html
-share/doc/AmphetaDesk/skinning.html
-share/doc/AmphetaDesk/version.txt
-share/doc/AmphetaDesk/website_integration.html
-share/doc/AmphetaDesk/whats_new.html
-share/doc/AmphetaDesk/xml_my_services.html
-share/doc/AmphetaDesk/xml_my_settings.html
-share/doc/AmphetaDesk/xml_services_lists.html
-share/doc/AmphetaDesk/images/bkgrnd.gif
-share/doc/AmphetaDesk/images/fyuze.gif
-share/doc/AmphetaDesk/images/globe.gif
-share/doc/AmphetaDesk/images/livejournal.jpg
-share/doc/AmphetaDesk/images/logo-88x31.gif
-share/doc/AmphetaDesk/images/logo.gif
-share/doc/AmphetaDesk/images/mailarchive.gif
-share/doc/AmphetaDesk/images/meerkat.jpg
-share/doc/AmphetaDesk/images/moreover.gif
-share/doc/AmphetaDesk/images/network54.gif
-share/doc/AmphetaDesk/images/newsisfree.gif
-share/doc/AmphetaDesk/images/nwfusion.gif
-share/doc/AmphetaDesk/images/quicktopic.gif
-share/doc/AmphetaDesk/images/racingnews.jpg
-share/doc/AmphetaDesk/images/sherch.jpg
-share/doc/AmphetaDesk/images/snewp.jpg
-share/doc/AmphetaDesk/images/syndic8.gif
-share/doc/AmphetaDesk/images/xml.gif
-share/doc/AmphetaDesk/images/xml_pill.gif
-share/doc/AmphetaDesk/images/xml_radio.gif
-share/doc/AmphetaDesk/images/yahoogroups.gif
-%%SITE_PERL%%/AmphetaDesk.pm
-%%SITE_PERL%%/AmphetaDesk/AmphetaDesk.pl
-%%SITE_PERL%%/AmphetaDesk/README.txt
-%%SITE_PERL%%/AmphetaDesk/OS/Linux.pm
-%%SITE_PERL%%/AmphetaDesk/Channels.pm
-%%SITE_PERL%%/AmphetaDesk/ChannelsList.pm
-%%SITE_PERL%%/AmphetaDesk/MyChannels.pm
-%%SITE_PERL%%/AmphetaDesk/Settings.pm
-%%SITE_PERL%%/AmphetaDesk/Templates.pm
-%%SITE_PERL%%/AmphetaDesk/Utilities.pm
-%%SITE_PERL%%/AmphetaDesk/Versioning.pm
-%%SITE_PERL%%/AmphetaDesk/WWW.pm
-%%SITE_PERL%%/AmphetaDesk/WebServer.pm
-%%SITE_PERL%%/AmphetaDesk/data/README.txt
-%%SITE_PERL%%/AmphetaDesk/data/lists/services-channels-recent.xml
-%%SITE_PERL%%/AmphetaDesk/templates/README.txt
-%%SITE_PERL%%/AmphetaDesk/templates/default/add_a_channel.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/index.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/my_channels.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/my_settings.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/popup.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/tpl_footer.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/tpl_header.html
-%%SITE_PERL%%/AmphetaDesk/templates/default/gui/linux_icon.png
-%%SITE_PERL%%/AmphetaDesk/templates/default/gui/linux_logo.png
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/bkgrnd.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/delete.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/email.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/globe.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/logo.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/xml.gif
-%%SITE_PERL%%/AmphetaDesk/templates/default/images/xml_radio.gif
-@dirrm share/doc/AmphetaDesk/images
-@dirrm share/doc/AmphetaDesk
-@dirrm %%SITE_PERL%%/AmphetaDesk/OS
-@dirrm %%SITE_PERL%%/AmphetaDesk/templates/default/images
-@dirrm %%SITE_PERL%%/AmphetaDesk/templates/default/gui
-@dirrm %%SITE_PERL%%/AmphetaDesk/templates/default
-@dirrm %%SITE_PERL%%/AmphetaDesk/templates
-@dirrm %%SITE_PERL%%/AmphetaDesk/data/lists
-@dirrm %%SITE_PERL%%/AmphetaDesk/data
+bin/AmphetaDesk-real
+etc/rc.d/amphetadesk.sh
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/Channels.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/ChannelsList.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/MyChannels.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS/Linux.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS/MacOS.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS/MacOSX.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS/Windows.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/Settings.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/Templates.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/Utilities.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/Versioning.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/WWW.pm
+%%SITE_PERL%%/AmphetaDesk/AmphetaDesk/WebServer.pm
+%%SITE_PERL%%/AmphetaDesk/Text/Template.pm
+%%SITE_PERL%%/AmphetaDesk/Text/Template/Preprocess.pm
+%%SITE_PERL%%/AmphetaDesk/XML/Simple.pm
+%%DATADIR%%/lists/services-channels-recent.xml
+%%DATADIR%%/templates/default/add_a_channel.html
+%%DATADIR%%/templates/default/gui/linux_icon.png
+%%DATADIR%%/templates/default/gui/linux_logo.png
+%%DATADIR%%/templates/default/gui/macos_icon.pict
+%%DATADIR%%/templates/default/gui/macos_logo.pict
+%%DATADIR%%/templates/default/gui/macosx_icon.png
+%%DATADIR%%/templates/default/gui/macosx_logo.png
+%%DATADIR%%/templates/default/gui/win_icon.ico
+%%DATADIR%%/templates/default/images/bkgrnd.gif
+%%DATADIR%%/templates/default/images/delete.gif
+%%DATADIR%%/templates/default/images/email.gif
+%%DATADIR%%/templates/default/images/globe.gif
+%%DATADIR%%/templates/default/images/logo.gif
+%%DATADIR%%/templates/default/images/xml.gif
+%%DATADIR%%/templates/default/images/xml_radio.gif
+%%DATADIR%%/templates/default/index.html
+%%DATADIR%%/templates/default/my_channels.html
+%%DATADIR%%/templates/default/my_settings.html
+%%DATADIR%%/templates/default/popup.html
+%%DATADIR%%/templates/default/tpl_footer.html
+%%DATADIR%%/templates/default/tpl_header.html
+@dirrm %%DATADIR%%/templates/default/images
+@dirrm %%DATADIR%%/templates/default/gui
+@dirrm %%DATADIR%%/templates/default
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/lists
+@dirrm %%DATADIR%%
+@dirrm %%SITE_PERL%%/AmphetaDesk/XML
+@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template
+@dirrm %%SITE_PERL%%/AmphetaDesk/Text
+@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS
+@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk
 @dirrm %%SITE_PERL%%/AmphetaDesk
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
+@unexec rmdir %D/lib/perl5 2>/dev/null || true