- Update to 1.11

PR:		ports/148970
Submitted by:	Armin Pirkovitsch <armin@frozen-zone.org>

4 files changed, 169 insertions, 62 deletions

diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index fcf697839b74..979d37de836e 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -3,12 +3,10 @@
 # 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.10.6
-PORTREVISION=	2
+PORTVERSION=	0.11
 CATEGORIES=	misc java
 MASTER_SITES=	SF/${PORTNAME}-tv/${PORTNAME}-source/${PORTVERSION}
 
@@ -17,6 +15,8 @@ COMMENT=	An interactive TV guide which will create personalized TV listings
 
 RUN_DEPENDS=	tv_cat:${PORTSDIR}/textproc/p5-xmltv
 
+LICENSE=	GPLv2
+
 USE_JAVA=	yes
 USE_JIKES=	no
 JAVA_VERSION=	1.4+
@@ -32,14 +32,12 @@ MAKE_ARGS=	-Dinstall_share_dir=${PREFIX}/share \
 		-Dinstall_doc_dir=${DOCSDIR} \
 		-Dinstall_java_share_dir=${JAVASHAREDIR} \
 		-Dinstall_jar_dir=${JAVAJARDIR}/freeguide
-INSTALL_TARGET=	install-linux
+INSTALL_TARGET=	install
 
 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}; \
diff --git a/misc/freeguide/distinfo b/misc/freeguide/distinfo
index c34810b07186..5f66a1c2b713 100644
--- a/misc/freeguide/distinfo
+++ b/misc/freeguide/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeguide-0.10.6.tar.gz) = 24160bb8c481720644c48dcddad08090
-SHA256 (freeguide-0.10.6.tar.gz) = e0e229013a30ff9113f459334557cd9ff090e0ff27b53e814bbde0ef5d2c6621
-SIZE (freeguide-0.10.6.tar.gz) = 11083862
+MD5 (freeguide-0.11.tar.gz) = 15bba69e5fde5db43690fed5bf35b8ba
+SHA256 (freeguide-0.11.tar.gz) = e9e3b8d2b322d7f2668ba8d0dd68901d1d9cb0d0e06d10cf50f2fc7e3be5284b
+SIZE (freeguide-0.11.tar.gz) = 1764161
diff --git a/misc/freeguide/files/patch-build.xml b/misc/freeguide/files/patch-build.xml
new file mode 100644
index 000000000000..bed03a6e6c9b
--- /dev/null
+++ b/misc/freeguide/files/patch-build.xml
@@ -0,0 +1,13 @@
+--- build.xml.orig	2010-07-24 11:24:51.000000000 +0200
++++ build.xml	2010-07-24 11:29:57.000000000 +0200
+@@ -200,8 +200,8 @@
+         <mkdir dir="${install_share_dir}/applications" />
+         <copy file="${install}/linux/freeguide.desktop" todir="${install_share_dir}/applications/" />
+ 
+-        <mkdir dir="${install_share_dir}/man/man1" />
+-        <gzip src="${install-bin}/linux/freeguide.1" destfile="${install_share_dir}/man/man1/freeguide.1.gz"/>
++        <mkdir dir="${install_man1_dir}/man/man1" />
++        <gzip src="${install-bin}/linux/freeguide.1" destfile="${install_man1_dir}/man/man1/freeguide.1.gz"/>
+ 
+         <mkdir dir="${install_share_dir}/doc/freeguide" />
+         <copy todir="${install_share_dir}/doc/freeguide/">
diff --git a/misc/freeguide/pkg-plist b/misc/freeguide/pkg-plist
index 1ddd82489693..026cff384035 100644
--- a/misc/freeguide/pkg-plist
+++ b/misc/freeguide/pkg-plist
@@ -1,57 +1,140 @@
 bin/freeguide
