ports/117136: [PATCH] misc/freeguide Update to 0.10.5
Martin Tournoij
carpetsmoker at xs4all.nl
Fri Oct 12 12:40:02 UTC 2007
>Number: 117136
>Category: ports
>Synopsis: [PATCH] misc/freeguide Update to 0.10.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 12 12:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Tournoij
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD phong.rwxrwxrwx.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Aug 24 07:26:43 CEST 2007 carpetsmoker at phong.rwxrwxrwx.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Remove DEPRECATED/EXPIRATION_DATE
- Update to 0.10.5
- Take maintainership
>How-To-Repeat:
>Fix:
--- freeguide.diff begins here ---
diff -urN --exclude CVS /ports/misc/freeguide/Makefile freeguide/Makefile
--- /ports/misc/freeguide/Makefile 2007-05-25 12:57:39.000000000 +0200
+++ freeguide/Makefile 2007-10-12 14:28:45.000000000 +0200
@@ -3,24 +3,20 @@
# Whom: Stephen Hurd <shurd at sasktel.net>
#
# $FreeBSD: ports/misc/freeguide/Makefile,v 1.5 2007/05/25 10:57:39 mm Exp $
+# $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 at FreeBSD.org
+MAINTAINER= carpetsmoker at 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 @@
-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 -urN --exclude CVS /ports/misc/freeguide/distinfo freeguide/distinfo
--- /ports/misc/freeguide/distinfo 2006-01-22 13:59:16.000000000 +0100
+++ freeguide/distinfo 2007-10-12 11:21:22.000000000 +0200
@@ -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 -urN --exclude CVS /ports/misc/freeguide/files/patch-ViewerFrame.java freeguide/files/patch-ViewerFrame.java
--- /ports/misc/freeguide/files/patch-ViewerFrame.java 2005-11-01 22:41:24.000000000 +0100
+++ freeguide/files/patch-ViewerFrame.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-$FreeBSD: ports/misc/freeguide/files/patch-ViewerFrame.java,v 1.1 2005/11/01 21:41:24 hq Exp $
-
---- 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 -urN --exclude CVS /ports/misc/freeguide/files/patch-build.xml freeguide/files/patch-build.xml
--- /ports/misc/freeguide/files/patch-build.xml 2005-11-01 22:41:24.000000000 +0100
+++ freeguide/files/patch-build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-$FreeBSD: ports/misc/freeguide/files/patch-build.xml,v 1.1 2005/11/01 21:41:24 hq Exp $
-
---- 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 -urN --exclude CVS /ports/misc/freeguide/files/patch-freeguide freeguide/files/patch-freeguide
--- /ports/misc/freeguide/files/patch-freeguide 2005-11-01 22:41:24.000000000 +0100
+++ freeguide/files/patch-freeguide 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-$FreeBSD: ports/misc/freeguide/files/patch-freeguide,v 1.1 2005/11/01 21:41:24 hq Exp $
-
---- 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 -urN --exclude CVS /ports/misc/freeguide/pkg-plist freeguide/pkg-plist
--- /ports/misc/freeguide/pkg-plist 2006-01-22 03:28:36.000000000 +0100
+++ freeguide/pkg-plist 2007-10-12 12:45:40.000000000 +0200
@@ -1,31 +1,67 @@
- at comment $FreeBSD: ports/misc/freeguide/pkg-plist,v 1.3 2006/01/22 02:28:36 edwin Exp $
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
- at dirrm %%JAVASHAREDIR%%/pixmaps/freeguide
- at dirrmtry %%JAVASHAREDIR%%/pixmaps
+%%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
+ at dirrm share/pixmaps/freeguide
+ at dirrm %%JAVAJARDIR%%/freeguide/lib
+ at dirrm %%JAVAJARDIR%%/freeguide/
@dirrm %%DOCSDIR%%
- at dirrmtry share/applications
--- freeguide.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list