summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjperkin <jperkin>2014-01-09 11:16:18 +0000
committerjperkin <jperkin>2014-01-09 11:16:18 +0000
commit99450b38f15fcff77b07da3df621ec67af265799 (patch)
treec5fae394a3bd8018f34468170bc25044e3c2a584 /misc
parent67360e6489a988cbf2890c8253d777647be50332 (diff)
downloadpkgsrc-99450b38f15fcff77b07da3df621ec67af265799.tar.gz
Fix libraries on SunOS. While here fix path to config file.
Bump PKGREVISION.
Diffstat (limited to 'misc')
-rw-r--r--misc/multitail/Makefile10
-rw-r--r--misc/multitail/distinfo4
-rw-r--r--misc/multitail/patches/patch-aa14
3 files changed, 21 insertions, 7 deletions
diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index 4bf4e840fd0..13c0e03f760 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 09:57:31 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/09 11:16:18 jperkin Exp $
#
DISTNAME= multitail-4.0.6
+PKGREVISION= 1
CATEGORIES= misc sysutils
MASTER_SITES= http://www.vanheusden.com/multitail/
EXTRACT_SUFX= .tgz
@@ -17,6 +18,13 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/multitail \
CONF_FILES= ${PREFIX:Q}/share/examples/multitail/multitail.conf \
${PKG_SYSCONFDIR:Q}/multitail.conf
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+= rm:-lutil
+LDFLAGS+= -lsocket -lnsl
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC:Q}/multitail ${DESTDIR}${PREFIX:Q}/bin/
${INSTALL_MAN} ${WRKSRC:Q}/multitail.1 ${DESTDIR}${PREFIX:Q}/man/man1/
diff --git a/misc/multitail/distinfo b/misc/multitail/distinfo
index 453ce44a306..d3aba9e69b9 100644
--- a/misc/multitail/distinfo
+++ b/misc/multitail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: distinfo,v 1.11 2014/01/09 11:16:18 jperkin Exp $
SHA1 (multitail-4.0.6.tgz) = f8c52ab48e85411c7cd1540509995bf2f4cfee25
RMD160 (multitail-4.0.6.tgz) = 9d1f6d4e705c09b6e69afc965d48428331721bcc
Size (multitail-4.0.6.tgz) = 124429 bytes
-SHA1 (patch-aa) = 2332d9ca96773becf21a1cb4f31998cb725cd586
+SHA1 (patch-aa) = cbb4882495421e2d6841fe95388bc2df3e7e8972
SHA1 (patch-ab) = 322dd8a1be8565f4038340986a483bfcc08e88df
SHA1 (patch-ac) = 67d4dd4c3a726c815c2044fe554262bb7fb094da
SHA1 (patch-ad) = 408bcae6f646c4dee713f3061f84ee4691daa123
diff --git a/misc/multitail/patches/patch-aa b/misc/multitail/patches/patch-aa
index c5ef7bf1c05..1578c05f72e 100644
--- a/misc/multitail/patches/patch-aa
+++ b/misc/multitail/patches/patch-aa
@@ -1,9 +1,15 @@
-$NetBSD: patch-aa,v 1.6 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2014/01/09 11:16:18 jperkin Exp $
---- Makefile.orig 2006-06-12 21:45:57.000000000 +0200
+Fix path to config file.
+
+--- Makefile.orig 2006-06-12 19:45:57.000000000 +0000
+++ Makefile
-@@ -4,7 +4,7 @@ DESTDIR=/
- CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+@@ -1,10 +1,10 @@
+ include version
+
+ DESTDIR=/
+-CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
++CONFIG_FILE=${PKG_SYSCONFDIR}/multitail.conf
DEBUG=-g # -D_DEBUG -W -pedantic # -pg #-fprofile-arcs
-LDFLAGS=-lpanel -lncurses -lutil -lm $(DEBUG)