- Update to 0.11.0

PR:		116928
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

11 files changed, 302 insertions, 232 deletions

diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index 4170dd7d4724..fa58445fe7d8 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -6,34 +6,31 @@
 #
 
 PORTNAME=	rubrica
-PORTVERSION=	1.0.17
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An addressbook for the GNOME 2 desktop
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
+USE_GNOME=	gconf2 gnomehack gnomeprefix gnometarget libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gconf-source=${GCONF_CONFIG_SOURCE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALL_TARGET=	install install-schemas
 
-GCONF_SCHEMAS=	rubrica.schemas
+GCONF_SCHEMAS=	rubrica2.schemas
 
 post-patch:
-.for file in src/dialog.c src/ui.c
-	@${REINPLACE_CMD} -e 's|rub\.png|rubrica.png|g' ${WRKSRC}/${file}
-.endfor
-.for file in src/rubrica_type.h
-	@${REINPLACE_CMD} -e '/^#include/d' ${WRKSRC}/${file}
-.endfor
+	@${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'
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -41,9 +38,9 @@ post-install:
 .for file in AUTHORS CREDITS ChangeLog INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-.for file in examples.rub
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/libRAL
+	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/*.* \
+		${PREFIX}/share/doc/libRAL
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/rubrica/distinfo b/deskutils/rubrica/distinfo
index a85c2dd07d88..eb073bc4c72f 100644
--- a/deskutils/rubrica/distinfo
+++ b/deskutils/rubrica/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubrica-1.0.17.tar.bz2) = d88908b0a0ee7cfcd973aaee2d3f475e
-SHA256 (rubrica-1.0.17.tar.bz2) = ddb5cc7b7a990a54bf4bc975a5c4fde00b5bd8c22b22f4328d96611d0224f9bf
-SIZE (rubrica-1.0.17.tar.bz2) = 669027
+MD5 (rubrica2-2.0.1.tar.bz2) = 94493124d75a9100c3cafabdf89a159f
+SHA256 (rubrica2-2.0.1.tar.bz2) = 9147371d28705654ae2742971d344cb9c028ebc6f06869b1bb804b1de39611e1
+SIZE (rubrica2-2.0.1.tar.bz2) = 720152
diff --git a/deskutils/rubrica/files/patch-Makefile.in b/deskutils/rubrica/files/patch-Makefile.in
deleted file mode 100644
index 09265aaa8c11..000000000000
--- a/deskutils/rubrica/files/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	Sun Sep  3 13:11:07 2006
-+++ Makefile.in	Sun Sep  3 13:12:59 2006
-@@ -656,7 +656,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-desktopDATA install-rubricadocDATA \
-+install-data-am: install-desktopDATA \
- 	install-schemas_DATA
- 
- install-exec-am:
-@@ -710,8 +710,7 @@ uninstall-info: uninstall-info-recursive
- 
- 
- install-schemas: $(schemas__DATA)
--	gconftool-2 --shutdown
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(schemas_dir)/$(schemas__DATA)
-+	GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(schemas_dir)/$(schemas__DATA)
- 
- uninstall-local:
- 	@$(NORMAL_UNINSTALL)
diff --git a/deskutils/rubrica/files/patch-doc::Makefile.in b/deskutils/rubrica/files/patch-doc::Makefile.in
deleted file mode 100644
index 03b153767055..000000000000
--- a/deskutils/rubrica/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Thu Feb  5 03:10:13 2004
-+++ doc/Makefile.in	Thu Feb  5 17:24:42 2004
-@@ -245,7 +245,7 @@
- 
- info-am:
- 
--install-data-am: install-extradocDATA
-+install-data-am:
- 
- install-exec-am:
- 
diff --git a/deskutils/rubrica/files/patch-rubrica2.schemas.in b/deskutils/rubrica/files/patch-rubrica2.schemas.in
new file mode 100644
index 000000000000..a5507aea8c54
--- /dev/null
+++ b/deskutils/rubrica/files/patch-rubrica2.schemas.in
@@ -0,0 +1,21 @@
+--- 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 @@
+ 		<key>/schemas/apps/rubrica2/file/load_files</key>
+ 		<applyto>/apps/rubrica2/file/load_files</applyto>
+ 		<owner>rubrica</owner>
+-		<type>boolean</type>
++		<type>bool</type>
+ 		<default>false</default>
+ 		<locale name="C">
+ 			<short>Load addressbooks on startup</short>
+@@ -89,7 +89,8 @@
+ 		<applyto>/apps/rubrica2/file/files</applyto>
+ 		<owner>rubrica</owner>
+ 		<type>list</type>
+-		<default></default>
++		<list_type>string</list_type>
++		<default>[]</default>
+ 		<locale name="C">
+ 			<short>Files that rubrica will open at startup</short>
+ 		</locale>
diff --git a/deskutils/rubrica/files/patch-src::Makefile.in b/deskutils/rubrica/files/patch-src::Makefile.in
deleted file mode 100644
index 8e3ddde85f91..000000000000
--- a/deskutils/rubrica/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Wed May 25 01:30:59 2005
-+++ src/Makefile.in	Wed May 25 01:30:59 2005
-@@ -190,7 +190,6 @@
- 	-DRUBRICA_SCRIPT_DIR=\""${datadir}/rubrica"\" \
- 	-DFILE_FORMAT=@FILE_FORMAT@
- 
--AM_CFLAGS = -DHAVE_CONFIG_H -Wall -O -g
- rubrica_SOURCES = \
- 	 rubrica_type.h	\
- 	 account.c           account.h \
diff --git a/deskutils/rubrica/pkg-descr b/deskutils/rubrica/pkg-descr
index ac711ec21e31..e6f7d2644d21 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://developer.berlios.de/projects/rubrica/
+WWW: http://rubrica.berlios.de/
diff --git a/deskutils/rubrica/pkg-plist b/deskutils/rubrica/pkg-plist
index 21214df34311..c1500e3d56d1 100644
--- a/deskutils/rubrica/pkg-plist
+++ b/deskutils/rubrica/pkg-plist
@@ -1,4 +1,88 @@
-bin/rubrica
+bin/rubrica2
+include/libral-1.0/libral/abook.h
+include/libral-1.0/libral/address.h
+include/libral-1.0/libral/card.h
+include/libral-1.0/libral/company.h
+include/libral-1.0/libral/contact.h
+include/libral-1.0/libral/date.h
+include/libral-1.0/libral/error.h
+include/libral-1.0/libral/filter.h
+include/libral-1.0/libral/group.h
+include/libral-1.0/libral/group_box.h
+include/libral-1.0/libral/libral.h
+include/libral-1.0/libral/lookup.h
+include/libral-1.0/libral/manager.h
+include/libral-1.0/libral/net.h
+include/libral-1.0/libral/notes.h
+include/libral-1.0/libral/personal.h
+include/libral-1.0/libral/plugin.h
+include/libral-1.0/libral/ref.h
+include/libral-1.0/libral/rlib.h
+include/libral-1.0/libral/telephone.h
+include/libral-1.0/libral/timeout.h
+include/libral-1.0/libral/types.h
+include/libral-1.0/libral/utils.h
+include/libral-1.0/libral/work.h
+lib/libral/plugins/libcsv.a
+lib/libral/plugins/libcsv.la
+lib/libral/plugins/libcsv.so
+lib/libral/plugins/libcsv.so.1
+lib/libral/plugins/libcsvgmail.a
+lib/libral/plugins/libcsvgmail.la
+lib/libral/plugins/libcsvgmail.so
+lib/libral/plugins/libcsvgmail.so.1
+lib/libral/plugins/librubrica.a
+lib/libral/plugins/librubrica.la
+lib/libral/plugins/librubrica.so
+lib/libral/plugins/librubrica.so.1
+lib/libral/plugins/libvcard.a
+lib/libral/plugins/libvcard.la
+lib/libral/plugins/libvcard.so
+lib/libral/plugins/libvcard.so.1
+lib/libral.a
+lib/libral.la
+lib/libral.so
+lib/libral.so.1
+libdata/pkgconfig/libral.pc
+%%PORTDOCS%%share/doc/libRAL/RAbook.html
+%%PORTDOCS%%share/doc/libRAL/RAddress.html
+%%PORTDOCS%%share/doc/libRAL/RCard.html
+%%PORTDOCS%%share/doc/libRAL/RCompanyCard.html
+%%PORTDOCS%%share/doc/libRAL/RContact.html
+%%PORTDOCS%%share/doc/libRAL/RDate.html
+%%PORTDOCS%%share/doc/libRAL/RFilter.html
+%%PORTDOCS%%share/doc/libRAL/RGroup.html
+%%PORTDOCS%%share/doc/libRAL/RGroupBox.html
+%%PORTDOCS%%share/doc/libRAL/RNetAddress.html
+%%PORTDOCS%%share/doc/libRAL/RNotes.html
+%%PORTDOCS%%share/doc/libRAL/RPersonalCard.html
+%%PORTDOCS%%share/doc/libRAL/RPlugin.html
+%%PORTDOCS%%share/doc/libRAL/RRef.html
+%%PORTDOCS%%share/doc/libRAL/RTelephone.html
+%%PORTDOCS%%share/doc/libRAL/RTimeout.html
+%%PORTDOCS%%share/doc/libRAL/RWork.html
+%%PORTDOCS%%share/doc/libRAL/ch01.html
+%%PORTDOCS%%share/doc/libRAL/home.png
+%%PORTDOCS%%share/doc/libRAL/index.html
+%%PORTDOCS%%share/doc/libRAL/index.sgml
+%%PORTDOCS%%share/doc/libRAL/left.png
+%%PORTDOCS%%share/doc/libRAL/libRAL-RCsv.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-RPluginManager.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-RRubrica.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-RVCard.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-error.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-io.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-load.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-lookup.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-rlib.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-save.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-types.html
+%%PORTDOCS%%share/doc/libRAL/libRAL-utils.html
+%%PORTDOCS%%share/doc/libRAL/libRAL.devhelp
+%%PORTDOCS%%share/doc/libRAL/libRAL.devhelp2
+%%PORTDOCS%%share/doc/libRAL/right.png
+%%PORTDOCS%%share/doc/libRAL/style.css
+%%PORTDOCS%%share/doc/libRAL/up.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -6,128 +90,68 @@ bin/rubrica
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/examples.rub
-share/gnome/applications/rubrica.desktop
-share/gnome/pixmaps/rubrica/about.png
-share/gnome/pixmaps/rubrica/accounts.png
-share/gnome/pixmaps/rubrica/add-menu.png
-share/gnome/pixmaps/rubrica/add.png
-share/gnome/pixmaps/rubrica/altrotel.png
-share/gnome/pixmaps/rubrica/arrow-left.png
-share/gnome/pixmaps/rubrica/arrow-right.png
-share/gnome/pixmaps/rubrica/bug.png
-share/gnome/pixmaps/rubrica/bussiness.png
-share/gnome/pixmaps/rubrica/calabria.png
-share/gnome/pixmaps/rubrica/casa.png
-share/gnome/pixmaps/rubrica/cellulare.png
-share/gnome/pixmaps/rubrica/company.png
-share/gnome/pixmaps/rubrica/company2.png
-share/gnome/pixmaps/rubrica/contacts.png
-share/gnome/pixmaps/rubrica/crypto-info.png
-share/gnome/pixmaps/rubrica/crypto.png
-share/gnome/pixmaps/rubrica/customer.png
-share/gnome/pixmaps/rubrica/dedicato.png
-share/gnome/pixmaps/rubrica/del.png
-share/gnome/pixmaps/rubrica/dictionary.png
-share/gnome/pixmaps/rubrica/email.png
-share/gnome/pixmaps/rubrica/emailme.png
-share/gnome/pixmaps/rubrica/export-menu.png
-share/gnome/pixmaps/rubrica/export.png
-share/gnome/pixmaps/rubrica/favorites.png
-share/gnome/pixmaps/rubrica/fax.png
-share/gnome/pixmaps/rubrica/few.png
-share/gnome/pixmaps/rubrica/file-info.png
-share/gnome/pixmaps/rubrica/file.png
-share/gnome/pixmaps/rubrica/filesett.png
-share/gnome/pixmaps/rubrica/folder.png
-share/gnome/pixmaps/rubrica/football.png
-share/gnome/pixmaps/rubrica/freebsd.png
-share/gnome/pixmaps/rubrica/friends.png
-share/gnome/pixmaps/rubrica/general-info.png
-share/gnome/pixmaps/rubrica/general.png
-share/gnome/pixmaps/rubrica/genius.png
-share/gnome/pixmaps/rubrica/heart.png
-share/gnome/pixmaps/rubrica/help.png
-share/gnome/pixmaps/rubrica/hi.png
-share/gnome/pixmaps/rubrica/hobby.png
-share/gnome/pixmaps/rubrica/holiday-cards.png
-share/gnome/pixmaps/rubrica/holiday.png
-share/gnome/pixmaps/rubrica/home.png
-share/gnome/pixmaps/rubrica/hot-contacts.png
-share/gnome/pixmaps/rubrica/image.png
-share/gnome/pixmaps/rubrica/import-menu.png
-share/gnome/pixmaps/rubrica/import.png
-share/gnome/pixmaps/rubrica/info.png
-share/gnome/pixmaps/rubrica/internet.png
-share/gnome/pixmaps/rubrica/keys.png
-share/gnome/pixmaps/rubrica/ledgreen.png
-share/gnome/pixmaps/rubrica/ledred.png
-share/gnome/pixmaps/rubrica/load.png
-share/gnome/pixmaps/rubrica/misc.png
-share/gnome/pixmaps/rubrica/mod-menu.png
-share/gnome/pixmaps/rubrica/mod.png
-share/gnome/pixmaps/rubrica/money.png
-share/gnome/pixmaps/rubrica/multimedia.png
-share/gnome/pixmaps/rubrica/none.png
-share/gnome/pixmaps/rubrica/normal.png
-share/gnome/pixmaps/rubrica/notes.png
-share/gnome/pixmaps/rubrica/other.png
-share/gnome/pixmaps/rubrica/penguin.png
-share/gnome/pixmaps/rubrica/personal.png
-share/gnome/pixmaps/rubrica/photo.png
-share/gnome/pixmaps/rubrica/pj.png
-share/gnome/pixmaps/rubrica/post-it.png
-share/gnome/pixmaps/rubrica/puzzle.png
-share/gnome/pixmaps/rubrica/question.png
-share/gnome/pixmaps/rubrica/remove-menu.png
-share/gnome/pixmaps/rubrica/remove.png
-share/gnome/pixmaps/rubrica/role.png
-share/gnome/pixmaps/rubrica/rubrica.jpg
-share/gnome/pixmaps/rubrica/rubrica.png
-share/gnome/pixmaps/rubrica/save.png
-share/gnome/pixmaps/rubrica/sbug.png
-share/gnome/pixmaps/rubrica/scalabria.png
-share/gnome/pixmaps/rubrica/schede.png
-share/gnome/pixmaps/rubrica/search.png
-share/gnome/pixmaps/rubrica/strategies.png
-share/gnome/pixmaps/rubrica/street.png
-share/gnome/pixmaps/rubrica/telefoni.png
-share/gnome/pixmaps/rubrica/telefono.png
-share/gnome/pixmaps/rubrica/testa.png
-share/gnome/pixmaps/rubrica/time.png
-share/gnome/pixmaps/rubrica/translation-info.png
-share/gnome/pixmaps/rubrica/translation.png
-share/gnome/pixmaps/rubrica/university.png
-share/gnome/pixmaps/rubrica/very-hi.png
-share/gnome/pixmaps/rubrica/view-column.png
-share/gnome/pixmaps/rubrica/view-info.png
-share/gnome/pixmaps/rubrica/view.png
-share/gnome/pixmaps/rubrica/word.png
-share/gnome/pixmaps/rubrica/work.png
-share/gnome/rubrica/nautilus-script/rubrica2html.py
-share/gnome/rubrica/script/rub2html.py
-share/gnome/rubrica/script/rub2rub.py
-share/gnome/rubrica/script/rub2txt.py
-share/gnome/rubrica/script/rub2vcard.py
-share/gnome/rubrica/stylesheet/rub2html.xsl
-share/gnome/rubrica/stylesheet/rub2rub.xsl
-share/gnome/rubrica/stylesheet/rub2txt.xsl
-share/gnome/rubrica/stylesheet/rub2vcard.xsl
-share/locale/bg/LC_MESSAGES/rubrica.mo
-share/locale/de/LC_MESSAGES/rubrica.mo
-share/locale/es/LC_MESSAGES/rubrica.mo
-share/locale/eu/LC_MESSAGES/rubrica.mo
-share/locale/fr/LC_MESSAGES/rubrica.mo
-share/locale/ga/LC_MESSAGES/rubrica.mo
-share/locale/it/LC_MESSAGES/rubrica.mo
-share/locale/ja/LC_MESSAGES/rubrica.mo
-share/locale/pt_BR/LC_MESSAGES/rubrica.mo
-share/locale/ru/LC_MESSAGES/rubrica.mo
-share/locale/sk/LC_MESSAGES/rubrica.mo
-share/locale/uk/LC_MESSAGES/rubrica.mo
-@dirrm share/gnome/rubrica/stylesheet
-@dirrm share/gnome/rubrica/script
-@dirrm share/gnome/rubrica/nautilus-script
-@dirrm share/gnome/rubrica
-@dirrm share/gnome/pixmaps/rubrica
+share/gnome/applications/rubrica2.desktop
+share/gnome/mime-info/rubrica2.keys
+share/gnome/mime-info/rubrica2.mime
+share/gnome/pixmaps/rubrica2/16x16/ccare.png
+share/gnome/pixmaps/rubrica2/16x16/green.png
+share/gnome/pixmaps/rubrica2/16x16/operator.png
+share/gnome/pixmaps/rubrica2/24x24/stuffs.png
+share/gnome/pixmaps/rubrica2/24x24/university.png
+share/gnome/pixmaps/rubrica2/48x48/all.png
+share/gnome/pixmaps/rubrica2/48x48/bussines.png
+share/gnome/pixmaps/rubrica2/48x48/chat.png
+share/gnome/pixmaps/rubrica2/48x48/contacts.png
+share/gnome/pixmaps/rubrica2/48x48/customer.png
+share/gnome/pixmaps/rubrica2/48x48/flame.png
+share/gnome/pixmaps/rubrica2/48x48/freebsd.png
+share/gnome/pixmaps/rubrica2/48x48/gnu.png
+share/gnome/pixmaps/rubrica2/48x48/hobbies.png
+share/gnome/pixmaps/rubrica2/48x48/keys.png
+share/gnome/pixmaps/rubrica2/48x48/lock.png
+share/gnome/pixmaps/rubrica2/48x48/mailbox.png
+share/gnome/pixmaps/rubrica2/48x48/net.png
+share/gnome/pixmaps/rubrica2/48x48/notes.png
+share/gnome/pixmaps/rubrica2/48x48/phone.png
+share/gnome/pixmaps/rubrica2/48x48/photo.png
+share/gnome/pixmaps/rubrica2/48x48/puzzle.png
+share/gnome/pixmaps/rubrica2/48x48/rate1.png
+share/gnome/pixmaps/rubrica2/48x48/rate2.png
+share/gnome/pixmaps/rubrica2/48x48/rate3.png
+share/gnome/pixmaps/rubrica2/48x48/rate4.png
+share/gnome/pixmaps/rubrica2/48x48/rate5.png
+share/gnome/pixmaps/rubrica2/48x48/role.png
+share/gnome/pixmaps/rubrica2/48x48/rubrica.png
+share/gnome/pixmaps/rubrica2/48x48/search-contact.png
+share/gnome/pixmaps/rubrica2/48x48/sport.png
+share/gnome/pixmaps/rubrica2/48x48/strategies.png
+share/gnome/pixmaps/rubrica2/48x48/tux.png
+share/gnome/pixmaps/rubrica2/scalable/card_photo.svg
+share/gnome/pixmaps/rubrica2/scalable/query.svg
+share/gnome/rubrica2/interface/CompanyCard.glade
+share/gnome/rubrica2/interface/GroupManager.glade
+share/gnome/rubrica2/interface/MainWindow.glade
+share/gnome/rubrica2/interface/Menu.glade
+share/gnome/rubrica2/interface/MenuTrash.glade
+share/gnome/rubrica2/interface/PersonalCard.glade
+share/gnome/rubrica2/interface/Preferences.glade
+share/gnome/rubrica2/interface/Search.glade
+share/gnome/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/gnome/rubrica2/interface
+@dirrm share/gnome/rubrica2
+@dirrm share/gnome/pixmaps/rubrica2/scalable
+@dirrm share/gnome/pixmaps/rubrica2/48x48
+@dirrm share/gnome/pixmaps/rubrica2/24x24
+@dirrm share/gnome/pixmaps/rubrica2/22x22
+@dirrm share/gnome/pixmaps/rubrica2/16x16
+@dirrm share/gnome/pixmaps/rubrica2
+%%PORTDOCS%%@dirrm share/doc/libRAL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry lib/libral/plugins
+@dirrmtry lib/libral
+@dirrmtry include/libral-1.0/libral
+@dirrmtry include/libral-1.0
+
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 874b64b218a6..fc8e503f28fc 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,39 +6,37 @@
 #
 
 PORTNAME=	ogmrip
-DISTVERSION=	0.10.3
-PORTREVISION=	2
+PORTVERSION=	0.11.0
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 
-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
+BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		mencoder:${PORTSDIR}/multimedia/mencoder \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
-		lame:${PORTSDIR}/audio/lame \
+		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
 		gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
+LIB_DEPENDS=	enca.5:${PORTSDIR}/converters/enca \
+		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+		x264:${PORTSDIR}/multimedia/x264
+RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		mencoder:${PORTSDIR}/multimedia/mencoder \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
-		lame:${PORTSDIR}/audio/lame
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread \
-		x264:${PORTSDIR}/multimedia/x264
+		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
 
-USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	glib20 libxml2 gnomehack
-GNU_CONFIGURE=	yes
-USE_XLIB=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GSED=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--sharedstatedir=${PREFIX}/libdata
-GMAKE_ENV+=	GMSGFMT=${localbase}/bin/msgfmt
+MAN1=		dvdcpy.1
 
 OPTIONS=	GUI		"Build the GTK+ GUI"				on  \
 		HAL		"Enable Hardware Abstract Layer (HAL) support"	off \
@@ -132,6 +130,12 @@ LAVF_SUPPORT!=		${LOCALBASE}/bin/mencoder -of help 2> /dev/null | \
 	  			${ECHO_CMD} "" || ${ECHO_CMD} "@comment "
 PLIST_SUB+=		LAVF_SUPPORT="${LAVF_SUPPORT}"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-I/usr/local/include||g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|-L/usr/pkg/lib||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^SUBDIRS|#SUBDIRS|g' ${WRKSRC}/docs/Makefile.in
+
 pre-configure:
 	@if ${LOCALBASE}/mencoder -ovc help 2> /dev/null | ${GREP} -q "^ *xvid *- .*" ; then \
 	  ${ECHO_MSG} "" ; \
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index 61960ea2239a..2979c6790ca2 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.10.3.tar.gz) = 7a287d3ecf49c88e5a6fd78206427455
-SHA256 (ogmrip-0.10.3.tar.gz) = b72ce8f41f7692d3704dccf9e6cf0fff19853b4b98281c5892f3387ec84fd517
-SIZE (ogmrip-0.10.3.tar.gz) = 627658
+MD5 (ogmrip-0.11.0.tar.gz) = 928531e90ed85046544312d86e161357
+SHA256 (ogmrip-0.11.0.tar.gz) = 8f93111e8895cc51cef88caa9744dacf3ecc095c9d23049a8936ac2877a9d2cd
+SIZE (ogmrip-0.11.0.tar.gz) = 1892940
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index 6c41682652de..fea20d59f30e 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -3,49 +3,54 @@ bin/dvdcpy
 %%SRT_SUPPORT%%bin/srtutil
 %%SRT_SUPPORT%%bin/subp2pgm
 %%THEORA_SUPPORT%%bin/theoraenc
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-audio-chooser.h
+include/ogmdvd/ogmdvd-audio.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-chapter-list.h
+include/ogmdvd/ogmdvd-disc.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser-dialog.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser-widget.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser.h
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-dialog.h
+include/ogmdvd/ogmdvd-enums.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-gtk.h
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-subtitle-chooser.h
+include/ogmdvd/ogmdvd-labels.h
+include/ogmdvd/ogmdvd-stream.h
+include/ogmdvd/ogmdvd-subp.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser-widget.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser.h
+include/ogmdvd/ogmdvd-title.h
+include/ogmdvd/ogmdvd-types.h
 include/ogmdvd/ogmdvd.h
 include/ogmjob/ogmjob-bin.h
 include/ogmjob/ogmjob-container.h
-include/ogmjob/ogmjob-enums.h
 include/ogmjob/ogmjob-exec.h
 include/ogmjob/ogmjob-list.h
+include/ogmjob/ogmjob-log.h
 include/ogmjob/ogmjob-marshal.h
 include/ogmjob/ogmjob-pipeline.h
 include/ogmjob/ogmjob-queue.h
 include/ogmjob/ogmjob-spawn.h
 include/ogmjob/ogmjob.h
-%%FAAC_SUPPORT%%include/ogmrip/ogmrip-aac.h
-include/ogmrip/ogmrip-acopy.h
 include/ogmrip/ogmrip-audio.h
-include/ogmrip/ogmrip-avi.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-chapter-list.h
 include/ogmrip/ogmrip-chapters.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-chooser-list.h
 include/ogmrip/ogmrip-codec.h
 include/ogmrip/ogmrip-container.h
 include/ogmrip/ogmrip-dvdcpy.h
+include/ogmrip/ogmrip-edl.h
+include/ogmrip/ogmrip-enums.h
+include/ogmrip/ogmrip-file.h
 include/ogmrip/ogmrip-fs.h
-include/ogmrip/ogmrip-init.h
-include/ogmrip/ogmrip-lavc.h
-%%MATROSKA_SUPPORT%%include/ogmrip/ogmrip-mkv.h
-include/ogmrip/ogmrip-mp3.h
-%%LAVF_SUPPORT%%include/ogmrip/ogmrip-mp4.h
-include/ogmrip/ogmrip-ogg.h
-%%SRT_SUPPORT%%include/ogmrip/ogmrip-srt.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-gtk.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-helper.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-marshal.h
+include/ogmrip/ogmrip-mplayer.h
+include/ogmrip/ogmrip-plugin.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-preferences.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-source-chooser-widget.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-source-chooser.h
 include/ogmrip/ogmrip-subp.h
-%%THEORA_SUPPORT%%include/ogmrip/ogmrip-theora.h
 include/ogmrip/ogmrip-version.h
 include/ogmrip/ogmrip-video.h
-include/ogmrip/ogmrip-vobsub.h
-include/ogmrip/ogmrip-vorbis.h
-include/ogmrip/ogmrip-wav.h
-%%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h
-include/ogmrip/ogmrip-xvid.h
 include/ogmrip/ogmrip.h
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.a
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.la
@@ -59,14 +64,73 @@ lib/libogmjob.a
 lib/libogmjob.la
 lib/libogmjob.so
 lib/libogmjob.so.0
+%%GUI_SUPPORT%%lib/libogmrip-gtk.a
+%%GUI_SUPPORT%%lib/libogmrip-gtk.la
+%%GUI_SUPPORT%%lib/libogmrip-gtk.so
+%%GUI_SUPPORT%%lib/libogmrip-gtk.so.0
+lib/libogmrip-mplayer.a
+lib/libogmrip-mplayer.la
+lib/libogmrip-mplayer.so
+lib/libogmrip-mplayer.so.0
 lib/libogmrip.a
 lib/libogmrip.la
 lib/libogmrip.so
 lib/libogmrip.so.0
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.a
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.la
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.so
+lib/ogmrip/audio-codecs/libogmrip-acopy.a
+lib/ogmrip/audio-codecs/libogmrip-acopy.la
+lib/ogmrip/audio-codecs/libogmrip-acopy.so
+lib/ogmrip/audio-codecs/libogmrip-mp3.a
+lib/ogmrip/audio-codecs/libogmrip-mp3.la
+lib/ogmrip/audio-codecs/libogmrip-mp3.so
+lib/ogmrip/audio-codecs/libogmrip-vorbis.a
+lib/ogmrip/audio-codecs/libogmrip-vorbis.la
+lib/ogmrip/audio-codecs/libogmrip-vorbis.so
+lib/ogmrip/audio-codecs/libogmrip-wav.a
+lib/ogmrip/audio-codecs/libogmrip-wav.la
+lib/ogmrip/audio-codecs/libogmrip-wav.so
+lib/ogmrip/containers/libogmrip-avi.a
+lib/ogmrip/containers/libogmrip-avi.la
+lib/ogmrip/containers/libogmrip-avi.so
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.a
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.la
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.so
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.a
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.la
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.so
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.a
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.la
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.so
+lib/ogmrip/containers/libogmrip-ogg.a
+lib/ogmrip/containers/libogmrip-ogg.la
+lib/ogmrip/containers/libogmrip-ogg.so
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.a
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.la
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.so
+lib/ogmrip/subp-codecs/libogmrip-vobsub.a
+lib/ogmrip/subp-codecs/libogmrip-vobsub.la
+lib/ogmrip/subp-codecs/libogmrip-vobsub.so
+lib/ogmrip/video-codecs/libogmrip-lavc.a
+lib/ogmrip/video-codecs/libogmrip-lavc.la
+lib/ogmrip/video-codecs/libogmrip-lavc.so
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.a
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.la
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.so
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.a
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.la
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.so
+lib/ogmrip/video-codecs/libogmrip-xvid.a
+lib/ogmrip/video-codecs/libogmrip-xvid.la
+lib/ogmrip/video-codecs/libogmrip-xvid.so
+libdata/pkgconfig/ogmdvd-gtk.pc
 libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmjob.pc
+libdata/pkgconfig/ogmrip-gtk.pc
 libdata/pkgconfig/ogmrip.pc
 %%GUI_SUPPORT%%share/applications/ogmrip.desktop
+share/locale/ca/LC_MESSAGES/ogmrip.mo
 share/locale/cs/LC_MESSAGES/ogmrip.mo
 share/locale/de/LC_MESSAGES/ogmrip.mo
 share/locale/fr/LC_MESSAGES/ogmrip.mo
@@ -78,12 +142,14 @@ share/locale/pl/LC_MESSAGES/ogmrip.mo
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-progress.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-spell.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-ui.xml
-%%DATADIR%%/ogmrip.xml
-%%DATADIR%%/ogmrip.xsd
-%%DATADIR%%/xml.xsd
 %%GUI_SUPPORT%%share/pixmaps/ogmrip.png
-@dirrm %%DATADIR%%
+%%GUI_SUPPORT%%@dirrm %%DATADIR%%
 %%GUI_SUPPORT%%@dirrmtry share/applications
+@dirrm lib/ogmrip/video-codecs
+@dirrm lib/ogmrip/subp-codecs
+@dirrm lib/ogmrip/containers
+@dirrm lib/ogmrip/audio-codecs
+@dirrm lib/ogmrip
 @dirrm include/ogmrip
 @dirrm include/ogmjob
 @dirrm include/ogmdvd