Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9736 df743ca5-7f9a-e211-a948-0013205c9059

21 files changed, 210 insertions, 221 deletions

diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index cc44247ea..c8a2e75a5 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -3,7 +3,7 @@
 # Whom:				John Merryweather Cooper <jmcoopr@webmail.bmi.net>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.1 2007-07-23 19:35:50 mezz Exp $
+#   $Id: Makefile,v 1.2 2007-10-08 19:42:49 mezz Exp $
 #
 
 PORTNAME=	gfax
@@ -28,6 +28,8 @@ STRIP=
 
 GCONF_SCHEMAS=	gfax.schemas
 
+BROKEN=		fails to install
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
 		${WRKSRC}/gfax.in \
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 30e011d4a..6e9b3bdbd 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnochm
-PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	SF
 
diff --git a/deskutils/gnochm/distinfo b/deskutils/gnochm/distinfo
index 9576150e2..4f7e718ab 100644
--- a/deskutils/gnochm/distinfo
+++ b/deskutils/gnochm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnochm-0.9.9.tar.gz) = c6cfabf97778587614973f6c3956f705
-SHA256 (gnochm-0.9.9.tar.gz) = 11d968ed50f2a59a591a9a313b0762baad0ba5eb91702fe3ace88de2d6863b4e
-SIZE (gnochm-0.9.9.tar.gz) = 380370
+MD5 (gnochm-0.9.11.tar.gz) = d77cc819eaa64b3ab333c4a73e88cfc0
+SHA256 (gnochm-0.9.11.tar.gz) = ee168ae1a2d1aa23856896a316eb2e4bdfb7be10ed11eb80c72ebc8f525a4c3a
+SIZE (gnochm-0.9.11.tar.gz) = 406640
diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist
index 27a21f08b..5e0e627f3 100644
--- a/deskutils/gnochm/pkg-plist
+++ b/deskutils/gnochm/pkg-plist
@@ -11,17 +11,21 @@ share/omf/gnochm/gnochm-C.omf
 share/pixmaps/chmfile.png
 share/pixmaps/gnochm.png
 share/pixmaps/gnochm_logo.png
+share/locale/be/LC_MESSAGES/gnochm.mo
 share/locale/cs/LC_MESSAGES/gnochm.mo
 share/locale/de/LC_MESSAGES/gnochm.mo
 share/locale/el/LC_MESSAGES/gnochm.mo
 share/locale/es/LC_MESSAGES/gnochm.mo
 share/locale/fr/LC_MESSAGES/gnochm.mo
+share/locale/hu/LC_MESSAGES/gnochm.mo
 share/locale/it/LC_MESSAGES/gnochm.mo
 share/locale/ja/LC_MESSAGES/gnochm.mo
 share/locale/pl/LC_MESSAGES/gnochm.mo
 share/locale/pt_BR/LC_MESSAGES/gnochm.mo
 share/locale/ru/LC_MESSAGES/gnochm.mo
+share/locale/sv/LC_MESSAGES/gnochm.mo
 share/locale/tr/LC_MESSAGES/gnochm.mo
+share/locale/vi/LC_MESSAGES/gnochm.mo
 share/locale/zh_CN/LC_MESSAGES/gnochm.mo
 share/locale/zh_TW/LC_MESSAGES/gnochm.mo
 share/mime/application/x-chm.xml
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index 3588af07f..c242d36fa 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -6,34 +6,32 @@
 #
 
 PORTNAME=	rubrica
