Wed Jan 27 22:26:39 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.2 -r1.3 pkgsrc/sysutils/oak/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/oak/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/oak/patches/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/oak/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/oak/Makefile 2007/11/04 03:46:01 1.2
+++ pkgsrc/sysutils/oak/Makefile 2010/01/27 22:26:39 1.3
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1# $NetBSD: Makefile,v 1.2 2007/11/04 03:46:01 gendalia Exp $ 1# $NetBSD: Makefile,v 1.3 2010/01/27 22:26:39 joerg Exp $
2# 2#
3 3
4DISTNAME= oak-1.5.0 4DISTNAME= oak-1.5.0
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://www.ktools.org/dist/oak/ 6MASTER_SITES= http://www.ktools.org/dist/oak/
7 7
8MAINTAINER= jdw-pkgsrc@menelos.com 8MAINTAINER= jdw-pkgsrc@menelos.com
9HOMEPAGE= http://www.ktools.org/dist/oak/ 9HOMEPAGE= http://www.ktools.org/dist/oak/
10COMMENT= System log reporting tool 10COMMENT= System log reporting tool
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
13USE_TOOLS+= gmake 15USE_TOOLS+= gmake
14GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
15BUILD_TARGET= 17BUILD_TARGET=
16 18
17RCD_SCRIPTS= oak 19RCD_SCRIPTS= oak
18CONF_FILES= ${PREFIX}/share/examples/oak/oak.conf ${PKG_SYSCONFDIR}/oak.conf 20CONF_FILES= ${PREFIX}/share/examples/oak/oak.conf ${PKG_SYSCONFDIR}/oak.conf
19 21
 22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/oak
 23
20post-install: 24post-install:
21 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oak 25 ${INSTALL_DATA} ${FILESDIR}/oak.conf* ${DESTDIR}${PREFIX}/share/examples/oak/
22 ${INSTALL_DATA} ${FILESDIR}/oak.conf* ${PREFIX}/share/examples/oak/ 26 ${INSTALL_DATA} ${FILESDIR}/oak.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
23 ${INSTALL_DATA} ${FILESDIR}/oak.1 ${PREFIX}/${PKGMANDIR}/man1/ 
24 27
25.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/oak/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/oak/distinfo 2007/11/03 14:28:21 1.1.1.1
+++ pkgsrc/sysutils/oak/distinfo 2010/01/27 22:26:39 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2007/11/03 14:28:21 rillig Exp $ 1$NetBSD: distinfo,v 1.2 2010/01/27 22:26:39 joerg Exp $
2 2
3SHA1 (oak-1.5.0.tar.gz) = cbfb413d0d6fcd16a7684b586c19ca481e060077 3SHA1 (oak-1.5.0.tar.gz) = cbfb413d0d6fcd16a7684b586c19ca481e060077
4RMD160 (oak-1.5.0.tar.gz) = b1ec46d5f5c0453b07b501d368196e7d884b150e 4RMD160 (oak-1.5.0.tar.gz) = b1ec46d5f5c0453b07b501d368196e7d884b150e
5Size (oak-1.5.0.tar.gz) = 31034 bytes 5Size (oak-1.5.0.tar.gz) = 31034 bytes
6SHA1 (patch-aa) = 4dba7d09f70786340881437dca77a99f0a731647 6SHA1 (patch-aa) = f6b6dfb8d50be8f9a918d2dbf88450d90973b16b
7SHA1 (patch-ab) = b202613feea1d6d9b538bbc1d34db6c64884c34c 7SHA1 (patch-ab) = b202613feea1d6d9b538bbc1d34db6c64884c34c
8SHA1 (patch-ac) = ce53cf83a7a1e3cb55bb12141a8f5fe744b1cacd 8SHA1 (patch-ac) = ce53cf83a7a1e3cb55bb12141a8f5fe744b1cacd
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/oak/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/oak/patches/patch-aa 2007/11/03 14:28:21 1.1.1.1
+++ pkgsrc/sysutils/oak/patches/patch-aa 2010/01/27 22:26:39 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/11/03 14:28:21 rillig Exp $ 1$NetBSD: patch-aa,v 1.2 2010/01/27 22:26:39 joerg Exp $
2 2
3--- Makefile.in 2005-02-27 12:54:53.000000000 -0600 3--- Makefile.in 2005-02-27 12:54:53.000000000 -0600
4+++ Makefile.in 2006-02-04 14:36:44.000000000 -0600 4+++ Makefile.in 2006-02-04 14:36:44.000000000 -0600
5@@ -1,3 +1,5 @@ 5@@ -1,3 +1,5 @@
6+prefix=@prefix@ 6+prefix=@prefix@
7+exec_prefix=@exec_prefix@ 7+exec_prefix=@exec_prefix@
8 CC=@CC@ 8 CC=@CC@
9 CFLAGS=-g -Wall 9 CFLAGS=-g -Wall
10 OBJS=action.o matchline.o oak.o queuelist.o fire.o queue.o util.o list.o global.o readconfig.o text.o queue_entry.o string.o 10 OBJS=action.o matchline.o oak.o queuelist.o fire.o queue.o util.o list.o global.o readconfig.o text.o queue_entry.o string.o
11@@ -7,7 +7,7 @@ 11@@ -7,7 +7,7 @@
12 $(CC) -o oak $(OBJS) $(LIBS) 12 $(CC) -o oak $(OBJS) $(LIBS)
13  13
14 install:  14 install:
15- ./install-sh -c oak /usr/local/bin/ 15- ./install-sh -c oak /usr/local/bin/
16+ ./install-sh -c oak @bindir@/ 16+ ${BSD_INSTALL_PROGRAM} oak ${DESTDIR}@bindir@/
17  17
18 clean: 18 clean:
19 $(RM) *~ *.o oak 19 $(RM) *~ *.o oak