From 9b881a5504026da067c375fec64f8a1fa4e3c758 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 17 Aug 2000 14:00:27 +0000
Subject: [PATCH] USE_PKGLIBTOOL -> USE_LIBTOOL Added hack to post-build since
 the package's libtool recognizes more switches for the install program than
 the default libtool.

---
 news/inn/Makefile         | 13 ++++++++++---
 news/inn/files/patch-sum  |  5 +++--
 news/inn/patches/patch-ac |  7 ++++---
 news/inn/patches/patch-ai | 22 ++++++++++++++++++++++
 news/inn/pkg/PLIST        |  4 +++-
 5 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 news/inn/patches/patch-ai

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 5a8fd735b5f5..6dc833460f54 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/03 13:44:53 veego Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/17 14:00:27 wiz Exp $
 
 DISTNAME=		inn-2.2.2
 CATEGORIES=		news
@@ -14,7 +14,7 @@ CONFLICTS+=		nntpclnt-*
 INN_DATA_DIR?=		/var/news
 
 USE_PERL5=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \
 			--mandir=${PREFIX}/man \
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \
 			--with-spool-dir=${INN_DATA_DIR}/spool
 CONFIGURE_ENV+=		_PATH_PERL=${LOCALBASE}/bin/perl
 
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -49,6 +48,14 @@ post-build:
 	       -e 's#@@PREFIX@@#${PREFIX}#g' \
 	        ${PKGDIR}/${FILE} >${WRKDIR}/${FILE}
 .endfor
+	for DIR in backends expire frontends innd innfeed lib nnrpd	\
+		storage; do \
+		${SED} -e 's#-b .OLD##' -e 's#-G#-g#' -e 's#-O#-o#'	\
+			${WRKSRC}/$$DIR/Makefile			\
+			> ${WRKSRC}/$$DIR/Makefile.patch;		\
+		${MV} ${WRKSRC}/$$DIR/Makefile.patch			\
+			${WRKSRC}/$$DIR/Makefile;			\
+	done
 
 pre-install:
 	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn
diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum
index ca880a4e2dbe..fe137c24b9d3 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,10 +1,11 @@
-$NetBSD: patch-sum,v 1.9 2000/07/03 13:46:41 veego Exp $
+$NetBSD: patch-sum,v 1.10 2000/08/17 14:00:28 wiz Exp $
 
 MD5 (patch-aa) = 9e4ea714841156fdbce9e9e2f2f1f600
 MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
-MD5 (patch-ac) = 32a496fefbf05b6ea710c5ca95fe7c3d
+MD5 (patch-ac) = 887964d4467a0e21365f5181fcc8d09d
 MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd
 MD5 (patch-ae) = 3c691a67a21fec92cc0f2c4197e3c9ed
 MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7
 MD5 (patch-ag) = d6962b6d0159854f7e8bd11b32b285f7
 MD5 (patch-ah) = 3a87d8d980c0beab113268d18388ecb5
+MD5 (patch-ai) = 6826b9e835b9157f22cd1dc4251d5810
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 2744e6a18483..01ed972bc07c 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,13 +1,14 @@
-$NetBSD: patch-ac,v 1.5 2000/07/03 13:46:43 veego Exp $
+$NetBSD: patch-ac,v 1.6 2000/08/17 14:00:28 wiz Exp $
 
 --- Makefile.global.in	Mon Dec 13 14:18:37 1999
 +++ Makefile.global.in	Mon Jul  3 11:31:41 2000
 @@ -40,7 +40,7 @@
  EXTRA_SRC = @EXTRA_SRC@
  
- OWNER		= -O @NEWSUSER@ -G @NEWSGRP@
+-OWNER		= -O @NEWSUSER@ -G @NEWSGRP@
++OWNER		= -o @NEWSUSER@ -g @NEWSGRP@
 -ROWNER		= -O @NEWSUSER@ -G uucp
-+ROWNER		= -O @NEWSUSER@ -G @NEWSGRP@
++ROWNER		= -o @NEWSUSER@ -g @NEWSGRP@
  NEWSGROUP	= @NEWSGRP@
  
  PATHNEWS = @prefix@
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
new file mode 100644
index 000000000000..e02ab67c1337
--- /dev/null
+++ b/news/inn/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2000/08/17 14:00:28 wiz Exp $
+
+--- installit.sh.orig	Mon Dec 13 14:18:37 1999
++++ installit.sh
+@@ -95,7 +95,7 @@
+ 	    ;;
+ 	esac
+ 	if ${ROOT} ; then
+-	    GROUP=`expr "$1" : '-g\(.*\)'`
++	    GROUP=`expr "$1" : '-G\(.*\)'`
+ 	    CHGROUPIT=true
+ 	fi
+ 	;;
+@@ -151,7 +151,7 @@
+ 	    ;;
+ 	esac
+ 	if ${ROOT} ; then
+-	    OWNER=`expr "$1" : '-o\(.*\)'`
++	    OWNER=`expr "$1" : '-O\(.*\)'`
+ 	    CHOWNIT=true
+ 	fi
+ 	;;
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 884d3c060129..1f6950dbd38f 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/02/27 22:51:42 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/08/17 14:00:29 wiz Exp $
 bin/inews
 etc/rc.d/innd.sh
 @exec mkdir -p %D/etc/nntp
@@ -105,8 +105,10 @@ inn/lib/innshellvars
 inn/lib/innshellvars.pl
 inn/lib/innshellvars.tcl
 inn/lib/libinn.a
+inn/lib/libinn.la
 inn/lib/libinn.so.2.0
 inn/lib/libstorage.a
+inn/lib/libstorage.la
 inn/lib/libstorage.so.2.0
 man/man1/convdate.1
 man/man1/getlist.1