- Update to 2.0.6

PR:		139287
Submitted by:	Ports Fury

6 files changed, 58 insertions, 23 deletions

diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index a8d99efa71e8..8369b8c7f41b 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -6,34 +6,38 @@
 #
 
 PORTNAME=	rubrica
-PORTVERSION=	2.0.1
-PORTREVISION=	3
+PORTVERSION=	2.0.6
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	BERLIOS
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An addressbook for the GNOME 2 desktop
 
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+
 USE_BZIP2=	yes
-USE_GNOME=	gconf2 gnomehack gnomeprefix gnometarget libglade2
+USE_GNOME=	gconf2 gnomehack gnomeprefix libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_AUTOTOOLS=	libtool:22
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 GCONF_SCHEMAS=	rubrica2.schemas
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-Wall -g|-Wall|g ; \
-		 s|-Wmissing-prototypes -g|-Wmissing-prototypes|g ; \
-		 s|@RUBRICA_FILE_|@FILE_|g'
+		 s|-Wmissing-prototypes -g|-Wmissing-prototypes|g'
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
 
 post-install:
+	@${LN} -sf ${LOCALBASE}/share/icons/gnome \
+		${PREFIX}/share/pixmaps/rubrica2/22x22/hicolor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS CREDITS ChangeLog INSTALL NEWS README TODO
diff --git a/deskutils/rubrica/distinfo b/deskutils/rubrica/distinfo
index eb073bc4c72f..22b29f0937b7 100644
--- a/deskutils/rubrica/distinfo
+++ b/deskutils/rubrica/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubrica2-2.0.1.tar.bz2) = 94493124d75a9100c3cafabdf89a159f
-SHA256 (rubrica2-2.0.1.tar.bz2) = 9147371d28705654ae2742971d344cb9c028ebc6f06869b1bb804b1de39611e1
-SIZE (rubrica2-2.0.1.tar.bz2) = 720152
+MD5 (rubrica2-2.0.6.tar.bz2) = babc15b1c782f6093b24345eac7e9a99
+SHA256 (rubrica2-2.0.6.tar.bz2) = cfe2a674c139f6bd8fc37414159c9e4bbae4766628f6ca9b7ae18ccb4b9c056f
+SIZE (rubrica2-2.0.6.tar.bz2) = 764710
diff --git a/deskutils/rubrica/files/patch-interface__MainWindow.glade b/deskutils/rubrica/files/patch-interface__MainWindow.glade
new file mode 100644
index 000000000000..61c200b277e7
--- /dev/null
+++ b/deskutils/rubrica/files/patch-interface__MainWindow.glade
@@ -0,0 +1,20 @@
+--- interface/MainWindow.glade.orig	2008-04-30 18:41:37.000000000 +0900
++++ interface/MainWindow.glade	2009-09-12 03:39:24.000000000 +0900
+@@ -84,7 +84,7 @@
+             <child>
+               <widget class="GtkMenuItem" id="menuitem2">
+                 <property name="visible">True</property>
+-                <property name="label">_Modifica</property>
++                <property name="label">_Edit</property>
+                 <property name="use_underline">True</property>
+                 <child>
+                   <widget class="GtkMenu" id="menuitem2_menu">
+@@ -173,7 +173,7 @@
+             <child>
+               <widget class="GtkMenuItem" id="menuitem4">
+                 <property name="visible">True</property>
+-                <property name="label">A_iuto</property>
++                <property name="label">_Help</property>
+                 <property name="use_underline">True</property>
+                 <child>
+                   <widget class="GtkMenu" id="menuitem4_menu">
diff --git a/deskutils/rubrica/files/patch-rubrica2.schemas.in b/deskutils/rubrica/files/patch-rubrica2.schemas.in
index a5507aea8c54..f3dbf555b62c 100644
--- a/deskutils/rubrica/files/patch-rubrica2.schemas.in
+++ b/deskutils/rubrica/files/patch-rubrica2.schemas.in
@@ -1,6 +1,15 @@
---- rubrica2.schemas.in.orig	Thu Aug 16 20:00:44 2007
-+++ rubrica2.schemas.in	Thu Sep  6 21:59:36 2007
-@@ -77,7 +77,7 @@
+--- rubrica2.schemas.in.orig	2008-04-30 18:41:37.000000000 +0900
++++ rubrica2.schemas.in	2009-09-06 12:40:19.000000000 +0900
+@@ -6,7 +6,7 @@
+ 		<applyto>/apps/rubrica2/file_format</applyto>
+ 		<owner>rubrica</owner>
+ 		<type>int</type>
+-		<default>@FILE_FORMAT@</default>
++		<default>@RUBRICA_FILE_FORMAT@</default>
+ 		<locale name="C">
+         		<short>rubrica file format</short>
+       		</locale>
+@@ -88,7 +88,7 @@
  		<key>/schemas/apps/rubrica2/file/load_files</key>
  		<applyto>/apps/rubrica2/file/load_files</applyto>
  		<owner>rubrica</owner>
