CVS commit: pkgsrc/chat/psybnc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Apr 25 19:13:12 UTC 2020

Modified Files:
        pkgsrc/chat/psybnc: Makefile distinfo
        pkgsrc/chat/psybnc/patches: patch-ac

Log Message:
chat/psybnc: fix accidentally hard-coded PREFIX


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/psybnc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/psybnc/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/psybnc/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/psybnc/Makefile
diff -u pkgsrc/chat/psybnc/Makefile:1.7 pkgsrc/chat/psybnc/Makefile:1.8
--- pkgsrc/chat/psybnc/Makefile:1.7     Sat Dec 28 11:19:53 2019
+++ pkgsrc/chat/psybnc/Makefile Sat Apr 25 19:13:12 2020
@@ -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
 

Index: pkgsrc/chat/psybnc/distinfo
diff -u pkgsrc/chat/psybnc/distinfo:1.4 pkgsrc/chat/psybnc/distinfo:1.5
--- pkgsrc/chat/psybnc/distinfo:1.4     Sat Dec 28 11:19:53 2019
+++ pkgsrc/chat/psybnc/distinfo Sat Apr 25 19:13:12 2020
@@ -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

Index: pkgsrc/chat/psybnc/patches/patch-ac
diff -u pkgsrc/chat/psybnc/patches/patch-ac:1.3 pkgsrc/chat/psybnc/patches/patch-ac:1.4
--- pkgsrc/chat/psybnc/patches/patch-ac:1.3     Sat Dec 28 11:19:53 2019
+++ pkgsrc/chat/psybnc/patches/patch-ac Sat Apr 25 19:13:12 2020
@@ -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);