From 874548163ed9aaba445395ca920acb13aa81ec18 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 28 Dec 2019 11:19:53 +0000
Subject: psybnc: update to 2.4b2nb1.

Honor CFLAGS and LDFLAGS. Fixes RELRO build.
---
 chat/psybnc/Makefile         |  4 ++--
 chat/psybnc/distinfo         |  4 ++--
 chat/psybnc/patches/patch-ac | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'chat')

diff --git a/chat/psybnc/Makefile b/chat/psybnc/Makefile
index 3e75b896ddc..8c30693f478 100644
--- a/chat/psybnc/Makefile
+++ b/chat/psybnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2019/11/02 22:18:25 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.7 2019/12/28 11:19:53 wiz Exp $
 
 DISTNAME=	psyBNC-2.4BETA2
 PKGNAME=	psybnc-2.4b2
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psybnc/}
 
diff --git a/chat/psybnc/distinfo b/chat/psybnc/distinfo
index e1ff9418d00..fa201aef33c 100644
--- a/chat/psybnc/distinfo
+++ b/chat/psybnc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2016/12/15 23:46:48 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/12/28 11:19:53 wiz Exp $
 
 SHA1 (psyBNC-2.4BETA2.tar.gz) = 6af7b3a89857213fdcca05deeeedd0303fb614bf
 RMD160 (psyBNC-2.4BETA2.tar.gz) = 053d09539341ebe9936a50a80b35bd9849f70eb1
 SHA512 (psyBNC-2.4BETA2.tar.gz) = cb92d4273dd8547f22df7bd9fd3a2e50a14a40d18eecea8438e4a27259156de65986a588f0470c022e9ca3b372e1c74f3cf5429c0673254c580b6b30e2c80e53
 Size (psyBNC-2.4BETA2.tar.gz) = 1061094 bytes
 SHA1 (patch-aa) = 61b46a7180926d56fb0b56c9c56320695962176b
-SHA1 (patch-ac) = 62b0d9a0a4e0a8ed9417d1646de0dfc4bd3a92e6
+SHA1 (patch-ac) = 59b825b841d7db3d83de3520324711179dbb5878
diff --git a/chat/psybnc/patches/patch-ac b/chat/psybnc/patches/patch-ac
index ff8e5079aa5..f332d694bbd 100644
--- a/chat/psybnc/patches/patch-ac
+++ b/chat/psybnc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2016/12/15 23:46:48 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2019/12/28 11:19:53 wiz Exp $
 
 Add pkgsrc path to openssl.
 Don't bother creating SSL keys, they are not installed anyway and should
@@ -32,7 +32,21 @@ be created on the target system.
  	}
  #else
  	if(strlen(SSLPATH)+13<sizeof(mbuf))
-@@ -625,7 +626,7 @@ int main()
+@@ -614,18 +615,18 @@ int main()
+     fprintf(makefile,"SRC	= src/\n");
+ 
+ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) 
+-    fprintf(makefile,"CFLAGS  = -O -Wall -Wno-pointer-sign -ggdb\n");
++    fprintf(makefile,"CFLAGS  += -O -Wall -Wno-pointer-sign -ggdb\n");
+ #else
+-    fprintf(makefile,"CFLAGS  = -O -Wall -ggdb\n");
++    fprintf(makefile,"CFLAGS  += -O -Wall -ggdb\n");
+ #endif
+ 
+-    fprintf(makefile,"LIBS    = -lm %s %s %s %s\n", socklib, ssllib, dnslib, mysqllib); /* math lib needed for snprintf of ap */
++    fprintf(makefile,"LIBS    = $(LDFLAGS) -lm %s %s %s %s\n", socklib, ssllib, dnslib, mysqllib); /* math lib needed for snprintf of ap */
+ 
+     if(ssl==0)
  #ifdef SSLPATH
  	fprintf(makefile,"INCLUDE = -I./src/ -I. -I%sinclude %s %s\n", SSLPATH, mysqlheaders, dnsinc);
  #else
-- 
cgit v1.2.3