Sun Aug 17 10:03:22 2008 UTC ()
Remove the utils subdir from the build as this only contains the make_class
script which, according to the author, is not needed if you don't modify
sources.  This means we can drop the DEPENDS on scsh which will fix
PR #39346.
PKGREVISION++


(adrianp)
diff -r1.9 -r1.10 pkgsrc/sysutils/libol/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/libol/PLIST
diff -r1.5 -r1.6 pkgsrc/sysutils/libol/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/libol/patches/patch-aa

cvs diff -r1.9 -r1.10 pkgsrc/sysutils/libol/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/libol/Makefile 2007/12/02 13:04:15 1.9
+++ pkgsrc/sysutils/libol/Makefile 2008/08/17 10:03:22 1.10
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2007/12/02 13:04:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2008/08/17 10:03:22 adrianp Exp $
2 2
3DISTNAME= libol-0.3.18 3DISTNAME= libol-0.3.18
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5PKGREVISION= 1 5PKGREVISION= 2
6MASTER_SITES= http://www.balabit.com/downloads/libol/0.3/ 6MASTER_SITES= http://www.balabit.com/downloads/libol/0.3/
7 7
8MAINTAINER= adrianp@NetBSD.org 8MAINTAINER= adrianp@NetBSD.org
9HOMEPAGE= http://www.balabit.com/network-security/syslog-ng/ 9HOMEPAGE= http://www.balabit.com/network-security/syslog-ng/
10COMMENT= Support library for syslog-ng 10COMMENT= Support library for syslog-ng
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13 13
14DEPENDS+= scsh-[0-9]*:../../shells/scsh 
15 
16GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
17USE_LIBTOOL= YES 15USE_LIBTOOL= YES
18 16
19.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/libol/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/libol/PLIST 2004/09/22 08:09:54 1.2
+++ pkgsrc/sysutils/libol/PLIST 2008/08/17 10:03:22 1.3
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/08/17 10:03:22 adrianp Exp $
2bin/libol-config 2bin/libol-config
3bin/make_class 
4include/libol/abstract_io.h 3include/libol/abstract_io.h
5include/libol/abstract_io.h.x 4include/libol/abstract_io.h.x
6include/libol/alist.h 5include/libol/alist.h
7include/libol/alist.h.x 6include/libol/alist.h.x
8include/libol/command.h 7include/libol/command.h
9include/libol/command.h.x 8include/libol/command.h.x
10include/libol/format.h 9include/libol/format.h
11include/libol/gc.h 10include/libol/gc.h
12include/libol/io.h 11include/libol/io.h
13include/libol/io.h.x 12include/libol/io.h.x
14include/libol/io_commands.h 13include/libol/io_commands.h
15include/libol/io_commands.h.x 14include/libol/io_commands.h.x
16include/libol/jpoll.h 15include/libol/jpoll.h

cvs diff -r1.5 -r1.6 pkgsrc/sysutils/libol/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/libol/distinfo 2006/04/27 19:55:44 1.5
+++ pkgsrc/sysutils/libol/distinfo 2008/08/17 10:03:22 1.6
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.5 2006/04/27 19:55:44 adrianp Exp $ 1$NetBSD: distinfo,v 1.6 2008/08/17 10:03:22 adrianp Exp $
2 2
3SHA1 (libol-0.3.18.tar.gz) = 8460daeb01b3439c3adc10a2d8b9acfa1d3ed39a 3SHA1 (libol-0.3.18.tar.gz) = 8460daeb01b3439c3adc10a2d8b9acfa1d3ed39a
4RMD160 (libol-0.3.18.tar.gz) = 143040ace3f8653b6be75adac0c3c4767dc5c88c 4RMD160 (libol-0.3.18.tar.gz) = 143040ace3f8653b6be75adac0c3c4767dc5c88c
5Size (libol-0.3.18.tar.gz) = 345794 bytes 5Size (libol-0.3.18.tar.gz) = 345794 bytes
 6SHA1 (patch-aa) = f717e5f8444000e3cd92b27f558ea1e6b2915673

File Added: pkgsrc/sysutils/libol/patches/patch-aa
$NetBSD: patch-aa,v 1.1 2008/08/17 10:03:22 adrianp Exp $

--- Makefile.in.orig	2006-03-27 15:45:16.000000000 +0100
+++ Makefile.in
@@ -133,7 +133,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
-SUBDIRS = utils src
+SUBDIRS = src
 
 bin_SCRIPTS = libol-config