Honour PKG_SYSCONFDIR. Bump PKGREVISION to 4.

While here, note in the PLIST where shared directories are removed.

6 files changed, 78 insertions, 4 deletions

diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index c7eb7db312e..e8d12031590 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/02/17 22:13:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/17 22:40:30 jmmv Exp $
 #
 
 DISTNAME=		gnopernicus-0.7.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnopernicus/0.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,11 +16,26 @@ DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+PKG_SYSCONFSUBDIR=	gnopernicus
+OWN_DIRS+=		${PKG_SYSCONFDIR}/translation_tables
+EGDIR=			${PREFIX}/share/examples/gnopernicus
+
+CONF_FILES=		${EGDIR}/translation_tables/de.a2b \
+			${PKG_SYSCONFDIR}/translation_tables/de.a2b
+CONF_FILES+=		${EGDIR}/translation_tables/en_US.a2b \
+			${PKG_SYSCONFDIR}/translation_tables/en_US.a2b
+CONF_FILES+=		${EGDIR}/translation_tables/es.a2b \
+			${PKG_SYSCONFDIR}/translation_tables/es.a2b
+CONF_FILES+=		${EGDIR}/translation_tables/sv.a2b \
+			${PKG_SYSCONFDIR}/translation_tables/sv.a2b
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=		USE_INET6
diff --git a/x11/gnopernicus/PLIST b/x11/gnopernicus/PLIST
index dacaeb3ae33..b9c682450ac 100644
--- a/x11/gnopernicus/PLIST
+++ b/x11/gnopernicus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/30 17:56:40 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/17 22:40:30 jmmv Exp $
 bin/brlmonitor
 bin/gnopernicus
 bin/srcore
@@ -51,6 +51,10 @@ lib/gnopernicus-1.0/libsrutil.so.1
 lib/gnopernicus-1.0/libsrutil.so.1.0
 lib/pkgconfig/gnopernicus-1.0.pc
 share/applications/gnopernicus.desktop
+share/examples/gnopernicus/translation_tables/de.a2b
+share/examples/gnopernicus/translation_tables/en_US.a2b
+share/examples/gnopernicus/translation_tables/es.a2b
+share/examples/gnopernicus/translation_tables/sv.a2b
 share/gconf/schemas/brlmonitor.schemas
 share/gconf/schemas/gnopernicus.schemas
 share/gconf/schemas/remote.schemas
@@ -118,6 +122,7 @@ share/omf/gnopernicus/brlmonitor-C.omf
 share/omf/gnopernicus/gnopernicus-C.omf
 share/pixmaps/gnopernicus.png
 @dirrm share/omf/gnopernicus
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnopernicus/glade/gnopi_files/User_Properties
 @dirrm share/gnopernicus/glade/gnopi_files/Speech_Settings
 @dirrm share/gnopernicus/glade/gnopi_files/Screen_Review
@@ -131,7 +136,18 @@ share/pixmaps/gnopernicus.png
 @dirrm share/gnopernicus/glade/gnopi_files/Braille_Settings
 @dirrm share/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings
 @dirrm share/gnopernicus/glade/gnopi_files
+@dirrm share/gnopernicus/glade
 @dirrm share/gnopernicus/fonts
+@dirrm share/gnopernicus
+@dirrm share/gnome/help/gnopernicus/C
+@dirrm share/gnome/help/gnopernicus
+@dirrm share/gnome/help/brlmonitor/C
+@dirrm share/gnome/help/brlmonitor
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/examples/gnopernicus/translation_tables
+@dirrm share/examples/gnopernicus
+@comment in gnome2-dirs: @dirrm share/applications
 @dirrm lib/gnopernicus-1.0
 @dirrm include/gnopernicus-1.0/libsrutil
 @dirrm include/gnopernicus-1.0/libsrs
@@ -140,3 +156,4 @@ share/pixmaps/gnopernicus.png
 @dirrm include/gnopernicus-1.0/libmag
 @dirrm include/gnopernicus-1.0/libke
 @dirrm include/gnopernicus-1.0/libbrl
