pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/52555: [patch] net/host: fix FTBFS on SunOS



>Number:         52555
>Category:       pkg
>Synopsis:       [patch] net/host: fix FTBFS on SunOS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 18 19:35:00 +0000 2017
>Originator:     Matteo Cypriani
>Release:        SunOS 5.11
>Environment:
System: SunOS indiana 5.11 illumos-202ca9ae46 i86pc i386 i86pc
Architecture: i86pc
>Description:
net/host fails to build on OpenIndiana because u_int16_t is not defined. I'm
not sure my patch is the best solution, but it works for me.

The patch also adds a LICENSE field to the Makefile and comments the patches,
to make pkglint happier.

>Fix:
>From 8ee032891fa8a74f5d1242d48377a3149ccbcf53 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <mcy%lm7.fr@localhost>
Date: Mon, 18 Sep 2017 18:17:18 -0400
Subject: [PATCH] net/host: fix FTBFS on SunOS

Adds patches/patch-ad.

While there, make the package a little more pkglint-free:
- Add LICENSE.
- Comment uncommented patches.
---
 net/host/Makefile         |  2 ++
 net/host/distinfo         |  5 +++--
 net/host/patches/patch-ab |  1 +
 net/host/patches/patch-ac |  1 +
 net/host/patches/patch-ad | 13 +++++++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 net/host/patches/patch-ad

diff --git a/net/host/Makefile b/net/host/Makefile
index 13dfa4439b4..aac2ce761f1 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,12 +1,14 @@
 # $NetBSD: Makefile,v 1.31 2016/07/09 11:50:36 rillig Exp $
 
 DISTNAME=	host-20070128
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.planix.com/pub/Planix/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.weird.com/~woods/projects/host.html
 COMMENT=	Powerful DNS query and testing tool
+LICENSE=	original-bsd
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 NO_CONFIGURE=		yes
diff --git a/net/host/distinfo b/net/host/distinfo
index f2ef883b829..c29a4950055 100644
--- a/net/host/distinfo
+++ b/net/host/distinfo
@@ -5,5 +5,6 @@ RMD160 (host-20070128.tar.gz) = 955635175ee12882d59a10756d16af44ec62f9e7
 SHA512 (host-20070128.tar.gz) = 80f4d4878af40c93f33cc6c43d19b01415e66b3939b157544b4921b9f0b83ef1baa9ce0e151d951417be92973c4b038df80efae974be4bca2bbce43299db65fc
 Size (host-20070128.tar.gz) = 152347 bytes
 SHA1 (patch-aa) = a4f4511b550cd832199b7bae950e34d3205dfa24
-SHA1 (patch-ab) = f28b6f9b67f77dd295e081e0200d7604d136406b
-SHA1 (patch-ac) = 35cf473a23b32b2f13f46bc6faba826c1ea3ae7c
+SHA1 (patch-ab) = 79db2b33ebbff11b68fe3218285efd4d014eb12e
+SHA1 (patch-ac) = d4aa199c7077f3de86654998a39766770beb39fa
+SHA1 (patch-ad) = 6790b9ddc01e22082ad0207b1811a78493cc6365
diff --git a/net/host/patches/patch-ab b/net/host/patches/patch-ab
index b42ba3c57f2..3ddfb53013c 100644
--- a/net/host/patches/patch-ab
+++ b/net/host/patches/patch-ab
@@ -1,5 +1,6 @@
 $NetBSD: patch-ab,v 1.6 2013/07/21 12:28:32 shattered Exp $
 
+Remove obsolete LDFLAG.
 --- Makefile.BSD.orig	2004-08-12 22:30:04.000000000 +0200
 +++ Makefile.BSD
 @@ -167,7 +169,6 @@ __GNULD__ ?= 1
diff --git a/net/host/patches/patch-ac b/net/host/patches/patch-ac
index d224c3c3552..1a21a811370 100644
--- a/net/host/patches/patch-ac
+++ b/net/host/patches/patch-ac
@@ -1,5 +1,6 @@
 $NetBSD: patch-ac,v 1.4 2006/10/03 14:25:55 schwarz Exp $
 
+Irix support.
 --- host.h.orig	2006-10-03 15:54:29.000000000 +0200
 +++ host.h	2006-10-03 15:55:13.000000000 +0200
 @@ -151,7 +151,7 @@
diff --git a/net/host/patches/patch-ad b/net/host/patches/patch-ad
new file mode 100644
index 00000000000..d7c09cd92a2
--- /dev/null
+++ b/net/host/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Fix FTBFS on SunOS.
+--- port.h~	lun. sept. 18 17:23:25 2017
++++ port.h	lun. sept. 18 17:23:39 2017
+@@ -498,3 +498,7 @@
+ #if !__GNUC_PREREQ__(2, 5) && !defined(__attribute__)
+ # define __attribute__(x)	/* delete __attribute__ if non-gcc or old gcc */
+ #endif
++
++#ifdef sun
++# define u_int16_t uint16_t
++#endif
-- 
2.13.5


Home | Main Index | Thread Index | Old Index