Make this package install its configuration file under the examples tree

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.

4 files changed, 38 insertions, 13 deletions

diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index 1ad7a7cb41c..c6084a1e540 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:09:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/23 08:03:02 jmmv Exp $
 #
 
 DISTNAME=	libutf-2.10
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.westley.demon.co.uk/src/
 
@@ -13,4 +14,10 @@ GNU_CONFIGURE=	# defined
 USE_LIBTOOL=	# defined
 ALL_TARGET=	tst
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR=		${PREFIX}/share/examples/libutf
+CONF_FILES=	${EGDIR}/langcoll.utf ${PKG_SYSCONFDIR}/langcoll.utf
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libutf/PLIST b/misc/libutf/PLIST
index 7ac5d8c0fc6..96a91d74f57 100644
--- a/misc/libutf/PLIST
+++ b/misc/libutf/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:42 zuntum Exp $
-etc/langcoll.utf
+@comment $NetBSD: PLIST,v 1.2 2002/12/23 08:03:02 jmmv Exp $
 include/ure.h
 include/utf.h
 lib/libutf.a
@@ -9,3 +8,5 @@ lib/libutf.so.2
 lib/libutf.so.2.10
 man/man3/ure.3
 man/man3/utf.3
+share/examples/libutf/langcoll.utf
+@dirrm share/examples/libutf
diff --git a/misc/libutf/distinfo b/misc/libutf/distinfo
index 94639dd0d4d..c045d67accf 100644
--- a/misc/libutf/distinfo
+++ b/misc/libutf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:15 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/12/23 08:03:03 jmmv Exp $
 
 SHA1 (libutf-2.10.tar.gz) = 8dd0f6873112deaa5b5bf2a0554e28f9d8d4ddda
 Size (libutf-2.10.tar.gz) = 55099 bytes
-SHA1 (patch-aa) = 74848da73b79be65f725aba9b4277cd83d86912f
+SHA1 (patch-aa) = 13ed8cf7d011e10f207d0d95a9d033b41251be44
diff --git a/misc/libutf/patches/patch-aa b/misc/libutf/patches/patch-aa
index a87968ec53b..53673d0c7b0 100644
--- a/misc/libutf/patches/patch-aa
+++ b/misc/libutf/patches/patch-aa
@@ -1,10 +1,18 @@
-$NetBSD: patch-aa,v 1.1 1998/09/09 15:01:09 agc Exp $
+$NetBSD: patch-aa,v 1.2 2002/12/23 08:03:04 jmmv Exp $
 
-Patches to use NetBSD's libtool
+Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
 
---- Makefile.in.orig	Mon Oct 20 13:51:34 1997
-+++ Makefile.in	Wed Sep  9 15:44:06 1998
-@@ -26,14 +26,14 @@
+--- Makefile.in.orig	Mon Oct 20 14:51:34 1997
++++ Makefile.in
+@@ -9,6 +9,7 @@ LIBDIR= $(exec_prefix)/lib
+ INCDIR= $(prefix)/include
+ MANDIR= $(prefix)/man
+ ETCDIR= $(prefix)/etc
++EGDIR= $(prefix)/share/examples/libutf
+ 
+ # SVR4, I hate you. What ****idiot**** dreamed this up????
+ # Yeah, like all csh or rc users need this crap...
+@@ -26,31 +27,38 @@ INSTALL_DATA= @INSTALL_DATA@
  RANLIB= @RANLIB@
  
  $(LIBS) : $(OBJS)
@@ -15,13 +23,22 @@ Patches to use NetBSD's libtool
  	ci -l ure.c ure.h urelang.c utf.c utf.h
  	
  install: $(LIBS)
- 	$(srcdir)/mkinstalldirs $(LIBDIR) $(INCDIR) $(ETCDIR) $(MANDIR)/man3
+-	$(srcdir)/mkinstalldirs $(LIBDIR) $(INCDIR) $(ETCDIR) $(MANDIR)/man3
 -	$(INSTALL_DATA) $(LIBS) $(LIBDIR) ; $(RANLIB) $(LIBDIR)/$(LIBS)
++	$(srcdir)/mkinstalldirs $(LIBDIR) $(INCDIR) $(EGDIR) $(MANDIR)/man3
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${PREFIX}/lib
  	$(INSTALL_DATA) $(srcdir)/ure.h $(INCDIR)
  	$(INSTALL_DATA) $(srcdir)/utf.h $(INCDIR)
- 	$(INSTALL_DATA) $(srcdir)/langcoll.utf $(ETCDIR)
-@@ -47,10 +47,17 @@
+-	$(INSTALL_DATA) $(srcdir)/langcoll.utf $(ETCDIR)
++	$(INSTALL_DATA) $(srcdir)/langcoll.utf $(EGDIR)
+ 	$(INSTALL_DATA) $(srcdir)/utf.3 $(MANDIR)/man3
+ 	$(INSTALL_DATA) $(srcdir)/ure.3 $(MANDIR)/man3
+ 
+ uninstall:
+ 	rm -f $(LIBDIR)/libure.a
+ 	rm -f $(LIBDIR)/$(LIBS) 
+-	rm -f $(ETCDIR)/langcoll.utf
++	rm -f $(EGDIR)/langcoll.utf
  	rm -f $(INCDIR)/ure.h $(INCDIR)/urelang.h $(INCDIR)/utf.h
  
  gurep: gurep.o $(LIBS)