>Number:         31052
>Category:       pkg
>Synopsis:       [patch] make chat/ser install docs in the correct place
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 24 03:30:00 +0000 2005
>Originator:     Matthew Luckie
>Release:        NetBSD 2.0.2
>Organization:
	
>Environment:
	
	
System: NetBSD spandex.plunket.luckie.org.nz 2.0.2 NetBSD 2.0.2 (spandex) #3: Thu Jun 23 22:31:40 NZST 2005 root@spandex:/usr/src/sys/arch/i386/compile/spandex i386
Architecture: i386
Machine: i386
>Description:

chat/ser put documentation in doc, not share/doc.

i changed Makefile.defs to install the docs in the correct place.  i
also removed the bit in the Makefile.defs file where it distinguished between
Linux and everything else.  i presume the man pages go in man/ on linux
systems running pkgsrc, too.

[mjl@spandex ser]$ pkglint
ERROR: PLIST:24: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:25: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:26: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:27: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:28: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:29: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:30: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:31: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:32: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:33: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:34: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:35: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:36: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:37: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:38: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:39: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:40: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:41: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:42: Documentation must be installed under share/doc, not doc.
ERROR: PLIST:43: Documentation must be installed under share/doc, not doc.
20 errors and 0 warnings found.

>How-To-Repeat:
N/A
>Fix:
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ser/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- PLIST	18 Jun 2005 05:57:05 -0000	1.3
+++ PLIST	24 Aug 2005 03:19:22 -0000
@@ -3,6 +3,26 @@ sbin/ser
 sbin/serctl
 sbin/ser_mysql.sh
 sbin/gen_ha1
+share/doc/ser/README
+share/doc/ser/README.cfg
+share/doc/ser/INSTALL
+share/doc/ser/README-MODULES
+share/doc/ser/AUTHORS
+share/doc/ser/README.acc
+share/doc/ser/README.auth
+share/doc/ser/README.exec
+share/doc/ser/README.im
+share/doc/ser/README.jabber
+share/doc/ser/README.maxfwd
+share/doc/ser/README.pike
+share/doc/ser/README.print
+share/doc/ser/README.registrar
+share/doc/ser/README.rr
+share/doc/ser/README.sl
+share/doc/ser/README.sms
+share/doc/ser/README.textops
+share/doc/ser/README.tm
+share/doc/ser/README.usrloc
 share/examples/ser/ser.cfg
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
@@ -21,28 +41,8 @@ lib/ser/modules/sms.so
 lib/ser/modules/textops.so
 lib/ser/modules/tm.so
 lib/ser/modules/usrloc.so
-doc/ser/README
-doc/ser/README.cfg
-doc/ser/INSTALL
-doc/ser/README-MODULES
-doc/ser/AUTHORS
-doc/ser/README.acc
-doc/ser/README.auth
-doc/ser/README.exec
-doc/ser/README.im
-doc/ser/README.jabber
-doc/ser/README.maxfwd
-doc/ser/README.pike
-doc/ser/README.print
-doc/ser/README.registrar
-doc/ser/README.rr
-doc/ser/README.sl
-doc/ser/README.sms
-doc/ser/README.textops
-doc/ser/README.tm
-doc/ser/README.usrloc
 man/man8/ser.8
 man/man5/ser.cfg.5
-@dirrm doc/ser
+@dirrm share/doc/ser
 @dirrm lib/ser/modules
 @dirrm lib/ser
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ser/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	18 Jun 2005 12:39:52 -0000	1.8
+++ distinfo	24 Aug 2005 03:19:22 -0000
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.8 2005/06/18 12:39
 SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
 RMD160 (ser-0.8.10_src.tar.gz) = f804e319d719a9e8b4146fc981bd403200b31d93
 Size (ser-0.8.10_src.tar.gz) = 931150 bytes
-SHA1 (patch-aa) = 9b91738bdfe999a5ac655073b4def3fcd16c43d7
+SHA1 (patch-aa) = eaf1127fe84b6a42ac6b10a69a3c91d167c94fff
 SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec
 SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d
 SHA1 (patch-ad) = ef31745ff25338cb8031074f3f9956f33cca04ce
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ser/patches/patch-aa,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aa
--- patches/patch-aa	18 Jun 2005 12:39:52 -0000	1.6
+++ patches/patch-aa	24 Aug 2005 03:19:22 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
+$NetBSD$
 
---- Makefile.defs.orig	2002-11-13 02:21:28.000000000 +0900
-+++ Makefile.defs	2005-06-18 21:32:06.000000000 +0900
+--- Makefile.defs.orig	2002-11-13 06:21:28.000000000 +1300
++++ Makefile.defs	2005-08-24 15:10:40.000000000 +1200
 @@ -16,7 +16,6 @@
  			-e s/armv4l/arm/)
  
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
  prefix = $(PREFIX)
  # install path is $(basedir) $(prefix) 
  # example:
-@@ -33,7 +32,8 @@
+@@ -33,19 +32,15 @@
  ut-prefix = $(basedir)$(prefix)
  
  # dirs
@@ -19,9 +19,15 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
 +eg-dir  = $(EGDIR)/
  bin-dir = sbin/
  modules-dir = lib/ser/modules/
- ifeq ($(OS), linux)
-@@ -45,7 +45,7 @@
- endif
+-ifeq ($(OS), linux)
+-	doc-dir = share/doc/ser/
+-	man-dir = share/man/
+-else
+-	doc-dir=doc/ser/
+-	man-dir=man/
+-endif
++doc-dir = share/doc/ser/
++man-dir = man/
  ut-prefix = bin/
  # target dirs for various stuff
 -cfg-target = $(prefix)/$(cfg-dir)
@@ -29,7 +35,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
  modules-target = $(prefix)/$(modules-dir)
  
  
-@@ -59,10 +59,10 @@
+@@ -59,10 +54,10 @@
  endif
  
  # INSTALL-CFG = $(INSTALL) -m 644
@@ -44,7 +50,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -446,6 +446,7 @@
+@@ -446,6 +441,7 @@
  endif
  
  endif #mode=release
@@ -52,7 +58,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
  
  
  #*FLAGS used for compiling the modules
-@@ -473,8 +474,10 @@
+@@ -473,8 +469,10 @@
  	DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN
  endif
  ifneq ($(OS), openbsd)
@@ -63,7 +69,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39
  
  
  #os specific stuff
-@@ -520,7 +523,7 @@
+@@ -520,7 +518,7 @@
  ifeq ($(OS), netbsd)
  	DEFS+=-DHAVE_SOCKADDR_SA_LEN
  	YACC=yacc

>Unformatted: