5 files changed, 34 insertions, 17 deletions

diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index fd8d1b422432..36c45a88c34d 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -1,36 +1,33 @@
 # New ports collection makefile for:	uf-view
-# Date created:        			30 May 2001
+# Date created:				30 May 2001
 # Whom:				Jonathan McGee <mcgee@wam.umd.edu>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	uf-view
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 
 MAINTAINER=	mcgee@wam.umd.edu
 COMMENT=	A gTK+ viewer for the User Friendly and several other popular comics
 
-LIB_DEPENDS=    gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
+LIB_DEPENDS=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
 		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=      gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+USE_REINPLACE=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/misc/uf-view/distinfo b/misc/uf-view/distinfo
index 77b91bc19308..86018f006cf6 100644
--- a/misc/uf-view/distinfo
+++ b/misc/uf-view/distinfo
@@ -1 +1 @@
-MD5 (uf-view-2.0.tar.gz) = 036d8fcb878b1c36c484799705b160ba
+MD5 (uf-view-2.2.tar.gz) = 8a2f903693b8ac8cb955f6dd486c9ba2
diff --git a/misc/uf-view/files/patch-po b/misc/uf-view/files/patch-po
new file mode 100644
index 000000000000..06588ec09378
--- /dev/null
+++ b/misc/uf-view/files/patch-po
@@ -0,0 +1,13 @@
+--- po/Makefile.in.in.orig	Sun Apr 20 10:14:53 2003
++++ po/Makefile.in.in	Sun Apr 20 10:15:14 2003
+@@ -27,8 +27,8 @@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
+-gnulocaledir = $(datadir)/locale
++localedir = $(prefix)/share/locale
++gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
+ 
diff --git a/misc/uf-view/pkg-descr b/misc/uf-view/pkg-descr
index 343019a87f4c..cdaaab2ed379 100644
--- a/misc/uf-view/pkg-descr
+++ b/misc/uf-view/pkg-descr
@@ -1,6 +1,8 @@
-uf-view is a Gnome viewer for the UserFriendly comic.
-It also supports MegaTokyo, Penny Arcade, Calvin and Hobbes and
-Dilbert.  This port also includes a patch by Drew Ogle to view
-the comic goats.
+UF-View is a calendar-based comic viewer. It was first hacked to view the
+"User Friendly" comic, and was extended to allow other reccuring comics to be
+viewed as well.
 
-WWW: http://hadess.net/uf-view.shtml
+It also supports Angst Technology, Calvin and Hobbes, Little Gamers,
+Penny Arcade, and PvP.
+
+WWW: http://www.hadess.net/misc-code.php3
diff --git a/misc/uf-view/pkg-plist b/misc/uf-view/pkg-plist
index 9f1292eae56d..a781d9da78df 100644
--- a/misc/uf-view/pkg-plist
+++ b/misc/uf-view/pkg-plist
@@ -6,10 +6,15 @@ share/gnome/uf-view/at.desktop
 share/gnome/uf-view/ch.desktop
 share/gnome/uf-view/lg.desktop
 share/gnome/uf-view/uf.desktop
-share/gnome/uf-view/w9.desktop
+share/gnome/uf-view/pa.desktop
+share/gnome/uf-view/pvp.desktop
 share/locale/az/LC_MESSAGES/uf-view.mo
+share/locale/cs/LC_MESSAGES/uf-view.mo
+share/locale/de/LC_MESSAGES/uf-view.mo
 share/locale/fr/LC_MESSAGES/uf-view.mo
+share/locale/no/LC_MESSAGES/uf-view.mo
 share/locale/pl/LC_MESSAGES/uf-view.mo
+share/locale/pt_BR/LC_MESSAGES/uf-view.mo
 share/locale/ru/LC_MESSAGES/uf-view.mo
 share/locale/sk/LC_MESSAGES/uf-view.mo
 share/locale/sv/LC_MESSAGES/uf-view.mo