net-snmp: do not store configure options; remove Perl module entries from PLIST

3 files changed, 25 insertions, 55 deletions

diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index ef6d92da4f4..ee67cf3481d 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2020/06/26 07:47:22 otis Exp $
+@comment $NetBSD: PLIST,v 1.29 2022/08/05 10:55:01 adam Exp $
 bin/agentxtrap
 ${PLIST.perl}bin/checkbandwidth
 bin/encode_keychange
@@ -274,39 +274,6 @@ lib/libnetsnmphelpers.la
 lib/libnetsnmpmibs.la
 lib/libnetsnmptrapd.la
 lib/libsnmp.la
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/Bundle/MakefileSubs.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/ASN.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/OID.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/TrapReceiver.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/Support.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/default_store.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/netsnmp_request_infoPtr.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/default_store.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SNMP.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Bundle/NetSNMP/.packlist
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/ASN/ASN.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/ASN/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/OID/OID.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/OID/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/TrapReceiver/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/agent.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/default_store/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/default_store/default_store.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/default_store/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/default_store/default_store.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SNMP/SNMP.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SNMP/autosplit.ix
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::ASN.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::OID.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::TrapReceiver.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::agent.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::agent::default_store.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::default_store.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::netsnmp_request_infoPtr.3
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SNMP.3
 man/man1/agentxtrap.1
 man/man1/encode_keychange.1
 man/man1/fixproc.1
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 919456ee263..308926c5725 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2021/10/26 11:06:06 nia Exp $
+$NetBSD: distinfo,v 1.99 2022/08/05 10:55:01 adam Exp $
 
 BLAKE2s (net-snmp-5.8.tar.gz) = 3baf340de546040278255692e48b57bab2bbfb595572bcd814fb53be3fd6f65c
 SHA512 (net-snmp-5.8.tar.gz) = 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
@@ -22,7 +22,7 @@ SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321
 SHA1 (patch-am) = d01e8a93f6e766cedfdc324efd69168f71aac76f
 SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
 SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
-SHA1 (patch-configure) = 9f0c9f936881608842d71a4ee90875dd9a3fe533
+SHA1 (patch-configure) = 7dd273e74c2d0a4cfc90398ba7804e0416d6f4f1
 SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
 SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9
 SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0
diff --git a/net/net-snmp/patches/patch-configure b/net/net-snmp/patches/patch-configure
index 1a0cad88a9a..4ff52e539f1 100644
--- a/net/net-snmp/patches/patch-configure
+++ b/net/net-snmp/patches/patch-configure
@@ -1,12 +1,26 @@
-$NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
+$NetBSD: patch-configure,v 1.2 2022/08/05 10:55:01 adam Exp $
 
+- Do not store configure options as these might be polluted with workdir.
 - Fix configure to look for des_cbc_encrypt in -ldes
 - Fix configure on FreeBSD 10 & newer
 - Fix portability bug in test
 
---- configure.orig	2018-07-16 15:33:50.000000000 +0100
-+++ configure	2020-06-12 00:08:19.741995000 +0100
-@@ -13923,7 +13923,7 @@
+--- configure.orig	2018-07-16 14:33:50.000000000 +0000
++++ configure
+@@ -3312,10 +3312,10 @@ ac_config_headers="$ac_config_headers in
+ #
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define NETSNMP_CONFIGURE_OPTIONS "$ac_configure_args"
++#define NETSNMP_CONFIGURE_OPTIONS ""
+ _ACEOF
+ 
+-CONFIGURE_OPTIONS="\"$ac_configure_args\""
++CONFIGURE_OPTIONS="\"\""
+ 
+ 
+ #
+@@ -13923,7 +13923,7 @@ fi
        hardcode_shlibpath_var=no
        ;;
  
@@ -15,7 +29,7 @@ $NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
        ld_shlibs=no
        ;;
  
-@@ -14917,7 +14917,7 @@
+@@ -14917,7 +14917,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -24,7 +38,7 @@ $NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
    dynamic_linker=no
    ;;
  
-@@ -14928,7 +14928,7 @@
+@@ -14928,7 +14928,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -33,7 +47,7 @@ $NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -19637,7 +19637,7 @@
+@@ -19637,7 +19637,7 @@ if test "x$PARTIALTARGETOS" = "xmingw32"
  fi
  
  # Linux systemd
@@ -42,7 +56,7 @@ $NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
    other_src_list="$other_src_list sd-daemon.c"
    other_objs_list="$other_objs_list sd-daemon.o"
    other_lobjs_list="$other_lobjs_list sd-daemon.lo"
-@@ -22715,6 +22715,81 @@
+@@ -22715,6 +22715,81 @@ fi
  ##
  #########################################
  
@@ -124,14 +138,3 @@ $NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
  ##
  #   Compilation-related
  ##
-@@ -32360,6 +32435,10 @@
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;