<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b917af8b3488039532227a371b6cc2136b80cb3e">https://github.com/macports/macports-ports/commit/b917af8b3488039532227a371b6cc2136b80cb3e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b917af8b3488039532227a371b6cc2136b80cb3e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 18 01:57:24 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> bitlbee: Update to 3.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64860
</span>---
irc/bitlbee/Portfile | 17 ++--
irc/bitlbee/files/patch-Makefiles.diff | 177 +++------------------------------
irc/bitlbee/files/patch-configure.diff | 13 +--
3 files changed, 28 insertions(+), 179 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bitlbee/Portfile b/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fd62e5b04d..2e799c1b8fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,13 @@
</span> PortSystem 1.0
name bitlbee
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9a02e95c5fd8c3bd43edf1c6e25dfe4f5bdc0b35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f15de46f29b46bf1e39fc50bdf4515e71b17f551f3955094c5da792d962107e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 534961
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories irc net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2
maintainers nomaintainer
description An IRC to other chat networks gateway
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +21,6 @@ long_description bitlbee is an IRC server that can connect to other IM \
</span> homepage https://www.bitlbee.org/
master_sites https://get.bitlbee.org/src/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f7c3c6154d3c28cb1e48ccb5f86dbb9141795cea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
depends_lib port:gettext \
port:gnutls \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,8 @@ configure.env ARCHFLAGS=[get_canonical_archflags ld]
</span> configure.args --config=${prefix}/var/lib/bitlbee/ \
--ssl=gnutls \
--otr=0 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --purple=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --purple=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --verbose=1
</span>
configure.universal_args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +57,7 @@ variant otr description {Off-the-Record messaging} {
</span> depends_lib-append port:libotr
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant purple description {Add libopurple support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant purple description {Add libpurple support} {
</span> configure.args-replace --purple=0 --purple=1
depends_lib-append port:libpurple
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bitlbee/files/patch-Makefiles.diff b/irc/bitlbee/files/patch-Makefiles.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a049af5262c..8fd062a1540 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bitlbee/files/patch-Makefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bitlbee/files/patch-Makefiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2017-11-18 20:19:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,24 +166,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OTR_PI): %.so: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Building plugin $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Building plugin skype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): Makefile Makefile.settings config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OUTFILE): $(objects) $(subdirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(firstword $(STRIP)), \#)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Stripping $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @-$(STRIP) $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(STRIP) $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile 2017-11-18 20:23:52.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add ARCHFLAGS to LFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile 2022-04-18 01:39:54.000000000 -0500
</span> @@ -14,6 +14,7 @@
# [SH] Program variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
</span>
+LFLAGS += $(ARCHFLAGS)
LFLAGS += -r
# [SH] Phony targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,12 +36,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib.o: $(objects) $(subdirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking lib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o lib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o lib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): ../Makefile.settings Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/Makefile 2017-11-18 20:25:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- protocols/Makefile.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ protocols/Makefile 2022-04-18 01:39:54.000000000 -0500
</span> @@ -24,6 +24,7 @@
# Expansion of variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,23 +19,8 @@
</span> LFLAGS += -r
# [SH] Phony targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,12 +49,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protocols.o: $(objects) $(subdirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking protocols.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): ../Makefile.settings Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/jabber/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/jabber/Makefile 2017-11-18 20:28:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- protocols/jabber/Makefile.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ protocols/jabber/Makefile 2022-04-18 01:39:54.000000000 -0500
</span> @@ -14,6 +14,7 @@
# [SH] Program variables
objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,74 +29,8 @@
</span> LFLAGS += -r
# [SH] Phony targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +38,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jabber_mod.o: $(objects)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking jabber_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/msn/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/msn/Makefile 2017-11-18 20:29:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [SH] Program variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objects = msn.o msn_util.o ns.o soap.o tables.o gw.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LFLAGS += $(ARCHFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS += -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [SH] Phony targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +38,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msn_mod.o: $(objects)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking msn_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o msn_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/oscar/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/oscar/Makefile 2017-11-18 20:34:12.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,12 +9,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include ../../Makefile.settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef _SRCDIR_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _SRCDIR_ := $(_SRCDIR_)protocols/oscar/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS += -I$(_SRCDIR_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = -I$(_SRCDIR_) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [SH] Program variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LFLAGS += $(ARCHFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS += -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [SH] Phony targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,10 +39,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- oscar_mod.o: $(objects)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking oscar_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/purple/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/purple/Makefile 2017-11-18 20:31:31.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- protocols/purple/Makefile.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ protocols/purple/Makefile 2022-04-18 01:39:54.000000000 -0500
</span> @@ -15,6 +15,7 @@
objects = ft.o purple.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,21 +39,8 @@
</span> LFLAGS += -r
# [SH] Phony targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,10 +39,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- purple_mod.o: $(objects)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking purple_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o purple_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o purple_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- protocols/twitter/Makefile.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ protocols/twitter/Makefile 2017-11-18 20:32:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- protocols/twitter/Makefile.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ protocols/twitter/Makefile 2022-04-18 01:39:54.000000000 -0500
</span> @@ -14,6 +14,7 @@
# [SH] Program variables
objects = twitter.o twitter_http.o twitter_lib.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,16 +49,3 @@
</span> LFLAGS += -r
# [SH] Phony targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +38,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(objects): %.o: $(_SRCDIR_)%.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Compiling $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- twitter_mod.o: $(objects)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo '*' Linking twitter_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include .depend/*.d
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bitlbee/files/patch-configure.diff b/irc/bitlbee/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b3579c6a9c7..570ab42caac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bitlbee/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bitlbee/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-01-31 07:45:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-11-18 20:15:51.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,10 +296,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure project -I flags are listed before user-specified CFLAGS and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS which might contain -I flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also set an ARCHFLAGS variable which is used by the Makefile patches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-02-07 13:53:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-04-18 01:48:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,8 +315,10 @@
</span>
echo LDFLAGS=$LDFLAGS >> Makefile.settings
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +16,4 @@
</span> +echo ARCHFLAGS=$ARCHFLAGS >> Makefile.settings
echo CFLAGS+=-DHAVE_CONFIG_H -D_GNU_SOURCE >> Makefile.settings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo CC=${CC} >> Makefile.settings
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$CC" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=$CC
</span></pre><pre style='margin:0'>
</pre>