-PORTVERSION=	1.0.17
-PORTREVISION=	2
+PORTVERSION=	2.0.1
+PORTREVISION=	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 +39,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 a85c2dd07..eb073bc4c 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 09265aaa8..000000000
--- 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 03b153767..000000000
--- 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 000000000..a5507aea8
--- /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 8e3ddde85..000000000
--- 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 ac711ec21..e6f7d2644 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 abfb58163..3a8f89be1 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/applications/rubrica.desktop
-share/pixmaps/rubrica/about.png
-share/pixmaps/rubrica/accounts.png
-share/pixmaps/rubrica/add-menu.png
-share/pixmaps/rubrica/add.png
-share/pixmaps/rubrica/altrotel.png
-share/pixmaps/rubrica/arrow-left.png
-share/pixmaps/rubrica/arrow-right.png
-share/pixmaps/rubrica/bug.png
-share/pixmaps/rubrica/bussiness.png
-share/pixmaps/rubrica/calabria.png
-share/pixmaps/rubrica/casa.png
-share/pixmaps/rubrica/cellulare.png
-share/pixmaps/rubrica/company.png
-share/pixmaps/rubrica/company2.png
-share/pixmaps/rubrica/contacts.png
-share/pixmaps/rubrica/crypto-info.png
-share/pixmaps/rubrica/crypto.png
-share/pixmaps/rubrica/customer.png
-share/pixmaps/rubrica/dedicato.png
-share/pixmaps/rubrica/del.png
-share/pixmaps/rubrica/dictionary.png
-share/pixmaps/rubrica/email.png
-share/pixmaps/rubrica/emailme.png
-share/pixmaps/rubrica/export-menu.png
-share/pixmaps/rubrica/export.png
-share/pixmaps/rubrica/favorites.png
-share/pixmaps/rubrica/fax.png
-share/pixmaps/rubrica/few.png
-share/pixmaps/rubrica/file-info.png
-share/pixmaps/rubrica/file.png
-share/pixmaps/rubrica/filesett.png
-share/pixmaps/rubrica/folder.png
-share/pixmaps/rubrica/football.png
-share/pixmaps/rubrica/freebsd.png
-share/pixmaps/rubrica/friends.png
-share/pixmaps/rubrica/general-info.png
-share/pixmaps/rubrica/general.png
-share/pixmaps/rubrica/genius.png
-share/pixmaps/rubrica/heart.png
-share/pixmaps/rubrica/help.png
-share/pixmaps/rubrica/hi.png
-share/pixmaps/rubrica/hobby.png
-share/pixmaps/rubrica/holiday-cards.png
-share/pixmaps/rubrica/holiday.png
-share/pixmaps/rubrica/home.png
-share/pixmaps/rubrica/hot-contacts.png
-share/pixmaps/rubrica/image.png
-share/pixmaps/rubrica/import-menu.png
-share/pixmaps/rubrica/import.png
-share/pixmaps/rubrica/info.png
-share/pixmaps/rubrica/internet.png
-share/pixmaps/rubrica/keys.png
-share/pixmaps/rubrica/ledgreen.png
-share/pixmaps/rubrica/ledred.png
-share/pixmaps/rubrica/load.png
-share/pixmaps/rubrica/misc.png
-share/pixmaps/rubrica/mod-menu.png
-share/pixmaps/rubrica/mod.png
-share/pixmaps/rubrica/money.png
-share/pixmaps/rubrica/multimedia.png
-share/pixmaps/rubrica/none.png
-share/pixmaps/rubrica/normal.png
-share/pixmaps/rubrica/notes.png
-share/pixmaps/rubrica/other.png
-share/pixmaps/rubrica/penguin.png
-share/pixmaps/rubrica/personal.png
-share/pixmaps/rubrica/photo.png
-share/pixmaps/rubrica/pj.png
-share/pixmaps/rubrica/post-it.png
-share/pixmaps/rubrica/puzzle.png
-share/pixmaps/rubrica/question.png
-share/pixmaps/rubrica/remove-menu.png
-share/pixmaps/rubrica/remove.png
-share/pixmaps/rubrica/role.png
-share/pixmaps/rubrica/rubrica.jpg
-share/pixmaps/rubrica/rubrica.png
-share/pixmaps/rubrica/save.png
-share/pixmaps/rubrica/sbug.png
-share/pixmaps/rubrica/scalabria.png
-share/pixmaps/rubrica/schede.png
-share/pixmaps/rubrica/search.png
-share/pixmaps/rubrica/strategies.png
-share/pixmaps/rubrica/street.png
-share/pixmaps/rubrica/telefoni.png
-share/pixmaps/rubrica/telefono.png
-share/pixmaps/rubrica/testa.png
-share/pixmaps/rubrica/time.png
-share/pixmaps/rubrica/translation-info.png
-share/pixmaps/rubrica/translation.png
-share/pixmaps/rubrica/university.png
-share/pixmaps/rubrica/very-hi.png
-share/pixmaps/rubrica/view-column.png
-share/pixmaps/rubrica/view-info.png
-share/pixmaps/rubrica/view.png
-share/pixmaps/rubrica/word.png
-share/pixmaps/rubrica/work.png
-share/rubrica/nautilus-script/rubrica2html.py
-share/rubrica/script/rub2html.py
-share/rubrica/script/rub2rub.py
-share/rubrica/script/rub2txt.py
-share/rubrica/script/rub2vcard.py
-share/rubrica/stylesheet/rub2html.xsl
-share/rubrica/stylesheet/rub2rub.xsl
-share/rubrica/stylesheet/rub2txt.xsl
-share/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/rubrica/stylesheet
-@dirrm share/rubrica/script
-@dirrm share/rubrica/nautilus-script
-@dirrm share/rubrica
-@dirrm share/pixmaps/rubrica
+share/applications/rubrica2.desktop
+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/24x24/stuffs.png
+share/pixmaps/rubrica2/24x24/university.png
+share/pixmaps/rubrica2/48x48/all.png
+share/pixmaps/rubrica2/48x48/bussines.png
+share/pixmaps/rubrica2/48x48/chat.png
+share/pixmaps/rubrica2/48x48/contacts.png
+share/pixmaps/rubrica2/48x48/customer.png
+share/pixmaps/rubrica2/48x48/flame.png
+share/pixmaps/rubrica2/48x48/freebsd.png
+share/pixmaps/rubrica2/48x48/gnu.png
+share/pixmaps/rubrica2/48x48/hobbies.png
+share/pixmaps/rubrica2/48x48/keys.png
+share/pixmaps/rubrica2/48x48/lock.png
+share/pixmaps/rubrica2/48x48/mailbox.png
+share/pixmaps/rubrica2/48x48/net.png
+share/pixmaps/rubrica2/48x48/notes.png
+share/pixmaps/rubrica2/48x48/phone.png
+share/pixmaps/rubrica2/48x48/photo.png
+share/pixmaps/rubrica2/48x48/puzzle.png
+share/pixmaps/rubrica2/48x48/rate1.png
+share/pixmaps/rubrica2/48x48/rate2.png
+share/pixmaps/rubrica2/48x48/rate3.png
+share/pixmaps/rubrica2/48x48/rate4.png
+share/pixmaps/rubrica2/48x48/rate5.png
+share/pixmaps/rubrica2/48x48/role.png
+share/pixmaps/rubrica2/48x48/rubrica.png
+share/pixmaps/rubrica2/48x48/search-contact.png
+share/pixmaps/rubrica2/48x48/sport.png
+share/pixmaps/rubrica2/48x48/strategies.png
+share/pixmaps/rubrica2/48x48/tux.png
+share/pixmaps/rubrica2/scalable/card_photo.svg
+share/pixmaps/rubrica2/scalable/query.svg
+share/rubrica2/interface/CompanyCard.glade
+share/rubrica2/interface/GroupManager.glade
+share/rubrica2/interface/MainWindow.glade
+share/rubrica2/interface/Menu.glade
+share/rubrica2/interface/MenuTrash.glade
+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
+@dirrm share/pixmaps/rubrica2/48x48
+@dirrm share/pixmaps/rubrica2/24x24
+@dirrm share/pixmaps/rubrica2/22x22
+@dirrm share/pixmaps/rubrica2/16x16
+@dirrm share/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/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index e3111a060..cc10cfa94 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -31,6 +31,7 @@ CONFIGURE_ARGS=	--disable-tcl
 GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
