diff options
Diffstat (limited to 'devel/oaf')
-rw-r--r-- | devel/oaf/Makefile | 4 | ||||
-rw-r--r-- | devel/oaf/files/patch-aa | 2 | ||||
-rw-r--r-- | devel/oaf/files/patch-test_oaf-slay.in | 11 | ||||
-rw-r--r-- | devel/oaf/pkg-plist | 8 |
4 files changed, 7 insertions, 18 deletions
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 257f9d4f1425..61923ed8ef2e 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/oaf/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $ +# $MCom: ports/devel/oaf/Makefile,v 1.5 2007/05/19 21:36:06 marcus Exp $ # PORTNAME= oaf PORTVERSION= 0.6.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/oaf/0.6 diff --git a/devel/oaf/files/patch-aa b/devel/oaf/files/patch-aa index e0caa8a8ec2c..ebcf5703b8b4 100644 --- a/devel/oaf/files/patch-aa +++ b/devel/oaf/files/patch-aa @@ -11,4 +11,4 @@ $FreeBSD$ +confexecdir = $(sysconfdir) confexec_DATA = oafConf.sh - m4datadir = $(prefix)/share/aclocal + m4datadir = $(datadir)/aclocal diff --git a/devel/oaf/files/patch-test_oaf-slay.in b/devel/oaf/files/patch-test_oaf-slay.in deleted file mode 100644 index bd5f51b50cc0..000000000000 --- a/devel/oaf/files/patch-test_oaf-slay.in +++ /dev/null @@ -1,11 +0,0 @@ ---- test/oaf-slay.in.orig Fri Oct 18 15:33:00 2002 -+++ test/oaf-slay.in Fri Oct 18 15:33:12 2002 -@@ -51,7 +51,7 @@ - - # get OAF files - # --@oaf_dirs = ( "@prefix@/share/oaf" ); -+@oaf_dirs = ( "@datadir@/oaf" ); - foreach $dir (split(':', $ENV{'OAF_INFO_PATH'})) { - if (-d $dir) { - push @oaf_dirs, $dir; diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist index b118520c8419..518eac48143b 100644 --- a/devel/oaf/pkg-plist +++ b/devel/oaf/pkg-plist @@ -26,10 +26,8 @@ lib/liboaf.la lib/liboaf.so lib/liboaf.so.0 share/aclocal/oaf.m4 -share/gnome/idl/oaf-factory.idl -share/gnome/idl/oaf.idl -share/gnome/oaf/OAF_naming-service.oaf -share/gnome/oaf/empty.oafinfo +share/idl/oaf-factory.idl +share/idl/oaf.idl share/locale/az/LC_MESSAGES/oaf.mo share/locale/bg/LC_MESSAGES/oaf.mo share/locale/da/LC_MESSAGES/oaf.mo @@ -61,6 +59,8 @@ share/locale/tr/LC_MESSAGES/oaf.mo share/locale/uk/LC_MESSAGES/oaf.mo share/locale/zh_CN/LC_MESSAGES/oaf.mo share/locale/zh_TW/LC_MESSAGES/oaf.mo +%%DATADIR%%/OAF_naming-service.oaf +%%DATADIR%%/empty.oafinfo @dirrm include/liboaf @dirrm etc/oaf @unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true |