6 files changed, 77 insertions, 129 deletions

diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 54884a2cac41..8a7b4ddb41a5 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -3,24 +3,20 @@
 # Whom:			Stephen Hurd <shurd@sasktel.net>
 #
 # $FreeBSD$
+# $Carpetsmoker: ports/misc/freeguide/Makefile,v 1.1 2007/10/12 12:28:45 carpetsmoker Exp $
 #
 
 PORTNAME=	freeguide
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.10.5
 CATEGORIES=	misc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freeguide-tv
-DISTNAME=	FreeGuide-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	An interactive TV guide which will create personalized TV listings
 
 RUN_DEPENDS=	tv_cat:${PORTSDIR}/textproc/p5-xmltv
 
-DEPRECATED=	Old version, no maintainer
-EXPIRATION_DATE=	2007-11-25
-
 USE_JAVA=	yes
 USE_JIKES=	no
 JAVA_VERSION=	1.4+
@@ -35,12 +31,18 @@ MAKE_ARGS=	-Dinstall_share_dir=${PREFIX}/share \
 		-Dinstall_bin_dir=${PREFIX}/bin \
 		-Dinstall_doc_dir=${DOCSDIR} \
 		-Dinstall_java_share_dir=${JAVASHAREDIR} \
-		-Dinstall_jar_dir=${JAVAJARDIR}
-ALL_TARGET=	FreeGuide-Linux-NoXMLTV
-INSTALL_TARGET=	install-Linux-NoXMLTV-files
+		-Dinstall_jar_dir=${JAVAJARDIR}/freeguide
+INSTALL_TARGET=	install-linux
+
+post-patch:
+	@${REINPLACE_CMD} 's|__ANT_INSTALL_DIRECTORY__|${JAVAJARDIR}/freeguide|; \
+		s|=java|=${JAVA}|;' \
+		${WRKSRC}/install/linux/freeguide
+	@${REINPLACE_CMD} 's|install_share_dir}/man|install_man1_dir}/man|g' \
+		${WRKSRC}/ant/install-linux.xml
 
 do-install:
