On Mon, Apr 13 2020, Klemens Nanni <k...@openbsd.org> wrote:
[...]
> Looks all good to me, OK kn to remove the flavor.
>
> Fresh diff that also removes FLAVOR_STRING, feel free to commit with my
> OK, otherwise I'd like to clean this up in time before 6.7 gets tagged.
Done. Note that I did a second commit to reinstate the PKGNAME-otr line
(probably dropped while merging a cvs conflict?).
While here, what about adding DEBUG_PACKAGES? egdb says:
Reading symbols from irssi...Reading symbols from
/usr/local/bin/.debug/irssi.dbg...done.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile 13 Apr 2020 00:02:48 -0000 1.88
+++ Makefile 13 Apr 2020 00:04:37 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.88 2020/04/13 00:02:48 jca Exp $
+# $OpenBSD: Makefile,v 1.87 2020/04/12 23:42:58 jca Exp $
MULTI_PACKAGES = -main -otr
@@ -10,7 +10,7 @@ DISTNAME = irssi-$V
PKGSPEC = irssi-=$V
PKGNAME-main = irssi-$V
PKGNAME-otr = irssi-otr-$V
-REVISION = 0
+REVISION = 1
CATEGORIES = net
@@ -25,6 +25,8 @@ WANTLIB += c crypto curses glib-2.0 gmod
iconv intl m pcre perl pthread ssl
MASTER_SITES = https://github.com/irssi/irssi/releases/download/${V}/
+
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
LIB_DEPENDS = devel/glib2>=2.28.0
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 12 Apr 2020 23:42:58 -0000 1.3
+++ pkg/PLIST-main 13 Apr 2020 00:04:37 -0000
@@ -151,7 +151,7 @@ include/irssi/src/lib-config/module.h
lib/irssi/
lib/irssi/modules/
lib/irssi/modules/libirc_proxy.la
-lib/irssi/modules/libirc_proxy.so
+@so lib/irssi/modules/libirc_proxy.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi.pm
@@ -161,12 +161,12 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Irc/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Irc/Irc.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Irssi.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Irc/Irc.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Irssi.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/TextUI/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/TextUI/TextUI.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/TextUI/TextUI.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.so
@man man/man1/irssi.1
share/doc/irssi/
share/doc/irssi/capsicum.txt
Index: pkg/PLIST-otr
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST-otr,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-otr
--- pkg/PLIST-otr 1 Jul 2019 13:52:09 -0000 1.2
+++ pkg/PLIST-otr 13 Apr 2020 00:04:37 -0000
@@ -2,4 +2,4 @@
@conflict irssi-<1.2.1
@pkgpath net/irssi-otr
lib/irssi/modules/libotr_core.la
-lib/irssi/modules/libotr_core.so
+@so lib/irssi/modules/libotr_core.so
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