+@dirrm include/gnopernicus-1.0
diff --git a/x11/gnopernicus/distinfo b/x11/gnopernicus/distinfo
index 6c25b774671..5dd679e9fa1 100644
--- a/x11/gnopernicus/distinfo
+++ b/x11/gnopernicus/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/30 17:56:40 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/02/17 22:40:30 jmmv Exp $
 
 SHA1 (gnopernicus-0.7.1.tar.bz2) = b976f0c7f31dec4d8064f59945b7214fa255754c
 Size (gnopernicus-0.7.1.tar.bz2) = 1069645 bytes
 SHA1 (patch-aa) = 1561518740619f38136b77562526c2624c151c1f
+SHA1 (patch-ab) = c391a7cd3a1d3586235f90b6c684a951ed9c71b6
+SHA1 (patch-ac) = de230e1c4cfddbd2acc3c925e86eb517b1dbdd11
+SHA1 (patch-ad) = 46fbb70bbe4085f16d89b3f29af04cd30115eb0c
diff --git a/x11/gnopernicus/patches/patch-ab b/x11/gnopernicus/patches/patch-ab
new file mode 100644
index 00000000000..f967237c89f
--- /dev/null
+++ b/x11/gnopernicus/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/02/17 22:40:30 jmmv Exp $
+
+--- gnopi/Makefile.in.orig	2003-10-07 16:31:27.000000000 +0200
++++ gnopi/Makefile.in
+@@ -238,7 +238,7 @@ LDADD = ../srutil/libsrutil.la  \
+ 	$(GNOPI_LIBS)
+ 
+ 
+-translationdir = $(sysconfdir)/gnopernicus-1.0/translation_tables
++translationdir = $(datadir)/examples/gnopernicus/translation_tables
+ translation_DATA = de.a2b	\
+ 	           es.a2b	\
+ 	           sv.a2b	\
diff --git a/x11/gnopernicus/patches/patch-ac b/x11/gnopernicus/patches/patch-ac
new file mode 100644
index 00000000000..442e447c0bc
--- /dev/null
+++ b/x11/gnopernicus/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/02/17 22:40:30 jmmv Exp $
+
+--- srcore/Makefile.in.orig	2003-10-07 16:31:26.000000000 +0200
++++ srcore/Makefile.in
+@@ -174,7 +174,7 @@ INCLUDES = -I$(srcdir)                  
+ 	   -I$(top_srcdir)/magnifier/libmag   	\
+ 	   -I$(top_srcdir)/srutil             	\
+ 	   -DGNOPERNICUSLOCALEDIR=\""$(gnopernicuslocaledir)"\" \
+-	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \
++	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/translation_tables/\" \
+ 	   $(SRCORE_CFLAGS)  			\
+ 	   -DG_LOG_DOMAIN=\"gnopernicus\"
+ 
diff --git a/x11/gnopernicus/patches/patch-ad b/x11/gnopernicus/patches/patch-ad
new file mode 100644
index 00000000000..4f0a0910a0a
--- /dev/null
+++ b/x11/gnopernicus/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/02/17 22:40:30 jmmv Exp $
+
+--- braille/libbrl/Makefile.in.orig	2003-10-07 16:31:15.000000000 +0200
++++ braille/libbrl/Makefile.in
+@@ -171,7 +171,7 @@ libbrl_LTLIBRARIES = libbrl.la
+ INCLUDES = -I$(top_builddir)			\
+ 	   -I$(top_srcdir)/srutil		\
+ 	   -I$(top_srcdir)/srconf/libsrconf 	\
+-	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \
++	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/translation_tables/\" \
+ 	   -DTTYNAME0=\"$(TTYNAME_0)\" -DTTYNAME1=\"$(TTYNAME_1)\" \
+ 	   $(BRLTTY_ACTIVE)			\
+ 	   $(LIBBRL_CFLAGS) 			\