@@ -9,7 +18,7 @@
  		<default>false</default>
  		<locale name="C">
  			<short>Load addressbooks on startup</short>
-@@ -89,7 +89,8 @@
+@@ -100,7 +100,8 @@
  		<applyto>/apps/rubrica2/file/files</applyto>
  		<owner>rubrica</owner>
  		<type>list</type>
diff --git a/deskutils/rubrica/pkg-descr b/deskutils/rubrica/pkg-descr
index e6f7d2644d21..ddfb4c01a71c 100644
--- a/deskutils/rubrica/pkg-descr
+++ b/deskutils/rubrica/pkg-descr
@@ -3,4 +3,4 @@ Rubrica is an addressbook for Gnome desktop. Rubrica store personal data
 job data (company name, company address, assigment in company), notes 
 (contact is married,...)
 
-WWW: http://rubrica.berlios.de/
+WWW: http://www.nicolafragale.org/joomla/rubrica/rubrica-main
diff --git a/deskutils/rubrica/pkg-plist b/deskutils/rubrica/pkg-plist
index 55409be9af0c..408a1f7fd305 100644
--- a/deskutils/rubrica/pkg-plist
+++ b/deskutils/rubrica/pkg-plist
@@ -44,6 +44,7 @@ lib/libral.la
 lib/libral.so
 lib/libral.so.1
 libdata/pkgconfig/libral.pc
+share/applications/rubrica2.desktop
 %%PORTDOCS%%share/doc/libRAL/RAbook.html
 %%PORTDOCS%%share/doc/libRAL/RAddress.html
 %%PORTDOCS%%share/doc/libRAL/RCard.html
@@ -90,12 +91,16 @@ libdata/pkgconfig/libral.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/applications/rubrica2.desktop
+share/locale/de/LC_MESSAGES/rubrica2.mo
+share/locale/fr/LC_MESSAGES/rubrica2.mo
+share/locale/it/LC_MESSAGES/rubrica2.mo
+share/locale/uk/LC_MESSAGES/rubrica2.mo
 share/mime-info/rubrica2.keys
 share/mime-info/rubrica2.mime
 share/pixmaps/rubrica2/16x16/ccare.png
 share/pixmaps/rubrica2/16x16/green.png
 share/pixmaps/rubrica2/16x16/operator.png
+share/pixmaps/rubrica2/22x22/hicolor
 share/pixmaps/rubrica2/24x24/stuffs.png
 share/pixmaps/rubrica2/24x24/university.png
 share/pixmaps/rubrica2/48x48/all.png
@@ -137,9 +142,6 @@ share/rubrica2/interface/PersonalCard.glade
 share/rubrica2/interface/Preferences.glade
 share/rubrica2/interface/Search.glade
 share/rubrica2/interface/logo.png
-share/locale/de/LC_MESSAGES/rubrica2.mo
-share/locale/it/LC_MESSAGES/rubrica2.mo
-share/locale/uk/LC_MESSAGES/rubrica2.mo
 @dirrm share/rubrica2/interface
 @dirrm share/rubrica2
 @dirrm share/pixmaps/rubrica2/scalable
@@ -150,8 +152,8 @@ share/locale/uk/LC_MESSAGES/rubrica2.mo
 @dirrm share/pixmaps/rubrica2
 %%PORTDOCS%%@dirrm share/doc/libRAL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
 @dirrmtry lib/libral/plugins
 @dirrmtry lib/libral
 @dirrmtry include/libral-1.0/libral
 @dirrmtry include/libral-1.0
-@dirrmtry share/applications