chat/psybnc: fix accidentally hard-coded PREFIX

3 files changed, 9 insertions, 15 deletions

diff --git a/chat/psybnc/Makefile b/chat/psybnc/Makefile
index 8c30693f478..a34e1b151b3 100644
--- a/chat/psybnc/Makefile
+++ b/chat/psybnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/12/28 11:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/25 19:13:12 rillig Exp $
 
 DISTNAME=	psyBNC-2.4BETA2
 PKGNAME=	psybnc-2.4b2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psybnc/}
 
@@ -30,12 +30,6 @@ SUBST_FILES.prefix=	tools/autoconf.c
 SUBST_VARS.prefix=	PREFIX
 SUBST_STAGE.prefix=	pre-configure
 
-SUBST_CLASSES+=		openssl
-SUBST_FILES.openssl=	makefile.out
-SUBST_SED.openssl=	-e "s|/usr/bin/openssl|openssl|g"
-SUBST_SED.openssl=	-e "s|req -new|req -new -batch|g"
-SUBST_STAGE.openssl=	post-configure
-
 INSTALLATION_DIRS=	bin share/examples/psybnc
 INSTALLATION_DIRS+=	share/doc/psybnc
 
diff --git a/chat/psybnc/distinfo b/chat/psybnc/distinfo
index fa201aef33c..a17b8a251f3 100644
--- a/chat/psybnc/distinfo
+++ b/chat/psybnc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2019/12/28 11:19:53 wiz Exp $
+$NetBSD: distinfo,v 1.5 2020/04/25 19:13:12 rillig 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) = 59b825b841d7db3d83de3520324711179dbb5878
+SHA1 (patch-ac) = 01344f74ba219b257934adda6c9b48d31d65aa6b
diff --git a/chat/psybnc/patches/patch-ac b/chat/psybnc/patches/patch-ac
index f332d694bbd..aafc67b807b 100644
--- a/chat/psybnc/patches/patch-ac
+++ b/chat/psybnc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2019/12/28 11:19:53 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2020/04/25 19:13:12 rillig Exp $
 
 Add pkgsrc path to openssl.
 Don't bother creating SSL keys, they are not installed anyway and should
@@ -11,7 +11,7 @@ be created on the target system.
      system(sysbuf);
  #else
 -    system(CC " tools/chkssl.c -I/usr/local/ssl/include -L/usr/local/ssl/lib -lssl -lcrypto -o tools/chkssl" DN);
-+    system(CC " tools/chkssl.c -I/usr/pkg/include -L/usr/pkg/lib -lssl -lcrypto -o tools/chkssl" DN);
++    system(CC " tools/chkssl.c -I@PREFIX@/include -L@PREFIX@/lib -lssl -lcrypto -o tools/chkssl" DN);
  #endif
      return checkcmp();
  }
@@ -19,7 +19,7 @@ be created on the target system.
  	"/usr/sbin/openssl",
  	"/usr/local/bin/openssl",
  	"/usr/local/ssl/bin/openssl",
-+	"/usr/pkg/bin/openssl",
++	"@PREFIX@/bin/openssl",
  	NULL
      };
  #endif
@@ -28,7 +28,7 @@ be created on the target system.
  	    printf("Yes.\n");
  	    strcpy(sslopt,"-DHAVE_SSL ");
 -	    strcpy(ssllib,"-L/usr/local/ssl/lib -lssl -lcrypto ");
-+	    strcpy(ssllib,"-L/usr/pkg/lib -lssl -lcrypto ");
++	    strcpy(ssllib,"-L@PREFIX@/lib -lssl -lcrypto ");
  	}
  #else
  	if(strlen(SSLPATH)+13<sizeof(mbuf))
@@ -51,7 +51,7 @@ be created on the target system.
  	fprintf(makefile,"INCLUDE = -I./src/ -I. -I%sinclude %s %s\n", SSLPATH, mysqlheaders, dnsinc);
  #else
 -	fprintf(makefile,"INCLUDE = -I./src/ -I. -I/usr/local/ssl/include %s %s\n", mysqlheaders, dnsinc);
-+	fprintf(makefile,"INCLUDE = -I./src/ -I. -I/usr/pkg/include %s %s\n", mysqlheaders, dnsinc);
++	fprintf(makefile,"INCLUDE = -I./src/ -I. -I@PREFIX@/include %s %s\n", mysqlheaders, dnsinc);
  #endif
      else
  	fprintf(makefile,"INCLUDE = -I./src/ -I. %s %s\n", mysqlheaders, dnsinc);