kamailio: Don't use lib64 on pkgsrc

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Nov 30 20:30:09 2019 -0500
Changeset:	66fdb06e9ab391d982a9f5d68940c818847cff7e

Modified Files:
	kamailio/PLIST
	kamailio/distinfo
Added Files:
	kamailio/patches/patch-src_Makefile.defs

Log Message:
kamailio: Don't use lib64 on pkgsrc

The upstream build system assumes that on any `uname -a` with 64 in
the name, libs go in lib64.  This is wrong for NetBSD, and contrary to
pkgsrc norms even when building for Linux.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=66fdb06e9ab391d982a9f5d68940c818847cff7e

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

diffstat:
 kamailio/PLIST                           | 306 +++++++++++++++----------------
 kamailio/distinfo                        |   1 +
 kamailio/patches/patch-src_Makefile.defs |  21 +++
 3 files changed, 175 insertions(+), 153 deletions(-)

diffs:
diff --git a/kamailio/PLIST b/kamailio/PLIST
index 7bf95d49dc..3bdd7c9ad1 100644
--- a/kamailio/PLIST
+++ b/kamailio/PLIST
@@ -1,157 +1,157 @@
 @comment $NetBSD$
-lib64/kamailio/kamctl/dbtextdb/dbtextdb.py
-lib64/kamailio/kamctl/kamctl.base
-lib64/kamailio/kamctl/kamctl.ctlbase
-lib64/kamailio/kamctl/kamctl.dbtext
-lib64/kamailio/kamctl/kamctl.rpcfifo
-lib64/kamailio/kamctl/kamctl.ser
-lib64/kamailio/kamctl/kamctl.sqlbase
-lib64/kamailio/kamctl/kamdbctl.base
-lib64/kamailio/kamctl/kamdbctl.dbtext
-lib64/kamailio/libprint.so
-lib64/kamailio/libprint.so.1
-lib64/kamailio/libprint.so.1.2
-lib64/kamailio/libsrdb1.so
-lib64/kamailio/libsrdb1.so.1
-lib64/kamailio/libsrdb1.so.1.0
-lib64/kamailio/libsrdb2.so
-lib64/kamailio/libsrdb2.so.1
-lib64/kamailio/libsrdb2.so.1.0
-lib64/kamailio/libsrutils.so
-lib64/kamailio/libsrutils.so.1
-lib64/kamailio/libsrutils.so.1.0
-lib64/kamailio/libtrie.so
-lib64/kamailio/libtrie.so.1
-lib64/kamailio/libtrie.so.1.0
-lib64/kamailio/modules/acc.so
-lib64/kamailio/modules/acc_diameter.so
-lib64/kamailio/modules/alias_db.so
-lib64/kamailio/modules/app_jsdt.so
-lib64/kamailio/modules/app_sqlang.so
-lib64/kamailio/modules/async.so
-lib64/kamailio/modules/auth.so
-lib64/kamailio/modules/auth_db.so
-lib64/kamailio/modules/auth_diameter.so
-lib64/kamailio/modules/auth_xkeys.so
-lib64/kamailio/modules/avp.so
-lib64/kamailio/modules/avpops.so
-lib64/kamailio/modules/benchmark.so
-lib64/kamailio/modules/blst.so
-lib64/kamailio/modules/call_control.so
-lib64/kamailio/modules/call_obj.so
-lib64/kamailio/modules/carrierroute.so
-lib64/kamailio/modules/cfg_db.so
-lib64/kamailio/modules/cfg_rpc.so
-lib64/kamailio/modules/cfgt.so
-lib64/kamailio/modules/cfgutils.so
-lib64/kamailio/modules/corex.so
-lib64/kamailio/modules/counters.so
-lib64/kamailio/modules/ctl.so
-lib64/kamailio/modules/db2_ops.so
-lib64/kamailio/modules/db_cluster.so
-lib64/kamailio/modules/db_flatstore.so
-lib64/kamailio/modules/db_text.so
-lib64/kamailio/modules/debugger.so
-lib64/kamailio/modules/dialog.so
-lib64/kamailio/modules/dispatcher.so
-lib64/kamailio/modules/diversion.so
-lib64/kamailio/modules/dmq.so
-lib64/kamailio/modules/dmq_usrloc.so
-lib64/kamailio/modules/domain.so
-lib64/kamailio/modules/domainpolicy.so
-lib64/kamailio/modules/drouting.so
-lib64/kamailio/modules/enum.so
-lib64/kamailio/modules/evrexec.so
-lib64/kamailio/modules/exec.so
-lib64/kamailio/modules/group.so
-lib64/kamailio/modules/htable.so
-lib64/kamailio/modules/imc.so
-lib64/kamailio/modules/ipops.so
-lib64/kamailio/modules/jsonrpcs.so
-lib64/kamailio/modules/keepalive.so
-lib64/kamailio/modules/kemix.so
-lib64/kamailio/modules/kex.so
-lib64/kamailio/modules/log_custom.so
-lib64/kamailio/modules/malloc_test.so
-lib64/kamailio/modules/mangler.so
-lib64/kamailio/modules/matrix.so
-lib64/kamailio/modules/maxfwd.so
-lib64/kamailio/modules/mediaproxy.so
-lib64/kamailio/modules/mohqueue.so
-lib64/kamailio/modules/mqueue.so
-lib64/kamailio/modules/msilo.so
-lib64/kamailio/modules/msrp.so
-lib64/kamailio/modules/mtree.so
-lib64/kamailio/modules/nat_traversal.so
-lib64/kamailio/modules/nathelper.so
-lib64/kamailio/modules/nosip.so
-lib64/kamailio/modules/p_usrloc.so
-lib64/kamailio/modules/path.so
-lib64/kamailio/modules/pdb.so
-lib64/kamailio/modules/pdt.so
-lib64/kamailio/modules/permissions.so
-lib64/kamailio/modules/pike.so
-lib64/kamailio/modules/pipelimit.so
-lib64/kamailio/modules/prefix_route.so
-lib64/kamailio/modules/print.so
-lib64/kamailio/modules/print_lib.so
-lib64/kamailio/modules/pv.so
-lib64/kamailio/modules/qos.so
-lib64/kamailio/modules/ratelimit.so
-lib64/kamailio/modules/registrar.so
-lib64/kamailio/modules/rr.so
-lib64/kamailio/modules/rtimer.so
-lib64/kamailio/modules/rtjson.so
-lib64/kamailio/modules/rtpengine.so
-lib64/kamailio/modules/rtpproxy.so
-lib64/kamailio/modules/sanity.so
-lib64/kamailio/modules/sca.so
-lib64/kamailio/modules/sdpops.so
-lib64/kamailio/modules/seas.so
-lib64/kamailio/modules/secfilter.so
-lib64/kamailio/modules/sipcapture.so
-lib64/kamailio/modules/sipdump.so
-lib64/kamailio/modules/sipjson.so
-lib64/kamailio/modules/sipt.so
-lib64/kamailio/modules/siptrace.so
-lib64/kamailio/modules/siputils.so
-lib64/kamailio/modules/sl.so
-lib64/kamailio/modules/sms.so
-lib64/kamailio/modules/smsops.so
-lib64/kamailio/modules/speeddial.so
-lib64/kamailio/modules/sqlops.so
-lib64/kamailio/modules/ss7ops.so
-lib64/kamailio/modules/sst.so
-lib64/kamailio/modules/statistics.so
-lib64/kamailio/modules/statsc.so
-lib64/kamailio/modules/statsd.so
-lib64/kamailio/modules/stun.so
-lib64/kamailio/modules/tcpops.so
-lib64/kamailio/modules/textops.so
-lib64/kamailio/modules/textopsx.so
-lib64/kamailio/modules/timer.so
-lib64/kamailio/modules/tm.so
-lib64/kamailio/modules/tmrec.so
-lib64/kamailio/modules/tmx.so
-lib64/kamailio/modules/topoh.so
-lib64/kamailio/modules/topos.so
-lib64/kamailio/modules/tsilo.so
-lib64/kamailio/modules/uac.so
-lib64/kamailio/modules/uac_redirect.so
-lib64/kamailio/modules/uid_auth_db.so
-lib64/kamailio/modules/uid_avp_db.so
-lib64/kamailio/modules/uid_domain.so
-lib64/kamailio/modules/uid_gflags.so
-lib64/kamailio/modules/uid_uri_db.so
-lib64/kamailio/modules/uri_db.so
-lib64/kamailio/modules/userblacklist.so
-lib64/kamailio/modules/usrloc.so
-lib64/kamailio/modules/xhttp.so
-lib64/kamailio/modules/xhttp_prom.so
-lib64/kamailio/modules/xhttp_rpc.so
-lib64/kamailio/modules/xlog.so
-lib64/kamailio/modules/xmpp.so
-lib64/kamailio/modules/xprint.so
+lib/kamailio/kamctl/dbtextdb/dbtextdb.py
+lib/kamailio/kamctl/kamctl.base
+lib/kamailio/kamctl/kamctl.ctlbase
+lib/kamailio/kamctl/kamctl.dbtext
+lib/kamailio/kamctl/kamctl.rpcfifo
+lib/kamailio/kamctl/kamctl.ser
+lib/kamailio/kamctl/kamctl.sqlbase
+lib/kamailio/kamctl/kamdbctl.base
+lib/kamailio/kamctl/kamdbctl.dbtext
+lib/kamailio/libprint.so
+lib/kamailio/libprint.so.1
+lib/kamailio/libprint.so.1.2
+lib/kamailio/libsrdb1.so
+lib/kamailio/libsrdb1.so.1
+lib/kamailio/libsrdb1.so.1.0
+lib/kamailio/libsrdb2.so
+lib/kamailio/libsrdb2.so.1
+lib/kamailio/libsrdb2.so.1.0
+lib/kamailio/libsrutils.so
+lib/kamailio/libsrutils.so.1
+lib/kamailio/libsrutils.so.1.0
+lib/kamailio/libtrie.so
+lib/kamailio/libtrie.so.1
+lib/kamailio/libtrie.so.1.0
+lib/kamailio/modules/acc.so
+lib/kamailio/modules/acc_diameter.so
+lib/kamailio/modules/alias_db.so
+lib/kamailio/modules/app_jsdt.so
+lib/kamailio/modules/app_sqlang.so
+lib/kamailio/modules/async.so
+lib/kamailio/modules/auth.so
+lib/kamailio/modules/auth_db.so
+lib/kamailio/modules/auth_diameter.so
+lib/kamailio/modules/auth_xkeys.so
+lib/kamailio/modules/avp.so
+lib/kamailio/modules/avpops.so
+lib/kamailio/modules/benchmark.so
+lib/kamailio/modules/blst.so
+lib/kamailio/modules/call_control.so
+lib/kamailio/modules/call_obj.so
+lib/kamailio/modules/carrierroute.so
+lib/kamailio/modules/cfg_db.so
+lib/kamailio/modules/cfg_rpc.so
+lib/kamailio/modules/cfgt.so
+lib/kamailio/modules/cfgutils.so
+lib/kamailio/modules/corex.so
+lib/kamailio/modules/counters.so
+lib/kamailio/modules/ctl.so
+lib/kamailio/modules/db2_ops.so
+lib/kamailio/modules/db_cluster.so
+lib/kamailio/modules/db_flatstore.so
+lib/kamailio/modules/db_text.so
+lib/kamailio/modules/debugger.so
+lib/kamailio/modules/dialog.so
+lib/kamailio/modules/dispatcher.so
+lib/kamailio/modules/diversion.so
+lib/kamailio/modules/dmq.so
+lib/kamailio/modules/dmq_usrloc.so
+lib/kamailio/modules/domain.so
+lib/kamailio/modules/domainpolicy.so
+lib/kamailio/modules/drouting.so
+lib/kamailio/modules/enum.so
+lib/kamailio/modules/evrexec.so
+lib/kamailio/modules/exec.so
+lib/kamailio/modules/group.so
+lib/kamailio/modules/htable.so
+lib/kamailio/modules/imc.so
+lib/kamailio/modules/ipops.so
+lib/kamailio/modules/jsonrpcs.so
+lib/kamailio/modules/keepalive.so
+lib/kamailio/modules/kemix.so
+lib/kamailio/modules/kex.so
+lib/kamailio/modules/log_custom.so
+lib/kamailio/modules/malloc_test.so
+lib/kamailio/modules/mangler.so
+lib/kamailio/modules/matrix.so
+lib/kamailio/modules/maxfwd.so
+lib/kamailio/modules/mediaproxy.so
+lib/kamailio/modules/mohqueue.so
+lib/kamailio/modules/mqueue.so
+lib/kamailio/modules/msilo.so
+lib/kamailio/modules/msrp.so
+lib/kamailio/modules/mtree.so
+lib/kamailio/modules/nat_traversal.so
+lib/kamailio/modules/nathelper.so
+lib/kamailio/modules/nosip.so
+lib/kamailio/modules/p_usrloc.so
+lib/kamailio/modules/path.so
+lib/kamailio/modules/pdb.so
+lib/kamailio/modules/pdt.so
+lib/kamailio/modules/permissions.so
+lib/kamailio/modules/pike.so
+lib/kamailio/modules/pipelimit.so
+lib/kamailio/modules/prefix_route.so
+lib/kamailio/modules/print.so
+lib/kamailio/modules/print_lib.so
+lib/kamailio/modules/pv.so
+lib/kamailio/modules/qos.so
+lib/kamailio/modules/ratelimit.so
+lib/kamailio/modules/registrar.so
+lib/kamailio/modules/rr.so
+lib/kamailio/modules/rtimer.so
+lib/kamailio/modules/rtjson.so
+lib/kamailio/modules/rtpengine.so
+lib/kamailio/modules/rtpproxy.so
+lib/kamailio/modules/sanity.so
+lib/kamailio/modules/sca.so
+lib/kamailio/modules/sdpops.so
+lib/kamailio/modules/seas.so
+lib/kamailio/modules/secfilter.so
+lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipdump.so
+lib/kamailio/modules/sipjson.so
+lib/kamailio/modules/sipt.so
+lib/kamailio/modules/siptrace.so
+lib/kamailio/modules/siputils.so
+lib/kamailio/modules/sl.so
+lib/kamailio/modules/sms.so
+lib/kamailio/modules/smsops.so
+lib/kamailio/modules/speeddial.so
+lib/kamailio/modules/sqlops.so
+lib/kamailio/modules/ss7ops.so
+lib/kamailio/modules/sst.so
+lib/kamailio/modules/statistics.so
+lib/kamailio/modules/statsc.so
+lib/kamailio/modules/statsd.so
+lib/kamailio/modules/stun.so
+lib/kamailio/modules/tcpops.so
+lib/kamailio/modules/textops.so
+lib/kamailio/modules/textopsx.so
+lib/kamailio/modules/timer.so
+lib/kamailio/modules/tm.so
+lib/kamailio/modules/tmrec.so
+lib/kamailio/modules/tmx.so
+lib/kamailio/modules/topoh.so
+lib/kamailio/modules/topos.so
+lib/kamailio/modules/tsilo.so
+lib/kamailio/modules/uac.so
+lib/kamailio/modules/uac_redirect.so
+lib/kamailio/modules/uid_auth_db.so
+lib/kamailio/modules/uid_avp_db.so
+lib/kamailio/modules/uid_domain.so
+lib/kamailio/modules/uid_gflags.so
+lib/kamailio/modules/uid_uri_db.so
+lib/kamailio/modules/uri_db.so
+lib/kamailio/modules/userblacklist.so
+lib/kamailio/modules/usrloc.so
+lib/kamailio/modules/xhttp.so
+lib/kamailio/modules/xhttp_prom.so
+lib/kamailio/modules/xhttp_rpc.so
+lib/kamailio/modules/xlog.so
+lib/kamailio/modules/xmpp.so
+lib/kamailio/modules/xprint.so
 man/man5/kamailio.cfg.5
 man/man8/kamailio.8
 man/man8/kamcmd.8
