Update to 1.0.4.

8 files changed, 118 insertions, 74 deletions

diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index d541bae62017..dda9f1e1d805 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomespell
-PORTVERSION=	0.5
+PORTVERSION=	1.0.4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-spell/0.5
+MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
 DISTNAME=	gnome-spell-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
@@ -22,13 +22,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade gal libcapplet
+USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/textproc/gnome-spell/distinfo b/textproc/gnome-spell/distinfo
index 64510b674a9c..c01f2fe1e868 100644
--- a/textproc/gnome-spell/distinfo
+++ b/textproc/gnome-spell/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-spell-0.5.tar.bz2) = 109ec5643ca508693f17c4c411d0f913
+MD5 (gnome/gnome-spell-1.0.4.tar.bz2) = d991c1791fdc58d38d514752daf92330
diff --git a/textproc/gnome-spell/files/patch-configure b/textproc/gnome-spell/files/patch-configure
new file mode 100644
index 000000000000..f195f07b43c6
--- /dev/null
+++ b/textproc/gnome-spell/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index b76e3f655b83..8eadb0ea194d 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -1,28 +1,43 @@
-bin/gnome-spell-component-0.5
-bin/gnome-spell-properties-capplet
-share/gnome/apps/Settings/Documents/gnome-spell-properties.desktop
-share/gnome/control-center/Documents/gnome-spell-properties.desktop
-share/gnome/control-center/capplets/gnome-spell-properties.desktop
-share/gnome/gnome-spell/gnome-spell-capplet.glade
-share/gnome/gnome-spell/icons/spell-checker.png
-share/gnome/gnome-spell/spell-checker.glade
-share/gnome/idl/Spell-0.5.idl
-share/gnome/oaf/GNOME_Spell-0.5.oafinfo
-share/locale/az.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/cs.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/de.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/es.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/fr.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/lt.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/no.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pl.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pt.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pt_BR.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/ru.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/sk.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/sv.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/tr.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/zh_CN.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/zh_TW.mo/LC_MESSAGES/gnome-spell-0.5.mo
-@dirrm share/gnome/gnome-spell/icons
-@dirrm share/gnome/gnome-spell
+lib/gnome-spell/libgnome-spell-component-0.3.so
+lib/gnome-spell/libgnome-spell-component.a
+lib/gnome-spell/libgnome-spell-component.so
+libdata/bonobo/servers/GNOME_Spell.server
+share/gnome/control-center-2.0/icons/spell-checker.png
+share/gnome/gnome-spell-%%VERSION%%/spell-checker.glade
+share/gnome/idl/Spell-%%VERSION%%.idl
+share/locale/am/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+@dirrm share/gnome/gnome-spell-%%VERSION%%
+@dirrm lib/gnome-spell
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index d541bae62017..dda9f1e1d805 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomespell
-PORTVERSION=	0.5
+PORTVERSION=	1.0.4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-spell/0.5
+MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
 DISTNAME=	gnome-spell-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
@@ -22,13 +22,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade gal libcapplet
+USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/textproc/gnomespell/distinfo b/textproc/gnomespell/distinfo
index 64510b674a9c..c01f2fe1e868 100644
--- a/textproc/gnomespell/distinfo
+++ b/textproc/gnomespell/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-spell-0.5.tar.bz2) = 109ec5643ca508693f17c4c411d0f913
+MD5 (gnome/gnome-spell-1.0.4.tar.bz2) = d991c1791fdc58d38d514752daf92330
diff --git a/textproc/gnomespell/files/patch-configure b/textproc/gnomespell/files/patch-configure
new file mode 100644
index 000000000000..f195f07b43c6
--- /dev/null
+++ b/textproc/gnomespell/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/gnomespell/pkg-plist b/textproc/gnomespell/pkg-plist
index b76e3f655b83..8eadb0ea194d 100644
--- a/textproc/gnomespell/pkg-plist
+++ b/textproc/gnomespell/pkg-plist
@@ -1,28 +1,43 @@
-bin/gnome-spell-component-0.5
-bin/gnome-spell-properties-capplet
-share/gnome/apps/Settings/Documents/gnome-spell-properties.desktop
-share/gnome/control-center/Documents/gnome-spell-properties.desktop
-share/gnome/control-center/capplets/gnome-spell-properties.desktop
-share/gnome/gnome-spell/gnome-spell-capplet.glade
-share/gnome/gnome-spell/icons/spell-checker.png
-share/gnome/gnome-spell/spell-checker.glade
-share/gnome/idl/Spell-0.5.idl
-share/gnome/oaf/GNOME_Spell-0.5.oafinfo
-share/locale/az.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/cs.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/de.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/es.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/fr.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/lt.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/no.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pl.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pt.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/pt_BR.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/ru.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/sk.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/sv.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/tr.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/zh_CN.mo/LC_MESSAGES/gnome-spell-0.5.mo
-share/locale/zh_TW.mo/LC_MESSAGES/gnome-spell-0.5.mo
-@dirrm share/gnome/gnome-spell/icons
-@dirrm share/gnome/gnome-spell
+lib/gnome-spell/libgnome-spell-component-0.3.so
+lib/gnome-spell/libgnome-spell-component.a
+lib/gnome-spell/libgnome-spell-component.so
+libdata/bonobo/servers/GNOME_Spell.server
+share/gnome/control-center-2.0/icons/spell-checker.png
+share/gnome/gnome-spell-%%VERSION%%/spell-checker.glade
+share/gnome/idl/Spell-%%VERSION%%.idl
+share/locale/am/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+@dirrm share/gnome/gnome-spell-%%VERSION%%
+@dirrm lib/gnome-spell