-%%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%%/developers-translating.html
-%%DOCSDIR%%/downinst.macos.html
-%%DOCSDIR%%/contact.html
-%%DOCSDIR%%/INSTALL-linux-noxmltv.html
-%%DOCSDIR%%/userguide.look_and_feel.html
-%%DOCSDIR%%/developers-cvs.html
-%%DOCSDIR%%/TODO
-%%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%%/DownloadAndInstall/RecentChanges.html
+%%DOCSDIR%%/DownloadAndInstall/LinuxOthers.html
+%%DOCSDIR%%/DownloadAndInstall/LinuxDebian.html
+%%DOCSDIR%%/DownloadAndInstall/LinuxRPM.html
+%%DOCSDIR%%/DownloadAndInstall/LinuxUbuntu.html
+%%DOCSDIR%%/DownloadAndInstall/Windows.html
+%%DOCSDIR%%/DownloadAndInstall/SideBar.html
+%%DOCSDIR%%/DownloadAndInstall/InstallXMLTVFromSource.html
+%%DOCSDIR%%/DownloadAndInstall/MacOSX.html
+%%DOCSDIR%%/DownloadAndInstall/Other.html
+%%DOCSDIR%%/DownloadAndInstall/FreeBSD.html
+%%DOCSDIR%%/DownloadAndInstall/LinuxGentoo.html
+%%DOCSDIR%%/DownloadAndInstall/Linux.html
+%%DOCSDIR%%/DownloadAndInstall/BuildFreeGuideOnMac.html
+%%DOCSDIR%%/DownloadAndInstall/DownloadAndInstall.html
+%%DOCSDIR%%/uploads/FAQ/ChooseChannels.png
+%%DOCSDIR%%/uploads/FAQ/ShowOutput.png
+%%DOCSDIR%%/uploads/FAQ/CopyXMLTVCommand.png
+%%DOCSDIR%%/uploads/FAQ/SettingTZ-2.png
+%%DOCSDIR%%/uploads/FAQ/TurnOffUpgradeCheck.png
+%%DOCSDIR%%/uploads/FAQ/EditShortcut-2.png
+%%DOCSDIR%%/uploads/FAQ/CharacterEncoding.png
+%%DOCSDIR%%/uploads/FAQ/SettingTZ-1.png
+%%DOCSDIR%%/uploads/FAQ/AllChannels.png
+%%DOCSDIR%%/uploads/FAQ/EditShortcut-1.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-3.png
+%%DOCSDIR%%/uploads/UserGuide/channel-set.png
+%%DOCSDIR%%/uploads/UserGuide/main-screen.png
+%%DOCSDIR%%/uploads/UserGuide/listview-filter-time-dialog.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-2.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-Want_to_download_listings.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-7.png
+%%DOCSDIR%%/uploads/UserGuide/listview-filter-time.png
+%%DOCSDIR%%/uploads/UserGuide/print-this.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-1.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-6.png
+%%DOCSDIR%%/uploads/UserGuide/listview-filter-channel.png
+%%DOCSDIR%%/uploads/UserGuide/plus-minus.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-5.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-Main_Screen-small.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-First_Time_Wizard-4.png
+%%DOCSDIR%%/uploads/UserGuide/listview-filter-title.png
+%%DOCSDIR%%/uploads/UserGuide/Screenshot-Downloading.png
+%%DOCSDIR%%/uploads/UserGuide/listview.png
+%%DOCSDIR%%/uploads/UserGuide/channel-sets.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Channel_Sets.png
+%%DOCSDIR%%/uploads/Main/Screenshot-FreeGuide-0.10.7-small.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Vertical_main_screen.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Set_grabber_config_2.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Download.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Set_grabber_config_1.png
+%%DOCSDIR%%/uploads/Main/Screenshot-FreeGuide_Main_Screen.png
+%%DOCSDIR%%/uploads/Main/freeguide-logo-50.png
+%%DOCSDIR%%/uploads/Main/Screenshot-FreeGuide-0.10.7.png
+%%DOCSDIR%%/uploads/Main/Screenshot-Channel_Sets_2.png
+%%DOCSDIR%%/FAQ/RunningOutOfMemory.html
+%%DOCSDIR%%/FAQ/FreezeDuringDownload.html
+%%DOCSDIR%%/FAQ/JavaVersion.html
+%%DOCSDIR%%/FAQ/DateManipError.html
+%%DOCSDIR%%/FAQ/NonXMLTVGrabber.html
+%%DOCSDIR%%/FAQ/ChangeChannelOrder.html
+%%DOCSDIR%%/FAQ/FAQ.html
+%%DOCSDIR%%/FAQ/UninstallLinux.html
+%%DOCSDIR%%/FAQ/ChangeGTKTheme.html
+%%DOCSDIR%%/FAQ/StoppedWorking.html
+%%DOCSDIR%%/FAQ/RunningXMLTVManually.html
+%%DOCSDIR%%/FAQ/XmltvCrash.html
+%%DOCSDIR%%/FAQ/InvalidUTF8.html
+%%DOCSDIR%%/FAQ/DownloadListingsFromCron.html
+%%DOCSDIR%%/FAQ/CantSeeChannels.html
+%%DOCSDIR%%/FAQ/TurnOffUpgradeCheck.html
+%%DOCSDIR%%/FAQ/UninstallWindows.html
+%%DOCSDIR%%/FAQ/MoreThanOneWeeksListings.html
+%%DOCSDIR%%/FAQ/BadEntrySeenInRTChannels.html
+%%DOCSDIR%%/FAQ/ChooseChannelsFails.html
+%%DOCSDIR%%/FAQ/SettingTheTZEnvironmentVariable.html
+%%DOCSDIR%%/FAQ/RecentChanges.html
+%%DOCSDIR%%/FAQ/MissingLookAndFeel.html
+%%DOCSDIR%%/FAQ/MissingListings.html
+%%DOCSDIR%%/FAQ/ExecutionError.html
+%%DOCSDIR%%/FAQ/UpgradeXMLTV.html
+%%DOCSDIR%%/FAQ/DiagnosingProblems.html
+%%DOCSDIR%%/FAQ/ProxyServer.html
+%%DOCSDIR%%/FAQ/ChangeTimeZone.html
+%%DOCSDIR%%/Main/ConfigureProxyOnLinux.html
+%%DOCSDIR%%/Main/HomePage.html
+%%DOCSDIR%%/Main/WikiSandbox.html
+%%DOCSDIR%%/Main/Screenshots.html
+%%DOCSDIR%%/Main/ConfigureProxyOnWindows.html
+%%DOCSDIR%%/Main/GroupAttributes.html
+%%DOCSDIR%%/Main/PmWikiInfo.html
+%%DOCSDIR%%/Main/COPYING.html
+%%DOCSDIR%%/Main/ContactUs.html
+%%DOCSDIR%%/Main/RecentChanges.html
+%%DOCSDIR%%/Main/Credits.html
+%%DOCSDIR%%/Main/GNUGeneralPublicLicense.html
+%%DOCSDIR%%/Main/SiteMap.html
+%%DOCSDIR%%/Main/SignUpForSchedulesDirect.html
+%%DOCSDIR%%/Main/Links.html
+%%DOCSDIR%%/UserGuide/ChoosingChannels.html
+%%DOCSDIR%%/UserGuide/RecentChanges.html
+%%DOCSDIR%%/UserGuide/RunningForTheFirstTime.html
+%%DOCSDIR%%/UserGuide/LookAndFeel.html
+%%DOCSDIR%%/UserGuide/TheMainScreen.html
+%%DOCSDIR%%/UserGuide/ListView.html
+%%DOCSDIR%%/UserGuide/UserGuide.html
+%%DOCSDIR%%/UserGuide/SideBar.html
+%%DOCSDIR%%/UserGuide/Features.html
+%%DOCSDIR%%/Developers/Developers.html
+%%DOCSDIR%%/Developers/CodeRules.html
+%%DOCSDIR%%/Developers/SideBar.html
+%%DOCSDIR%%/Developers/BuildTheLatestSource.html
+%%DOCSDIR%%/Developers/RecentChanges.html
+%%DOCSDIR%%/Developers/Design.html
+%%DOCSDIR%%/Developers/ChangingTheVersion.html
+%%DOCSDIR%%/Developers/HelpUsMakeFreeGuide.html
+%%DOCSDIR%%/Developers/GettingTheCodeWithoutXMLTV.html
+%%DOCSDIR%%/Developers/FutureTODOList.html
+%%DOCSDIR%%/Developers/PastTODOList.html
+%%DOCSDIR%%/Developers/Roles.html
+%%DOCSDIR%%/Developers/CreateInstallationPackagesForDifferentPlatforms.html
+%%DOCSDIR%%/Developers/RunTheNightlyBuild.html
+%%DOCSDIR%%/Developers/TranslateFreeGuide.html
+%%DOCSDIR%%/Developers/TODOList.html
+%%DOCSDIR%%/Developers/SourceLayout.html
+%%DOCSDIR%%/Site/AllRecentChanges.html
+%%DOCSDIR%%/Site/Search.html
+%%DOCSDIR%%/pub/skins/plain-freeguide/favicon.gif
+%%DOCSDIR%%/pub/skins/plain-freeguide/plain2.css
+%%DOCSDIR%%/pub/skins/plain-freeguide/plain1.css
+%%DOCSDIR%%/PmWiki/DocumentationIndex.html
+%%DOCSDIR%%/PmWiki/BasicEditing.html
+%%DOCSDIR%%/PmWiki/InitialSetupTasks.html
+%%DOCSDIR%%/PmWiki/TextFormattingRules.html
 %%DOCSDIR%%/index.html