diff --git a/kamailio/distinfo b/kamailio/distinfo
index 6512436b16..f436901ac4 100644
--- a/kamailio/distinfo
+++ b/kamailio/distinfo
@@ -4,5 +4,6 @@ SHA1 (kamailio-5.3.1_src.tar.gz) = 04e4f1dc636b1154b58515b05bb0162d163a8830
 RMD160 (kamailio-5.3.1_src.tar.gz) = 514f7b5e9416d39418f31912b04a28a08de99159
 SHA512 (kamailio-5.3.1_src.tar.gz) = ed9e8babfa3122eafa246012e4e7a31a0ee9f2393cc06c731d29dd9bde664a5f24c41a88cd28a65da5b3fe88eb6efc0a2443a5794d0ea41d321959d9380931f1
 Size (kamailio-5.3.1_src.tar.gz) = 12434594 bytes
+SHA1 (patch-src_Makefile.defs) = 833acf92ba9154ba17614382bb23a116ef97032a
 SHA1 (patch-src_lib_srdb1_db__ut.c) = ecdc2d3185e9497127a4662794a8ec779cb20165
 SHA1 (patch-utils_kamctl_kamdbctl) = 1c6289cb569de45dea6a71ad6f23de32757902d8
diff --git a/kamailio/patches/patch-src_Makefile.defs b/kamailio/patches/patch-src_Makefile.defs
new file mode 100644
index 0000000000..b60e869e7c
--- /dev/null
+++ b/kamailio/patches/patch-src_Makefile.defs
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/Makefile.defs.orig	2019-11-14 11:38:12.000000000 +0000
++++ src/Makefile.defs
+@@ -440,15 +440,7 @@ endif
+ 
+ $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
+ 
+-LIBDIR ?=
+-ifeq ($(LIBDIR),)
+-ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
+-ifeq ($(ARCHBSZ),64b)
+-	LIBDIR = lib64
+-else
+-	LIBDIR = lib
+-endif
+-endif
++LIBDIR = lib
+ 
+ # dirs
+ cfg_dir = etc/$(MAIN_NAME)/