6 files changed, 12 insertions, 46 deletions

diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 9cbb4301900c..d35d1e4fab3a 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	scrollkeeper
-PORTVERSION=	0.3.9
+PORTVERSION=	0.3.11
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -56,9 +56,9 @@ post-patch:
 		's|[(]LN_S[)] -f -n|(LN_S) -f|g'
 	@${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \
 		${WRKSRC}/libs/scrollkeeper.h.in
-	@${REINPLACE_CMD} -e 's|[%][%]PREFIX[%][%]|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/cl/src/update.c
-	@${REINPLACE_CMD} -e 's|[%][%]LOCALBASE[%][%]|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/extract/dtds/Makefile.in
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo
index 5db83e5dc553..2dc539cc64d5 100644
--- a/textproc/scrollkeeper/distinfo
+++ b/textproc/scrollkeeper/distinfo
@@ -1 +1 @@
-MD5 (gnome2/scrollkeeper-0.3.9.tar.bz2) = 9f23d9d7ec2a5cf0bc0cc162f0090b3f
+MD5 (gnome2/scrollkeeper-0.3.11.tar.bz2) = 91212198f6d11adabdaf429d24acb21c
diff --git a/textproc/scrollkeeper/files/patch-buildtools_separate.c b/textproc/scrollkeeper/files/patch-buildtools_separate.c
deleted file mode 100644
index 376cb5c7fd66..000000000000
--- a/textproc/scrollkeeper/files/patch-buildtools_separate.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildtools/separate.c.orig	Mon Jun 17 15:09:34 2002
-+++ buildtools/separate.c	Mon Jun 17 15:09:27 2002
-@@ -242,6 +242,7 @@
- 					xmlUnlinkNode(w_node);
- 					xmlFreeNode(w_node);
- 				}
-+				continue;
- 			}
- 			else {
- 				if (strcmp(lang, "C")) {
diff --git a/textproc/scrollkeeper/files/patch-cl_preinstall.c b/textproc/scrollkeeper/files/patch-cl_preinstall.c
deleted file mode 100644
index 2e89129b9efd..000000000000
--- a/textproc/scrollkeeper/files/patch-cl_preinstall.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cl/src/preinstall.c	2001/07/14 10:49:05	1.15
-+++ cl/src/preinstall.c	2002/06/02 04:25:51	1.16
-@@ -65,7 +65,16 @@
-     omf_new_name = argv[3];
- 
-     if (!update_doc_url_in_omf_file(omf_name, url, omf_new_name)) {
--    	fprintf(stderr, _("url update in OMF file %s failed\n"), omf_name);
-+    	fprintf(stderr, _("Unable to update URL in OMF file %s.  Copying OMF file unchanged.\n"), omf_name);
-+
-+        /*
-+         *  Copy the old file to the new name, since the missing file will
-+	 *  break some packaging systems.  In these cases, it is better to
-+	 *  at least get a package, even if a doc or two isn't registered
-+	 *  properly than to not get a package built at all.
-+         */
-+	copy_file(omf_name, omf_new_name);
-+
- 	return 1;
-     }
-             
diff --git a/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in b/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in
deleted file mode 100644
index 9a16074e6de2..000000000000
--- a/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- cl/templates/Makefile.in.orig	Tue Jun 18 15:13:52 2002
-+++ cl/templates/Makefile.in	Tue Jun 18 15:13:37 2002
-@@ -130,7 +130,7 @@
- EXTRA_DIST = scrollkeeper_cl.xml.in
- LIB_PATH = $(top_builddir)/libs/.libs
- 
--TRANSLATED_LOCALES = C ca da de el es fr hu it ja ko nb nl no pl pt_BR ru sk sl sv tr uk, zh_TW
-+TRANSLATED_LOCALES = C ca da de el es fr hu it ja ko nb nl no pl pt_BR ru sk sl sv tr uk zh_TW
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index b69a725a602d..0b2496384bee 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -24,15 +24,20 @@ share/gnome/scrollkeeper/Templates/de/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/el/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/es/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/it/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/nb/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/no/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
 share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
@@ -63,6 +68,7 @@ share/locale/sl/LC_MESSAGES/scrollkeeper.mo
 share/locale/sv/LC_MESSAGES/scrollkeeper.mo
 share/locale/tr/LC_MESSAGES/scrollkeeper.mo
 share/locale/uk/LC_MESSAGES/scrollkeeper.mo
+share/locale/vi/LC_MESSAGES/scrollkeeper.mo
 share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
 @dirrm share/gnome/xml/scrollkeeper/dtds
 @dirrm share/gnome/xml/scrollkeeper
@@ -72,6 +78,7 @@ share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
 @dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
 @dirrm share/gnome/scrollkeeper/doc
 @dirrm share/gnome/scrollkeeper/Templates/zh_TW
+@dirrm share/gnome/scrollkeeper/Templates/vi
 @dirrm share/gnome/scrollkeeper/Templates/uk
 @dirrm share/gnome/scrollkeeper/Templates/tr
 @dirrm share/gnome/scrollkeeper/Templates/sv