Sync w/ FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7073 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 14 insertions, 53 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index d07e792e1..bfcad1348 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.0.19
+PORTVERSION=	1.0.21
 PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -68,15 +68,10 @@ LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
 
 post-patch:
 .ifdef WITH_MOZILLA
-	${REINPLACE_CMD} -e 's,/usr/lib/mozilla,${LOCALBASE}/lib/${GECKO},g ; \
-		s,%FREEBSD_MOZILLA_HOME%,${LOCALBASE}/lib/${GECKO},' \
-		${WRKSRC}/src/liferea.in
 	${REINPLACE_CMD} -e 's,firefox-,$$gecko_provider-,g' \
 		-e 's,\(gecko_provider=\).*$$,\1${GECKO},' \
 		-e 's,{print $$1},{print $$2},g' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|gtk_moz_embed_set_comp_path(NULL)|gtk_moz_embed_set_comp_path("${LOCALBASE}/lib/${GECKO}")|' \
-		${WRKSRC}/src/mozilla/mozilla.c
 .endif
 .ifdef WITH_XPI
 	@${MKDIR} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 9ab1b62d2..7868314ae 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.0.19.tar.gz) = ca51d163b2ec831e91567b5a2c52effe
-SHA256 (liferea-1.0.19.tar.gz) = 89e9485736d8146c53c62e90c4e30e330cbd73a7d4ce1e8287eb39fb6baa0b4a
-SIZE (liferea-1.0.19.tar.gz) = 1578161
+MD5 (liferea-1.0.21.tar.gz) = 4230b2267d7a69e902ecdca9fbd0a498
+SHA256 (liferea-1.0.21.tar.gz) = 785be806f3270754be7bb854321e0decfb8c85997f6d9456a6ba25cd19a84371
+SIZE (liferea-1.0.21.tar.gz) = 1578056
diff --git a/net/liferea/files/patch-src-liferea.in b/net/liferea/files/patch-src-liferea.in
deleted file mode 100644
index 79bda00fe..000000000
--- a/net/liferea/files/patch-src-liferea.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/liferea.in.orig	Sun Mar 19 03:50:55 2006
-+++ src/liferea.in	Tue Mar 21 09:56:50 2006
-@@ -22,15 +22,17 @@
- 
- look_for_mozilla() {
- 
--	results=`ls -1d $1 2>/dev/null | sort -n`
--	while [ -n "$results" ]
--	do
--		path=`echo "$results" | tail -n 1`
--		results=`echo "$results" | grep -v $path`
--		path=`dirname $path` 	# strip comm.jar
--		path=`dirname $path`	# strip chrome
--		run_with_mozilla $path
--		
-+	for p in $1; do
-+		results=`ls -1d $p 2>/dev/null | sort -n`
-+		while [ -n "$results" ]
-+		do
-+			path=`echo "$results" | tail -n 1`
-+			results=`echo "$results" | grep -v $path`
-+			path=`dirname $path` 	# strip comm.jar
-+			path=`dirname $path`	# strip chrome
-+			run_with_mozilla $path
-+			
-+		done
- 	done
- }
- 
-@@ -39,6 +41,7 @@
- fi
- 
- @MOZILLA_LIB_DIR_SEARCH@
-+look_for_mozilla "%FREEBSD_MOZILLA_HOME%/chrome/comm.jar"
- look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar"
- look_for_mozilla "/usr/lib64/mozilla*/chrome/comm.jar"
- look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar"
diff --git a/net/penguintv-devel/distinfo b/net/penguintv-devel/distinfo
deleted file mode 100644
index f94e22abf..000000000
--- a/net/penguintv-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (PenguinTV-1.93.tar.gz) = 9b914decfc9f279327e0eff1f0bd94d1
-SHA256 (PenguinTV-1.93.tar.gz) = 8ad9cbeed49f72252ddfc4a614071304e0ce5b9f10b64d1af588d319101df1b8
-SIZE (PenguinTV-1.93.tar.gz) = 314661
diff --git a/net/penguintv-devel/Makefile b/net/penguintv/Makefile
index acde74b6e..b20053586 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	PenguinTV
-PORTVERSION=	1.93
+PORTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	edwin@mavetju.org
-COMMENT=	Graphical RSS feed reader with incorperated playback functions - development version
+COMMENT=	Graphical RSS feed reader with incorperated playback functions
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite21 \
 		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
@@ -31,7 +30,7 @@ USE_PYTHON=	yes
 
 GCONF_SCHEMAS=	penguintv.schema
 
-CONFLICTS=	PenguinTV-1.*
+CONFLICTS=	PenguinTV-devel-[0-9]*
 
 .include <bsd.port.pre.mk>
 
@@ -44,6 +43,10 @@ EXTRA_PATCHES+=	${FILESDIR}/patchmozilla-setup.py
 PLIST_SUB+=	WITH_MOZILLA="@comment "
 .endif
 
+pre-fetch:
+	@${ECHO_MSG} If you are upgrading from 1.x, please export your subscriptions for save-keeping!
+	@sleep 5
+
 do-build:
 	cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
 
diff --git a/net/penguintv/distinfo b/net/penguintv/distinfo
new file mode 100644
index 000000000..e7a748737
--- /dev/null
+++ b/net/penguintv/distinfo
@@ -0,0 +1,3 @@
+MD5 (PenguinTV-2.0.1.tar.gz) = 24cd9037b10e00293f1da89bb905a0a8
+SHA256 (PenguinTV-2.0.1.tar.gz) = 01d4c4827a70419aaea4df6e921132672a35d2b586ce9a6a914574097b065cea
+SIZE (PenguinTV-2.0.1.tar.gz) = 320611
diff --git a/net/penguintv-devel/files/patch-share__defaultsubs.opml b/net/penguintv/files/patch-share__defaultsubs.opml
index 77ab8c655..77ab8c655 100644
--- a/net/penguintv-devel/files/patch-share__defaultsubs.opml
+++ b/net/penguintv/files/patch-share__defaultsubs.opml
diff --git a/net/penguintv-devel/files/patchmozilla-setup.py b/net/penguintv/files/patchmozilla-setup.py
index c1fd8554b..c1fd8554b 100644
--- a/net/penguintv-devel/files/patchmozilla-setup.py
+++ b/net/penguintv/files/patchmozilla-setup.py
diff --git a/net/penguintv-devel/pkg-descr b/net/penguintv/pkg-descr
index a3dbcda7f..a3dbcda7f 100644
--- a/net/penguintv-devel/pkg-descr
+++ b/net/penguintv/pkg-descr
diff --git a/net/penguintv-devel/pkg-message b/net/penguintv/pkg-message
index e7b6353c7..e7b6353c7 100644
--- a/net/penguintv-devel/pkg-message
+++ b/net/penguintv/pkg-message
diff --git a/net/penguintv-devel/pkg-plist b/net/penguintv/pkg-plist
index b90c1edc9..b90c1edc9 100644
--- a/net/penguintv-devel/pkg-plist
+++ b/net/penguintv/pkg-plist