+WANT_PERL=	yes
 
 MAN1=		xchat-gnome.1
 
@@ -80,10 +81,6 @@ PLIST_SUB+=	TCL="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	does not build on 4.X
-.endif
-
 .if defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 36ffb5e0c..538146276 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.96 2007/09/03 22:48:52 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.97 2007/09/17 18:42:14 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
@@ -43,8 +43,7 @@ GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
+.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0cd5d4c79..122b86fe4 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.149 2007/09/03 21:36:31 mezz Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.150 2007/09/17 18:24:31 marcus Exp $
 #
 
 PORTNAME=	evolution
@@ -93,8 +93,7 @@ PLIST_SUB+=	DBUS=""
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
+.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index ceb076a36..7179d5db6 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -41,10 +41,6 @@ MAN1=	kino.1 kino2raw.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=	does not compile on FreeBSD 4.x
-.endif
-
 .if defined(WITH_FFMPEG_KINO)
 MAN1+=	ffmpeg-kino.1
 .endif
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 27f925e51..26e4754a5 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -167,9 +167,6 @@ PLIST_SUB+=	KDE:="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/gg2.desktop
 	@${REINPLACE_CMD} -e 's| -ldl|| ; s|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/lib/Makefile.in
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/src/plugins/gadu_gadu/libgadu/lib/libgadu-config.h.in
-.endif
 
 post-install:
 .if (${HAVE_GNOME:Mgnomehier}!="")
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index 675004aff..72569d36a 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GMAKE=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=	gdmap.1
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 3c81eaf0c..4680b6821 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/galeon/Makefile,v 1.12 2007/05/19 21:36:25 marcus Exp $
+#    $MCom: ports/www/galeon/Makefile,v 1.13 2007/05/30 03:21:44 mezz Exp $
 #
 
 PORTNAME=	galeon
