[pkgsrc/trunk]: pkgsrc/mail/libetpan libetpan: Resolve pkgconfig mess

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c753d2298a0
branches:  trunk
changeset: 432118:3c753d2298a0
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue May 19 10:13:49 2020 +0000

description:
libetpan: Resolve pkgconfig mess

diffstat:

 mail/libetpan/Makefile                     |   4 ++--
 mail/libetpan/distinfo                     |   3 +--
 mail/libetpan/patches/patch-libetpan.pc.in |  13 -------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diffs (49 lines):

diff -r c8ddb4a21965 -r 3c753d2298a0 mail/libetpan/Makefile
--- a/mail/libetpan/Makefile    Tue May 19 09:59:58 2020 +0000
+++ b/mail/libetpan/Makefile    Tue May 19 10:13:49 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2020/05/19 09:57:05 nia Exp $
+# $NetBSD: Makefile,v 1.64 2020/05/19 10:13:49 nia Exp $
 
 DISTNAME=      libetpan-1.9.4
 CATEGORIES=    mail
@@ -23,7 +23,7 @@
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
-PKGCONFIG_OVERRIDE+=   libetpan-config.in
+PKGCONFIG_OVERRIDE+=   libetpan.pc.in
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
diff -r c8ddb4a21965 -r 3c753d2298a0 mail/libetpan/distinfo
--- a/mail/libetpan/distinfo    Tue May 19 09:59:58 2020 +0000
+++ b/mail/libetpan/distinfo    Tue May 19 10:13:49 2020 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.23 2020/05/19 09:57:05 nia Exp $
+$NetBSD: distinfo,v 1.24 2020/05/19 10:13:49 nia Exp $
 
 SHA1 (libetpan-1.9.4.tar.gz) = cfdfe4329382a30afc5b540e258aaa950fabd25f
 RMD160 (libetpan-1.9.4.tar.gz) = cc1718182a677bc10aaab726ab0dc3d52de2e2f6
 SHA512 (libetpan-1.9.4.tar.gz) = 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
 Size (libetpan-1.9.4.tar.gz) = 5000025 bytes
 SHA1 (patch-configure.ac) = 9d1562b4dd016fb26372bb437e3f4a0749ab2592
-SHA1 (patch-libetpan.pc.in) = b977b0982e3f6d32722eec7222eb3c40476d4fc9
 SHA1 (patch-src_low-level_feed_newsfeed.c) = 962f2059bb13a8f9c40cb6845276ee52e3bcd937
diff -r c8ddb4a21965 -r 3c753d2298a0 mail/libetpan/patches/patch-libetpan.pc.in
--- a/mail/libetpan/patches/patch-libetpan.pc.in        Tue May 19 09:59:58 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-libetpan.pc.in,v 1.1 2020/05/19 09:57:05 nia Exp $
-
-Allow PKGCONFIG_OVERRIDE to work properly.
-
---- libetpan.pc.in.orig        2019-11-01 17:58:50.000000000 +0000
-+++ libetpan.pc.in
-@@ -6,5 +6,5 @@ libdir=@libdir@
- Name: libetpan
- Description: Libetpan C library.
- Version: @VERSION@
--Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
-+Libs: -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
- Cflags: -I${includedir}