From c24ffb6ffabe77cb3b44adfb7a68af55ec088b0c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 29 Jul 2003 16:27:26 +0000
Subject: Apply patch pkgsrc-wip/newsx/news.inn.patch: Install header files for
 other packages (in particular, newsx). Bump PKGREVISION. Approved by tron@

---
 news/inn/Makefile         |  8 +++++++-
 news/inn/Makefile.common  |  6 ++++++
 news/inn/PLIST            |  7 ++++++-
 news/inn/buildlink2.mk    | 25 +++++++++++++++++++++++++
 news/inn/distinfo         |  3 ++-
 news/inn/patches/patch-ai | 13 +++++++++++++
 6 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 news/inn/Makefile.common
 create mode 100644 news/inn/buildlink2.mk
 create mode 100644 news/inn/patches/patch-ai

(limited to 'news')

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 5ec4130379c..473df172117 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2003/07/21 17:11:54 martti Exp $
+# $NetBSD: Makefile,v 1.47 2003/07/29 16:27:26 wiz Exp $
 
 DISTNAME=		inn-${INN_VERSION}
+PKGREVISION=		1
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.sunet.se/pub/news/nntp/inn/ \
@@ -109,6 +110,11 @@ pre-install:
 post-install:
 	${RM} -f ${PREFIX}/bin/inews
 	${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
+	${INSTALL_DATA_DIR} ${PREFIX}/include/inn
+	${INSTALL_DATA} ${WRKSRC}/include/config.h ${PREFIX}/include/inn
+	${INSTALL_DATA} ${WRKSRC}/include/dbz.h ${PREFIX}/include/inn
+	${INSTALL_DATA} ${WRKSRC}/include/libinn.h ${PREFIX}/include/inn
+	${INSTALL_DATA} ${WRKSRC}/include/storage.h ${PREFIX}/include/inn
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	for FILE in `ls -1 ${WRKSRC}/samples/* |			\
 		     ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do	\
diff --git a/news/inn/Makefile.common b/news/inn/Makefile.common
new file mode 100644
index 00000000000..f0e99a5d46c
--- /dev/null
+++ b/news/inn/Makefile.common
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.common,v 1.1 2003/07/29 16:27:26 wiz Exp $
+#
+
+INN_PREFIX?=	${PREFIX}/inn
+INN_DATA_DIR?=	/var/news
+INN_SPOOL?=	${INN_DATA_DIR}/spool
diff --git a/news/inn/PLIST b/news/inn/PLIST
index c4be50a2dde..4118403d403 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2002/09/29 10:39:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/29 16:27:26 wiz Exp $
 bin/inews
 etc/rc.d/innd
+include/inn/config.h
+include/inn/dbz.h
+include/inn/libinn.h
+include/inn/storage.h
 inn/bin/actmerge
 inn/bin/actsync
 inn/bin/actsyncd
@@ -260,3 +264,4 @@ share/examples/inn/version.pl
 @dirrm inn/bin/auth
 @dirrm inn/bin
 @dirrm inn
+@dirrm include/inn
diff --git a/news/inn/buildlink2.mk b/news/inn/buildlink2.mk
new file mode 100644
index 00000000000..091d6ef384c
--- /dev/null
+++ b/news/inn/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/07/29 16:27:26 wiz Exp $
+#
+# This Makefile fragment is included by packages that use inn.
+#
+# This file was created automatically using createbuildlink 2.5.
+#
+
+.if !defined(INN_BUILDLINK2_MK)
+INN_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			inn
+BUILDLINK_DEPENDS.inn?=		inn>=2.3.4
+BUILDLINK_PKGSRCDIR.inn?=		../../news/inn
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.inn=inn
+BUILDLINK_PREFIX.inn_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.inn=          inn/lib/libinn.a
+BUILDLINK_FILES.inn+=         inn/lib/libstorage.a
+BUILDLINK_FILES.inn+=         include/inn/*
+
+BUILDLINK_TARGETS+=	inn-buildlink
+
+inn-buildlink: _BUILDLINK_USE
+
+.endif	# INN_BUILDLINK2_MK
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 92cc1a27cdc..5939f2db559 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/05/13 11:56:44 tron Exp $
+$NetBSD: distinfo,v 1.8 2003/07/29 16:27:27 wiz Exp $
 
 SHA1 (inn-2.3.5.tar.gz) = 9fff9ce731f8f62d768eaa4a742bb8d91960b59d
 Size (inn-2.3.5.tar.gz) = 1421702 bytes
@@ -12,3 +12,4 @@ SHA1 (patch-ae) = cdf3e9783c13a4481bb8ff48bdc5fb0bddf68f62
 SHA1 (patch-af) = 49ce07f3d2b2cc17b91f48ee4e9c7044695a2919
 SHA1 (patch-ag) = 1087421f2a893c030d5299850b0ad0c4f6a37ecd
 SHA1 (patch-ah) = f7ed6195149c03551a5e5d7bb1d5a24bc71bb48c
+SHA1 (patch-ai) = d09c6dd78677f0336f9f4b2911287b4e6f69ebd2
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
new file mode 100644
index 00000000000..ba1f000a5ae
--- /dev/null
+++ b/news/inn/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2003/07/29 16:27:27 wiz Exp $
+
+--- include/dbz.h.orig	2002-12-23 00:00:38.000000000 +0100
++++ include/dbz.h
+@@ -42,7 +42,7 @@ typedef struct {
+     BOOL             nonblock;
+ } dbzoptions;
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(PACKED)
+ #define PACKED __attribute__ ((packed))
+ #else
+ #if !defined(PACKED)
-- 
cgit v1.2.3