-%%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/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
+%%JAVAJARDIR%%/freeguide/FreeGuide.jar
 share/pixmaps/freeguide/logo-96x96.png
 share/pixmaps/freeguide/logo-16x16.png
 share/pixmaps/freeguide/logo-72x72.png
@@ -62,6 +145,19 @@ share/pixmaps/freeguide.png
 share/applications/freeguide.desktop
 @dirrmtry share/applications
 @dirrm share/pixmaps/freeguide
-@dirrm %%JAVAJARDIR%%/freeguide/lib
 @dirrm %%JAVAJARDIR%%/freeguide/
+@dirrm %%DOCSDIR%%/DownloadAndInstall
+@dirrm %%DOCSDIR%%/uploads/FAQ
+@dirrm %%DOCSDIR%%/uploads/UserGuide
+@dirrm %%DOCSDIR%%/uploads/Main
+@dirrm %%DOCSDIR%%/uploads
+@dirrm %%DOCSDIR%%/FAQ
+@dirrm %%DOCSDIR%%/Main
+@dirrm %%DOCSDIR%%/UserGuide
+@dirrm %%DOCSDIR%%/Developers
+@dirrm %%DOCSDIR%%/Site
+@dirrm %%DOCSDIR%%/pub/skins/plain-freeguide
+@dirrm %%DOCSDIR%%/pub/skins
+@dirrm %%DOCSDIR%%/pub
+@dirrm %%DOCSDIR%%/PmWiki
 @dirrm %%DOCSDIR%%