-		@(cd ${BUILD_WRKSRC}; \
-			${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${BUILD_WRKSRC}; \
+		${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 .include <bsd.port.mk>
diff --git a/misc/freeguide/distinfo b/misc/freeguide/distinfo
index a62cb199e01b..42a0fb3aaa19 100644
--- a/misc/freeguide/distinfo
+++ b/misc/freeguide/distinfo
@@ -1,3 +1,3 @@
-MD5 (FreeGuide-0.8.6.tar.gz) = 447a958355e30a0c964fb78348b99769
-SHA256 (FreeGuide-0.8.6.tar.gz) = 75fbff8d08429348403e388ed4af96de08fd8b1f6a774c7d34a59baa1630b342
-SIZE (FreeGuide-0.8.6.tar.gz) = 7574967
+MD5 (freeguide-0.10.5.tar.gz) = b0cf52b77bc628379aaf328e61321a3b
+SHA256 (freeguide-0.10.5.tar.gz) = 04b126a2033ce6248e89e097c9e2cf951b5a1927103c2f2bbfdeaf3e2276d5fb
+SIZE (freeguide-0.10.5.tar.gz) = 11011614
diff --git a/misc/freeguide/files/patch-ViewerFrame.java b/misc/freeguide/files/patch-ViewerFrame.java
deleted file mode 100644
index 12862ecb2b6f..000000000000
--- a/misc/freeguide/files/patch-ViewerFrame.java
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- src/program/gui/viewer/ViewerFrame.java	Thu Oct 27 00:18:55 2005
-+++ src/program/gui/viewer/ViewerFrame.java	Thu Oct 27 00:34:18 2005
-@@ -1502,7 +1502,7 @@
-         String[] cmds = Utils.substitute(
-             FreeGuide.prefs.commandline.getStrings( "browser_command" ),
-             "%filename%",
--            programme.getLink().toString().replace("%","%%") );
-+            programme.getLink().toString().replaceAll("%","%%") );
-             
-         Utils.execNoWait(cmds);
- 
diff --git a/misc/freeguide/files/patch-build.xml b/misc/freeguide/files/patch-build.xml
deleted file mode 100644
index 077e5a85ca2b..000000000000
--- a/misc/freeguide/files/patch-build.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-$FreeBSD$
-
---- build.xml	Thu Oct 27 18:40:07 2005
-+++ build.xml	Fri Oct 28 16:43:14 2005
-@@ -29,8 +29,7 @@
- 	</target>
-     
-     <target name="install-Linux-NoXMLTV-files"
--            description="install all the files for linux"
--            depends="FreeGuide-Linux-NoXMLTV" >
-+            description="install all the files for linux">
-         
-         <!-- These properties are passed in from the rpm .spec file:
-             install_share_dir = ~/.rpm/tmp/FreeGuide-0.8.2-root//usr/share
-@@ -39,10 +38,7 @@
-             install_real_doc_dir = /usr/doc/freeguide
-         -->
-         
--        <property name="install_jar_dir"
--            location="${install_share_dir}/freeguide" />
--
--        <property name="install_pixmap_dir" location="${install_share_dir}/pixmaps/freeguide" />
-+        <property name="install_pixmap_dir" location="${install_java_share_dir}/pixmaps/freeguide" />
-         
-         <mkdir dir="${install_jar_dir}" />
-         <copy file="${dist}/${freeguideversion}-Linux-NoXMLTV.jar"
-@@ -58,11 +54,13 @@
-             </fileset>
-         </copy>
-         
--        <copy tofile="${install_share_dir}/pixmaps/freeguide.png" file="${src}/images/logo-32x32.png" />
-+        <copy tofile="${install_java_share_dir}/pixmaps/freeguide.png" file="${src}/images/logo-32x32.png" />
-         
-         <!-- Creating the launch script: first we need to copy the source launch script, then we replace the string "__ANT_DOC_DIRECTORY__" with the docs directory, and then we move it into place and make it executable. -->
-         <copy file="${src}/install/linux/freeguide" tofile="${src}/install/linux/freeguide.tmp" />
-         <replace file="${src}/install/linux/freeguide.tmp" token="__ANT_DOC_DIRECTORY__" value="${install_real_doc_dir}" />
-+        <replace file="${src}/install/linux/freeguide.tmp" token="__ANT_JAR_PATH__" value="${install_jar_dir}/FreeGuide.jar" />
-+        <replace file="${src}/install/linux/freeguide.tmp" token="__ANT_JAVA_BIN__" value="${install_java_bin}" />
-         <mkdir dir="${install_bin_dir}" />
-         <move file="${src}/install/linux/freeguide.tmp" tofile="${install_bin_dir}/freeguide" />
-         <chmod file="${install_bin_dir}/freeguide" perm="a+x" />
-@@ -70,8 +68,8 @@
-         <mkdir dir="${install_share_dir}/applications" />
-         <copy file="${src}/install/linux/freeguide.desktop" todir="${install_share_dir}/applications/" />
- 
--        <mkdir dir="${install_share_dir}/man/man1" />
--        <copy file="${build}/freeguide.1.gz" todir="${install_share_dir}/man/man1/" />
-+        <mkdir dir="${install_man1_dir}/man/man1" />
-+        <copy file="${build}/freeguide.1.gz" todir="${install_man1_dir}/man/man1/" />
-         
-         <mkdir dir="${install_doc_dir}" />
-         <copy todir="${install_doc_dir}/">
-@@ -79,7 +77,6 @@
-                 <include name="*.html" />
-                 <include name="*.png" />
-                 <include name="*.css" />
--                <include name="COPYING" />
-                 <include name="TODO" />
-                 <exclude name="bugreport.html" />
-             </fileset>
diff --git a/misc/freeguide/files/patch-freeguide b/misc/freeguide/files/patch-freeguide
deleted file mode 100644
index 913f85cce3d1..000000000000
--- a/misc/freeguide/files/patch-freeguide
+++ /dev/null
@@ -1,18 +0,0 @@
-$FreeBSD$
-
---- src/install/linux/freeguide	Thu Oct 27 00:18:55 2005
-+++ src/install/linux/freeguide	Thu Oct 27 01:10:30 2005
-@@ -1,11 +1,11 @@
- #!/bin/sh
--FREEGUIDE_JAR=/usr/share/freeguide/FreeGuide.jar
-+FREEGUIDE_JAR=__ANT_JAR_PATH__
- # Load default settings from config file (if it exists)
- if [ -f "$HOME/.freeguiderc" ]; then
- 	. "$HOME/.freeguiderc"
- fi
- if [ -z "$JAVACMD" ]; then
--	JAVACMD=java
-+	JAVACMD=__ANT_JAVA_BIN__
- fi
- $JAVACMD $FREEGUIDE_OPTS -jar $FREEGUIDE_JAR \
-     --doc_directory "__ANT_DOC_DIRECTORY__" "$@"
diff --git a/misc/freeguide/pkg-plist b/misc/freeguide/pkg-plist
index c9a2cba80164..186146fb3504 100644
--- a/misc/freeguide/pkg-plist
+++ b/misc/freeguide/pkg-plist
@@ -1,31 +1,68 @@
-@comment $FreeBSD$
 bin/freeguide
-share/applications/freeguide.desktop
+%%DOCSDIR%%/developers.html
+%%DOCSDIR%%/sflogo.png
+%%DOCSDIR%%/userguide.html
+%%DOCSDIR%%/ls-docs
+%%DOCSDIR%%/userguide.choosing_channels.html
+%%DOCSDIR%%/userguide.features.html
+%%DOCSDIR%%/timezone.html
+%%DOCSDIR%%/contributors.html
+%%DOCSDIR%%/README.html
+%%DOCSDIR%%/downinst.html
 %%DOCSDIR%%/FAQ.html
-%%DOCSDIR%%/FreeGuide-0_7-Linux-MetalLookAndFeel.png
+%%DOCSDIR%%/developers-translating.html
+%%DOCSDIR%%/downinst.macos.html
+%%DOCSDIR%%/contact.html
 %%DOCSDIR%%/INSTALL-linux-noxmltv.html
-%%DOCSDIR%%/LookAndFeel.html
-%%DOCSDIR%%/README.html
+%%DOCSDIR%%/userguide.look_and_feel.html
+%%DOCSDIR%%/developers-cvs.html
 %%DOCSDIR%%/TODO
-%%DOCSDIR%%/contributors.html
+%%DOCSDIR%%/FreeGuide-0_7-Linux-MetalLookAndFeel.png
+%%DOCSDIR%%/downinst.linux.html
+%%DOCSDIR%%/userguide.mainscreen.html
+%%DOCSDIR%%/license.html
+%%DOCSDIR%%/toc.html
+%%DOCSDIR%%/stylesheet.css
 %%DOCSDIR%%/design.html
+%%DOCSDIR%%/LookAndFeel.html
+%%DOCSDIR%%/help.html
 %%DOCSDIR%%/developers-compiling.html
-%%DOCSDIR%%/developers-cvs.html
-%%DOCSDIR%%/developers-translating.html
-%%DOCSDIR%%/developers.html
 %%DOCSDIR%%/index.html
-%%DOCSDIR%%/stylesheet.css
-%%DOCSDIR%%/timezone.html
-%%DOCSDIR%%/userguide.html
-%%JAVAJARDIR%%/FreeGuide.jar
-%%JAVASHAREDIR%%/pixmaps/freeguide.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-16x16.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-32x32.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-48x48.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-64x64.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-72x72.png
-%%JAVASHAREDIR%%/pixmaps/freeguide/logo-96x96.png
-@dirrm %%JAVASHAREDIR%%/pixmaps/freeguide
-@dirrmtry %%JAVASHAREDIR%%/pixmaps
-@dirrm %%DOCSDIR%%
+%%DOCSDIR%%/COPYING
+%%JAVAJARDIR%%/freeguide/lib/importexport-palmatv.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-vsetv.jar
+%%JAVAJARDIR%%/freeguide/lib/reminder-alarm.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-newsvm.jar
+%%JAVAJARDIR%%/freeguide/lib/common.jar
+%%JAVAJARDIR%%/freeguide/lib/docs.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-kulichki.jar
+%%JAVAJARDIR%%/freeguide/lib/xmltv-win.jar
+%%JAVAJARDIR%%/freeguide/lib/ui-vertical.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-ntvplus.jar
+%%JAVAJARDIR%%/freeguide/lib/ui-horizontal.jar
+%%JAVAJARDIR%%/freeguide/lib/importexport-xmltv.jar
+%%JAVAJARDIR%%/freeguide/lib/importexport-html.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-xmltv.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-cosmostv.jar
+%%JAVAJARDIR%%/freeguide/lib/importexport-jtv.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-hallmark.jar
+%%JAVAJARDIR%%/freeguide/lib/tagsoup-1.0.1.jar
+%%JAVAJARDIR%%/freeguide/lib/program-freeguide.jar
+%%JAVAJARDIR%%/freeguide/lib/grabber-rbc.jar
+%%JAVAJARDIR%%/freeguide/lib/importexport-mobile.jar
+%%JAVAJARDIR%%/freeguide/lib/retroweaver-rt-1.2.5.jar
+%%JAVAJARDIR%%/freeguide/lib/storage-serfiles.jar
+%%JAVAJARDIR%%/freeguide/startup.jar
+share/pixmaps/freeguide/logo-96x96.png
+share/pixmaps/freeguide/logo-16x16.png
+share/pixmaps/freeguide/logo-72x72.png
+share/pixmaps/freeguide/logo-64x64.png
+share/pixmaps/freeguide/logo-48x48.png
+share/pixmaps/freeguide/logo-32x32.png
+share/pixmaps/freeguide.png
+share/applications/freeguide.desktop
 @dirrmtry share/applications
+@dirrm share/pixmaps/freeguide
+@dirrm %%JAVAJARDIR%%/freeguide/lib
+@dirrm %%JAVAJARDIR%%/freeguide/
+@dirrm %%DOCSDIR%%