@@ -38,11 +38,10 @@ GCONF_SCHEMAS=	galeon.schemas
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
-.if ${OSVERSION} > 500000
 # Galeon does not build correctly in -CURRENT if -Werror is passed
 # to the compiler.
 NO_WERROR=	yes
-.endif
+
 # allow build with more warnings enabled
 .if defined(NO_WERROR)
 CONFIGURE_ARGS+=	--disable-werror
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 699c6595d..eeec6f004 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,7 +3,7 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#   $MCom: ports/www/kazehakase/Makefile,v 1.6 2007/08/07 03:31:38 mezz Exp $
+#   $MCom: ports/www/kazehakase/Makefile,v 1.7 2007/08/15 06:04:51 mezz Exp $
 #
 
 PORTNAME=	kazehakase
@@ -39,10 +39,6 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
-.if ${OSVERSION} < 500000
-IGNORE=Does not build
-.endif
-
 # !!! gtk-webcore higly experimental right now and not very stable !!!
 # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
 # on how to use gtk-webcore with kazehakase. and yes you still have to
diff --git a/www/opera/Makefile b/www/opera/Makefile
index b8f87798a..85e395cbf 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -62,10 +62,8 @@ QT_PRESENT=	off
 OPERA_TYPE=	1
 .elif ${OSVERSION} >= 600000
 OPERA_TYPE=	4
-.elif ${OSVERSION} >= 500000
-OPERA_TYPE=	3
 .else
-OPERA_TYPE=	1
+OPERA_TYPE=	3
 .endif
 
 .if ${OSVERSION} > 700000
@@ -87,7 +85,7 @@ OPERA_LIB=	static
 OPERA_TYPE=	1
 .endif
 
-.if ${OPERA_TYPE} == 1 && ${OSVERSION} >= 500000
+.if ${OPERA_TYPE} == 1
 LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .if ${OSVERSION} >= 600000
 LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x