Sync w/ FreeBSD ports tree.

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

5 files changed, 12 insertions, 44 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 75b6bd7c6..46839bcbd 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -31,11 +31,11 @@ MOZILLA=	firefox
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
-USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${LOCALBASE}/lib/${MOZILLA}
 GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
@@ -55,13 +55,4 @@ pre-everything::
 	@${ECHO_MSG} "  firefox       "
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		${FILESDIR}/devhelp.sh > ${WRKDIR}/devhelp.sh
-
-post-install:
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/devhelp.sh ${PREFIX}/etc/rc.d/000.devhelp.sh
-	@${LDCONFIG} -m ${LOCALBASE}/lib/${MOZILLA}
-
 .include <bsd.port.post.mk>
diff --git a/devel/devhelp/files/devhelp.sh b/devel/devhelp/files/devhelp.sh
deleted file mode 100755
index 676d01b65..000000000
--- a/devel/devhelp/files/devhelp.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/devel/devhelp/files/devhelp.sh,v 1.3 2006/02/20 20:46:54 dougb Exp $
-#
-# PROVIDE: devhelp
-# REQUIRE: ldconfig
-
-. /etc/rc.subr
-
-name=devhelp
-
-start_cmd=devhelp_start
-stop_cmd=:
-
-[ -z "$devhelp_libdir" ] && devhelp_libdir="%%PREFIX%%/lib/%%MOZILLA%%"
-
-devhelp_start() {
-    if [ -d "$devhelp_libdir" ]; then
-	/sbin/ldconfig -m "$devhelp_libdir"
-    fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index c9ff21e47..6f3906d57 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,5 +1,4 @@
 bin/devhelp
-etc/rc.d/000.devhelp.sh
 include/devhelp-1.0/devhelp/dh-base.h
 include/devhelp-1.0/devhelp/dh-book-tree.h
 include/devhelp-1.0/devhelp/dh-error.h
@@ -77,3 +76,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/gnome/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 2d0a2cbc5..3753d0401 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/libglademm24/Makefile,v 1.7 2006/07/25 06:47:27 mezz Exp $
 #
 
 PORTNAME=	libglademm
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.3
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/devel/libglademm24/pkg-plist b/devel/libglademm24/pkg-plist
index 9d4aa8a01..4aecc16a8 100644
--- a/devel/libglademm24/pkg-plist
+++ b/devel/libglademm24/pkg-plist
@@ -23,10 +23,10 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classes.html
-%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000.html
-%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001_dep.png
+%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001.html
+%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dirs.html
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.css
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.png
@@ -178,10 +178,10 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/doc/gnomemm-2.6 2> /dev/null || /usr/bin/true
+%%PORTDOCS%%@dirrmtry share/doc/gnomemm-2.6
 %%PORTDOCS%%@dirrm share/devhelp/books/libglademm-%%API_VERSION%%
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/devhelp/books 2> /dev/null || /usr/bin/true
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/devhelp 2> /dev/null || /usr/bin/true
+%%PORTDOCS%%@dirrmtry share/devhelp/books
+%%PORTDOCS%%@dirrmtry share/devhelp
 @dirrm lib/libglademm-%%API_VERSION%%/proc/m4
 @dirrm lib/libglademm-%%API_VERSION%%/proc
 @dirrm lib/libglademm-%%API_VERSION%%/include