Thursday, August 31, 2017

Re: 6.1 fails to boot on a 486

On Fri, Sep 01, 2017 at 01:04:40AM -0500, Andrew Daugherity wrote:
> I recently dug out of the closet my old IBM PS/2E, which had served as
> my firewall box from 2000ish-06, and was in fact the very first
> machine I ever installed OpenBSD on, to see if it still worked
> properly. It did (after changing the CMOS battery), but booted into
> OpenBSD 4.1... yeah, just a *bit* out of date there. The machine may
> not be of great use nowadays (I'd retired it when it couldn't keep up
> with my internet connection), but even as a retro-computing
> playground, running a 10-year-old/20-releases-ago version of OpenBSD
> is of no benefit. Let's rectify that!
>
> ====
> >> OpenBSD/i386 BOOT 3.31
> boot> hd0a:/bsd61.rd
> cannot open hd0a:/etc/random.seed: No such file or directory
> booting hd0a:/bsd61.rd: 3208120+1332224+3342348+0+446464
> [72+288736+277711]=0x87e694
> entry point at 0x2000d4
>
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
> Copyright (c) 1995-2017 OpenBSD. All rights reserved. https://www.OpenBSD.org
>
> OpenBSD 6.1 (RAMDISK_CD) #289: Sat Apr 1 13:58:25 MDT 2017
> deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/RAMDISK_CD
> fatal privileged instruction fault (0) in supervisor mode
> trap type 0 code 0 eip d03b1f7c cs d09f0008 eflags 10046 cr2 0 cpl 0
> panic: trap type 0, code=0, pc=d03b1f7c
>
> The operating system has halted.
> Please press any key to reboot.
> ====
>
> Well, that's not good -- I didn't expect 6.1 to run particularly well
> on this, but I figured it would at least boot... how about 6.0?
>
>
> ====
> booting hd0a:/bsd60.rd: 3211188+1318224+2061312+0+442368
> [72+298576+282894]=0x744144
> entry point at 0x2000d4
>
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
> Copyright (c) 1995-2016 OpenBSD. All rights reserved. http://www.OpenBSD.org
>
> OpenBSD 6.0 (RAMDISK_CD) #1864: Tue Jul 26 12:57:09 MDT 2016
> deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/RAMDISK_CD
> cpu0: Intel 486DX (486-class)
> real mem = 16183296 (15MB)
> avail mem = 8122368 (7MB)
> mainbus0 at root
> bios0 at mainbus0: date 03/31/93
> pcibios at bios0 function 0x1a not configured
> bios0: ROM list: 0xc8000/0x1000 0xc9000/0x1000 0xca000/0x2000
> cpu0 at mainbus0: (uniprocessor)
> isa0 at mainbus0
> isadma0 at isa0
> fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
> fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
> com0 at isa0 port 0x3f8/8 irq 4: ns16450, no fifo
> com0: console
> pckbc0 at isa0 port 0x60/5 irq 1 irq 12
> pckbd0 at pckbc0 (kbd slot)
> wskbd0 at pckbd0: console keyboard
> vga0 at isa0 port 0x3b0/48 iomem 0xa0000/131072
> wsdisplay0 at vga0 mux 1: console (80x25, vt100 emulation), using wskbd0
> wdc0 at isa0 port 0x1f0/8 irq 14
> wd0 at wdc0 channel 0 drive 0: <IBM-DARA-206000>
> wd0: 16-sector PIO, LBA, 5729MB, 11733120 sectors
> wd0(wdc0:0:0): using BIOS timings
> npx0 at isa0 port 0xf0/16 irq 13
> pcic0 at isa0 port 0x3e0/2 iomem 0xd0000/16384
> pcic0 controller 0: <Intel 82365SL rev 1> has sockets A and B
> pcic0 controller 1: <Intel 82365SL rev 1> has sockets A and B
> pcmcia0 at pcic0 controller 0 socket 0
> pcmcia1 at pcic0 controller 0 socket 1
> pcmcia2 at pcic0 controller 1 socket 0
> ep1 at pcmcia2 function 0 "3Com, 3C574-TX Fast EtherLink PC Card, A"
> port 0x340/32, irq 3: address 00:10:4b:5f:20:c0
> tqphy0 at ep1 phy 0: 78Q2120 10/100 PHY, rev. 3
> pcmcia3 at pcic0 controller 1 socket 1
> ep2 at pcmcia3 function 0 "3Com, 3C574-TX Fast EtherLink PC Card, A"
> port 0x300/32, irq 9: address 00:60:08:93:80:48
> tqphy1 at ep2 phy 0: 78Q2120 10/100 PHY, rev. 3
> pcic0: irq 5, polling enabled
> softraid0 at root
> scsibus0 at softraid0: 256 targets
> root on rd0a swap on rd0b dump on rd0b
> erase ^?, werase ^W, kill ^U, intr ^C, status ^T
>
> Welcome to the OpenBSD/i386 6.0 installation program.
> (I)nstall, (U)pgrade, (A)utoinstall or (S)hell?
> ====
>
> Seems fairly normal. Did I miss something about 6.1 dropping 486
> support? [/me checks i386.html... still says 486 or better!]
>
> Turns out that GENERIC can give us a little more useful information
> than RAMDISK_CD, as it drops into ddb:
>
>
> ====
> boot> hd0a:/bsd.61
> cannot open hd0a:/etc/random.seed: No such file or directory
> booting hd0a:/bsd.61: 7678420+2057220+174556+0+1097728
> [72+501520+501951]=0xb761b4
> entry point at 0x2000d4
>
> [ using 1003956 bytes of bsd ELF symbol table ]
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
> Copyright (c) 1995-2017 OpenBSD. All rights reserved. https://www.OpenBSD.org
>
> OpenBSD 6.1 (GENERIC) #291: Sat Apr 1 13:49:08 MDT 2017
> deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
> kernel: privileged instruction fault trap, code=0
> Stopped at cpuid+0x12: cpuid
> ddb> trace
> cpuid(80000000,d0d78ef0,d0d78ed8,0,7d) at cpuid+0x12
> identifycpu(d0c7d8a0,d09fbb83,10,0,ffffffff) at identifycpu+0x80d
> cpu_startup(d09cefed,d09d1680,16c,8,0) at cpu_startup+0xb9
> main(d02004c6,d02004ce,0,0,0) at main+0x6a
> ddb> ps
> PID TID PPID UID S FLAGS WAIT COMMAND
> ddb>
> ====
>
> Looks like it's trying to run the CPUID instruction, which this
> processor probably doesn't support. Maybe this was an accidental
> breakage, rather than intentionally dropping 486es? Time to examine
> the CVS logs, I guess. (A -current snapshot also fails in the same
> manner, so something happened between 6.0 & 6.1.)
>

Looks like I broke this about a year ago:

1.592 (mlarkin 14-Oct-16):
1.592 (mlarkin 14-Oct-16): cpuid(0x80000000, regs);
1.592 (mlarkin 14-Oct-16): if (regs[0] >= 0x80000006)
1.592 (mlarkin 14-Oct-16): cpuid(0x80000006, ci->ci_extcacheinfo);

I did test this on 486, but apparently qemu's emulated 486 isn't really a
proper 486. I'll see what I can do to solve it for you.

Thanks for reporting it.

-ml

6.1 fails to boot on a 486

I recently dug out of the closet my old IBM PS/2E, which had served as
my firewall box from 2000ish-06, and was in fact the very first
machine I ever installed OpenBSD on, to see if it still worked
properly. It did (after changing the CMOS battery), but booted into
OpenBSD 4.1... yeah, just a *bit* out of date there. The machine may
not be of great use nowadays (I'd retired it when it couldn't keep up
with my internet connection), but even as a retro-computing
playground, running a 10-year-old/20-releases-ago version of OpenBSD
is of no benefit. Let's rectify that!

====
>> OpenBSD/i386 BOOT 3.31
boot> hd0a:/bsd61.rd
cannot open hd0a:/etc/random.seed: No such file or directory
booting hd0a:/bsd61.rd: 3208120+1332224+3342348+0+446464
[72+288736+277711]=0x87e694
entry point at 0x2000d4

Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2017 OpenBSD. All rights reserved. https://www.OpenBSD.org

OpenBSD 6.1 (RAMDISK_CD) #289: Sat Apr 1 13:58:25 MDT 2017
deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/RAMDISK_CD
fatal privileged instruction fault (0) in supervisor mode
trap type 0 code 0 eip d03b1f7c cs d09f0008 eflags 10046 cr2 0 cpl 0
panic: trap type 0, code=0, pc=d03b1f7c

The operating system has halted.
Please press any key to reboot.
====

Well, that's not good -- I didn't expect 6.1 to run particularly well
on this, but I figured it would at least boot... how about 6.0?


====
booting hd0a:/bsd60.rd: 3211188+1318224+2061312+0+442368
[72+298576+282894]=0x744144
entry point at 0x2000d4

Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2016 OpenBSD. All rights reserved. http://www.OpenBSD.org

OpenBSD 6.0 (RAMDISK_CD) #1864: Tue Jul 26 12:57:09 MDT 2016
deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/RAMDISK_CD
cpu0: Intel 486DX (486-class)
real mem = 16183296 (15MB)
avail mem = 8122368 (7MB)
mainbus0 at root
bios0 at mainbus0: date 03/31/93
pcibios at bios0 function 0x1a not configured
bios0: ROM list: 0xc8000/0x1000 0xc9000/0x1000 0xca000/0x2000
cpu0 at mainbus0: (uniprocessor)
isa0 at mainbus0
isadma0 at isa0
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
com0 at isa0 port 0x3f8/8 irq 4: ns16450, no fifo
com0: console
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
vga0 at isa0 port 0x3b0/48 iomem 0xa0000/131072
wsdisplay0 at vga0 mux 1: console (80x25, vt100 emulation), using wskbd0
wdc0 at isa0 port 0x1f0/8 irq 14
wd0 at wdc0 channel 0 drive 0: <IBM-DARA-206000>
wd0: 16-sector PIO, LBA, 5729MB, 11733120 sectors
wd0(wdc0:0:0): using BIOS timings
npx0 at isa0 port 0xf0/16 irq 13
pcic0 at isa0 port 0x3e0/2 iomem 0xd0000/16384
pcic0 controller 0: <Intel 82365SL rev 1> has sockets A and B
pcic0 controller 1: <Intel 82365SL rev 1> has sockets A and B
pcmcia0 at pcic0 controller 0 socket 0
pcmcia1 at pcic0 controller 0 socket 1
pcmcia2 at pcic0 controller 1 socket 0
ep1 at pcmcia2 function 0 "3Com, 3C574-TX Fast EtherLink PC Card, A"
port 0x340/32, irq 3: address 00:10:4b:5f:20:c0
tqphy0 at ep1 phy 0: 78Q2120 10/100 PHY, rev. 3
pcmcia3 at pcic0 controller 1 socket 1
ep2 at pcmcia3 function 0 "3Com, 3C574-TX Fast EtherLink PC Card, A"
port 0x300/32, irq 9: address 00:60:08:93:80:48
tqphy1 at ep2 phy 0: 78Q2120 10/100 PHY, rev. 3
pcic0: irq 5, polling enabled
softraid0 at root
scsibus0 at softraid0: 256 targets
root on rd0a swap on rd0b dump on rd0b
erase ^?, werase ^W, kill ^U, intr ^C, status ^T

Welcome to the OpenBSD/i386 6.0 installation program.
(I)nstall, (U)pgrade, (A)utoinstall or (S)hell?
====

Seems fairly normal. Did I miss something about 6.1 dropping 486
support? [/me checks i386.html... still says 486 or better!]

Turns out that GENERIC can give us a little more useful information
than RAMDISK_CD, as it drops into ddb:


====
boot> hd0a:/bsd.61
cannot open hd0a:/etc/random.seed: No such file or directory
booting hd0a:/bsd.61: 7678420+2057220+174556+0+1097728
[72+501520+501951]=0xb761b4
entry point at 0x2000d4

[ using 1003956 bytes of bsd ELF symbol table ]
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2017 OpenBSD. All rights reserved. https://www.OpenBSD.org

OpenBSD 6.1 (GENERIC) #291: Sat Apr 1 13:49:08 MDT 2017
deraadt@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
kernel: privileged instruction fault trap, code=0
Stopped at cpuid+0x12: cpuid
ddb> trace
cpuid(80000000,d0d78ef0,d0d78ed8,0,7d) at cpuid+0x12
identifycpu(d0c7d8a0,d09fbb83,10,0,ffffffff) at identifycpu+0x80d
cpu_startup(d09cefed,d09d1680,16c,8,0) at cpu_startup+0xb9
main(d02004c6,d02004ce,0,0,0) at main+0x6a
ddb> ps
PID TID PPID UID S FLAGS WAIT COMMAND
ddb>
====

Looks like it's trying to run the CPUID instruction, which this
processor probably doesn't support. Maybe this was an accidental
breakage, rather than intentionally dropping 486es? Time to examine
the CVS logs, I guess. (A -current snapshot also fails in the same
manner, so something happened between 6.0 & 6.1.)

Re: [UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 26 Nov 2016 02:06:16 -0000 1.5
+++ Makefile 1 Sep 2017 05:29:31 -0000
@@ -2,13 +2,11 @@

COMMENT= freedesktop-compliant panel

-V= 0.12.2
-REVISION= 2
+V= 0.14.6
CATEGORIES= x11
DISTNAME= tint2-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST= ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR= ${PREFIX}/tint2
+WRKDIST= ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec

HOMEPAGE= https://gitlab.com/o9000/tint2/

@@ -25,30 +23,23 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
WANTLIB += z

BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS= graphics/imlib2 \
- devel/gettext \
- devel/pango \
+
+LIB_DEPENDS= devel/pango \
devel/startup-notification \
- x11/gnome/librsvg \
+ graphics/imlib2 \
x11/gtk+2
-RUN_DEPENDS= x11/py-gtk2 \
- devel/desktop-file-utils

MODULES= devel/cmake \
- lang/python \
x11/gnome

-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+ gtk-update-icon-cache \
+ shared-mime-info

NO_TEST= Yes

-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
post-install:
- cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
- sed -i -e '/\/usr\/local\/share\/applications/d' -e \
- 's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
+ sed -i 's,/usr/share,${LOCALBASE}/share,g' \
${PREFIX}/share/examples/tint2/*tint2rc
- rm ${PREFIX}/share/tint2/*.tint2rc

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 11 Sep 2015 14:14:07 -0000 1.1.1.1
+++ distinfo 1 Sep 2017 05:29:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 1 Sep 2017 05:29:31 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt 11 Sep 2015 14:14:07 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
---- src/tint2conf/CMakeLists.txt.orig Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
Index: patches/patch-src_tint2conf_main_c
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_main_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c 26 Nov 2016 02:06:16 -0000 1.1
+++ patches/patch-src_tint2conf_main_c 1 Sep 2017 05:29:31 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.1 2016/11/26 02:06:16 jca Exp $
---- src/tint2conf/main.c.orig Tue Nov 22 21:42:54 2016
-+++ src/tint2conf/main.c Tue Nov 22 21:43:58 2016
-@@ -503,7 +503,7 @@ static void set_current_theme()
+$OpenBSD$
+
+Index: src/tint2conf/main.c
+--- src/tint2conf/main.c.orig
++++ src/tint2conf/main.c
+@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)

- gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
- {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", main_file, (long long)time(NULL));
- copy_file(main_file, backup_path);
- g_free(backup_path);
- }
+ void make_backup(const char *filepath)
+ {
+- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
++ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
+ copy_file(filepath, backup_path);
+ g_free(backup_path);
+ }
Index: patches/patch-src_tint2conf_properties_c
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_properties_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tint2conf_properties_c
--- patches/patch-src_tint2conf_properties_c 26 Nov 2016 02:06:16 -0000 1.1
+++ patches/patch-src_tint2conf_properties_c 1 Sep 2017 05:29:31 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_tint2conf_properties_c,v 1.1 2016/11/26 02:06:16 jca Exp $
---- src/tint2conf/properties.c.orig Tue Nov 22 21:44:18 2016
-+++ src/tint2conf/properties.c Tue Nov 22 21:44:32 2016
-@@ -171,7 +171,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
- gchar *file = get_current_theme_file_name();
- if (file) {
- if (config_is_manual(file)) {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", file, time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", file, (long long)time(NULL));
- copy_file(file, backup_path);
- g_free(backup_path);
- }
+$OpenBSD$
+
+Index: src/tint2conf/properties.c
+--- src/tint2conf/properties.c.orig
++++ src/tint2conf/properties.c
+@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
+ gchar *filepath = get_current_theme_path();
+ if (filepath) {
+ if (config_is_manual(filepath)) {
+- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
++ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
+ copy_file(filepath, backup_path);
+ g_free(backup_path);
+ }
Index: patches/patch-themes_CMakeLists_txt
===================================================================
RCS file: patches/patch-themes_CMakeLists_txt
diff -N patches/patch-themes_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-themes_CMakeLists_txt 1 Sep 2017 05:29:31 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+
+Index: themes/CMakeLists.txt
+--- themes/CMakeLists.txt.orig
++++ themes/CMakeLists.txt
+@@ -1,2 +1,2 @@
+-file( GLOB EXTRATHEMEFILES *.tint2rc )
+-install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
++file( GLOB EXTRATHEMEFILES tint2rc *.tint2rc )
++install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/tint2 )
Index: patches/patch-themes_tint2rc
===================================================================
RCS file: patches/patch-themes_tint2rc
diff -N patches/patch-themes_tint2rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-themes_tint2rc 1 Sep 2017 05:29:31 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: themes/tint2rc
+--- themes/tint2rc.orig
++++ themes/tint2rc
+@@ -136,12 +136,9 @@ launcher_icon_asb = 100 0 0
+ launcher_icon_theme_override = 0
+ startup_notifications = 1
+ launcher_tooltip = 1
+-launcher_item_app = /usr/share/applications/tint2conf.desktop
+ launcher_item_app = /usr/local/share/applications/tint2conf.desktop
+-launcher_item_app = /usr/share/applications/firefox.desktop
+-launcher_item_app = /usr/share/applications/iceweasel.desktop
+-launcher_item_app = /usr/share/applications/chromium-browser.desktop
+-launcher_item_app = /usr/share/applications/google-chrome.desktop
++launcher_item_app = /usr/local/share/applications/firefox.desktop
++launcher_item_app = /usr/local/share/applications/chromium-browser.desktop
+
+ #-------------------------------------
+ # Clock
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 11 Sep 2015 14:14:07 -0000 1.1.1.1
+++ pkg/PLIST 1 Sep 2017 05:29:31 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
+@comment $OpenBSD$
@pkgpath x11/tint
@bin bin/tint2
@bin bin/tint2conf
@@ -9,8 +9,18 @@ share/doc/tint2/
share/doc/tint2/AUTHORS
share/doc/tint2/ChangeLog
share/doc/tint2/README.md
+share/doc/tint2/html/
+share/doc/tint2/html/images/
+share/doc/tint2/html/images/panel_padding.jpg
+share/doc/tint2/html/images/panel_size_margin.jpg
+share/doc/tint2/html/images/task_padding.jpg
+share/doc/tint2/html/images/taskbar_padding.jpg
+share/doc/tint2/html/manual.html
+share/doc/tint2/html/readme.html
+share/doc/tint2/tint2.md
share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg/
+@sample ${SYSCONFDIR}/xdg
+@sample ${SYSCONFDIR}/xdg/tint2/
share/examples/tint2/horizontal-dark-opaque.tint2rc
share/examples/tint2/horizontal-dark-transparent.tint2rc
share/examples/tint2/horizontal-light-opaque.tint2rc
@@ -32,22 +42,26 @@ share/examples/tint2/text_only_4.tint2rc
share/examples/tint2/text_only_5.tint2rc
share/examples/tint2/text_only_6.tint2rc
share/examples/tint2/tint2rc
-@sample ${SYSCONFDIR}/xdg/tint2/
@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
share/examples/tint2/vertical-dark-opaque.tint2rc
share/examples/tint2/vertical-dark-transparent.tint2rc
share/examples/tint2/vertical-light-opaque.tint2rc
share/examples/tint2/vertical-light-transparent.tint2rc
+share/examples/tint2/vertical-neutral-icons.tint2rc
share/icons/hicolor/scalable/apps/tint2.svg
share/icons/hicolor/scalable/apps/tint2conf.svg
share/locale/bs/LC_MESSAGES/tint2conf.mo
share/locale/fr/LC_MESSAGES/tint2conf.mo
share/locale/hr/LC_MESSAGES/tint2conf.mo
share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/ru/LC_MESSAGES/tint2conf.mo
share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
share/tint2/
share/tint2/default_icon.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime
New cvs diff -uNP generated:

1) Updated 0.12.2 -> 0.14.6
2) sed applied to example rc files per @sthen
3) Patched default tint2rc with OpenBSD path and apps
4) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
5) New tint2conf no longer needs python - removed
6) Incorporated Valère_Monseur modifications
7) Removed RUN_DEPENDS
8) Changed to ${LOCALBASE} per @sthen

Builds/Runs amd64
--
J. Scott Heppler

Re: OpenBSD 6.1-stable lock up

Hello,

Am 01.09.2017 00:33 schrieb Maxim Bourmistrov:
> 0/232/64 mbuf 2048 byte clusters in use (current/peak/max)
> 423/2865/120 mbuf 2112 byte clusters in use (current/peak/max)
> 0/160/64 mbuf 4096 byte clusters in use (current/peak/max)
> 0/200/64 mbuf 8192 byte clusters in use (current/peak/max)

I've seen this before - including a kind of "lock up".
How does one reach a peak/current way over the maximum - and 2112 byte
mcl?
IIRC, there was activity in this area changing allocation and
statistics.

--
pb

sudoreplay in sudo 1.8.21 on 6.2-snapshot

Using sudoreplay with log_input and log_output on OpenBSD I recently
encountered:

After updating to sudo-1.8.21 today when I do "sudoreplay <session>" the session
begins but does not proceed to the next screens.

Last worked in sudo-1.8.20p2 still works fine.

I've tried this with sudoreplay -R also. The symptom persists.

Sessions created in 1.8.21 or 1.8.20 I cannot play back using 1.8.21.
Sessions created in 1.8.21 or 1.8.20 I can play back using 1.8.20.

Tested on:
OpenBSD maleah.dayid.org 6.2 GENERIC.MP#101 i386
$ sudo -V
Sudo version 1.8.21

I've been able to consistently recreate by attempting to sudoreplay any session.

Is there any further useful information I may provide to investigate such
behavior?

-David A. Pocock

OpenBSD 6.1-stable lock up

Hey,
having a dual-node setup of 6.0 in prod, I decided to move forward with one of machines
and upgrade to 6.1-stable. Ending up in benchmark tool "locking" the 6.1 machine.

Background:
Nodes are Xeon E5-2642v3 3.4Ghz x12, 16G RAM, 64G DOM modules as hdd,
4x X540T (ix) - 2x on-board and 2x PCI-card.

All 4x X540T are connected to 2x Cisco Nexus 3000-series, creating an LACP trunk (1x on-board + 1x PCI).
trunk0 - external (VLAN), 1x NIC connected to switch1 and 1x NIC connected to switch2 (ix0 + ix3)
trunk1 - internal (VLAN) , 1x NIC connected to switch1 and 1x NIC connected to switch2 (ix1 + ix2)
As I have 2x Nexus 3000, VPC is configured and sitting on top of LACP trunk on their end.

Each obsd node have several carp interfaces configured on top of trunk0.
Only one carp interface on trunk1 - carp1.

Each switch acting as a default gw (VRRP configured) for any existing VLAN, except one towards trunk1.
Default gateway for those switches is IP on carp1.
Those switches run OSPF as well as obsd nodes do.

obsd nodes are the front line, facing the Internet. (2x uplink goes into 2x Nexus and then traffic is passed to 2x obsd.)
Running relayd with SSL-offload and plain HTTP.
Except relayd, there is ospfd, ntpd, snmpd, and bgpd(for distributed blacklisting around other global nodes).

The problem:
While doing a bench with https://github.com/wg/wrk <https://github.com/wg/wrk> from my laptop (OS X, 1Gbps max. pipe) agains the environment (HTTPS)
relayd experienced problems with handling the traffic.

shell# ./wrk -t16 -c1500 -d90s —latency <https://URL>

wrk hammering apache 2.4(behind those nodes), serving a txt file with avg 7k-10k req/s as an output:

wrk -t16 -c1500 -d90s --latency https:/<URL>/ping.txt
Running 2m test @ https://<URL>/ping.txt
16 threads and 1500 connections
Thread Stats Avg Stdev Max +/- Stdev
Latency 131.17ms 70.91ms 1.97s 91.70%
Req/Sec 651.06 135.80 1.09k 84.95%
Latency Distribution
50% 131.90ms
75% 144.63ms
90% 159.63ms
99% 230.92ms
927039 requests in 1.50m, 190.12MB read
Socket errors: connect 0, read 0, write 0, timeout 1330
Requests/sec: 10290.54
Transfer/sec: 2.11MB

wrk hammering apache 2.4, mod_proxy_balance, with NodeJS nodes behind apache:

wrk -t16 -c1500 -d90s --latency https://<URL>/nodejs
Running 2m test @ https://<URL>/nodejs
16 threads and 1500 connections
Thread Stats Avg Stdev Max +/- Stdev
Latency 445.91ms 518.66ms 2.00s 83.49%
Req/Sec 56.80 26.89 180.00 68.48%
Latency Distribution
50% 217.57ms
75% 374.15ms
90% 1.50s
99% 1.95s
80673 requests in 1.50m, 1.12GB read
Socket errors: connect 0, read 5534, write 0, timeout 18099
Requests/sec: 895.42
Transfer/sec: 12.72MB

'top' showed none interrupting at all, but rather heavy system load values and some user values.
20-30% - user
80-90% - system
relayd (12 forks as the number of cores) - 99% usage.

I basically killed both machines running 6.0, thus my decision to upgrade to 6.1.
However, during the tests against 6.0, my ssh session never got terminated ("kicked out") even with this hight load (0% CPU idle).
6.1 showed different symptoms - ssh session termination, login via web based IPMI GUI hanging after log in part,
ping not responding(from the switches and node1 which is 6.0 yet).
After a while, with bench aborted, 6.1 eventually let me in via ssh (terminal via IPMI stil hanging).

snmpd which been running (remember), been polled by other sys doing graphs.
What been seen on those graphs is high rate of output err pkts on trunks, not NICs (ix) them selves.
Also, syslog, with enabled 'log all' for relayd showed a lot of 'buffer timeout event',
ospfd yeilding about 'no buffer space available'.

I had to modd relayd.conf to spawn only 8 preforks instead of 12
and

kern.maxclusters=24576 #12288
kern.maxfiles=65536 #32768

in order to survive the bench (e.g.. having ssh session alive).
Values commented out are from the 6.0 setup.

I'm looking for any advice here, which hopefully will lead to a stable and performant setup.
Configuration follows.

———sysct.conf (obsd 6.0)————
net.inet.ip.forwarding=1
net.inet.ipcomp.enable=1 # 1=Enable the IPCOMP protocol
net.inet.etherip.allow=1 # 1=Enable the Ethernet-over-IP protocol
net.inet.tcp.ecn=1 # 1=Enable the TCP ECN extension
net.inet.carp.preempt=1 # 1=Enable carp(4) preemption
net.inet.carp.log=3 # log level of carp(4) info, default 2
ddb.panic=0 # 0=Do not drop into ddb on a kernel panic
ddb.console=1 # 1=Permit entry of ddb from the console
kern.pool_debug=0
net.inet.ip.maxqueue=2048
kern.somaxconn=4096
kern.maxclusters=12288
kern.maxfiles=32768
net.inet.ip.ifq.maxlen=2048


————login.conf———————
relayd:\
:maxproc-max=31:\
:openfiles-cur=65536:\
:openfiles-max=65536:\
:tc=daemon:

—————pf.conf———————
set block-policy drop
set limit { states 3000000, frags 2000, src-nodes 1000000 }

—————relayd.conf———————
interval 10
timeout 1000
prefork 8 #12
log all ——>>>>>>>> for debuging the situation

shell# netstat -m
1227 mbufs in use:
626 mbufs allocated to data
189 mbufs allocated to packet headers
412 mbufs allocated to socket names and addresses
0/232/64 mbuf 2048 byte clusters in use (current/peak/max)
423/2865/120 mbuf 2112 byte clusters in use (current/peak/max)
0/160/64 mbuf 4096 byte clusters in use (current/peak/max)
0/200/64 mbuf 8192 byte clusters in use (current/peak/max)
0/14/112 mbuf 9216 byte clusters in use (current/peak/max)
0/20/80 mbuf 12288 byte clusters in use (current/peak/max)
0/16/64 mbuf 16384 byte clusters in use (current/peak/max)
0/8/64 mbuf 65536 byte clusters in use (current/peak/max)
23400 Kbytes allocated to network (5% in use)
0 requests for memory denied
0 requests for memory delayed
0 calls to protocol drain routines

Kernel is stock, latest via syspatch.

P.S.
Ifq.drops been never observed, nor
high ifq.len (max. 5 pkts in queue)
PF had max. 290k states.

Br
//mxb

Re: Moving a Web site from IIS to httpd

I wish migrating from Rails Nginx to Rails httpd would be that easy. Seems
now I have to pay the uwsgi team hundreds of dollars to come up with a
config for me.

If anybody wishes to join me in paying for this config so we can create an
online tut do feel free to let me know.

All the best,
Murk


On Thu, Aug 31, 2017 at 11:04 PM, Jesper Wallin <jesper@ifconfig.se> wrote:

> On Thu, Aug 31, 2017 at 07:20:16PM +0000, Peter Fraser wrote:
> >
> > It would be nice if httpd could be used to convert or ignore case in
> URL's.
>
> Hi Peter,
>
> First of all, from an SEO standpoint, you shouldn't ignore the case in
> URL's, as you end up with duplicate content. Pick a certain naming style
> and use it everywhere on your site.
>
> Your best luck is to check your logs for incorrect links. Then simply
> add a "location" block for every link and redirect it to the correct one
> using a "block return 301". Be sure to use the 301 (Permanently moved)
> to tell clients not to use the old URL anymore.
>
> server "domain.tld" {
> listen on * port 80
>
> location "/FOOBAR.HTML" {
> block return 301 "http://domain.tld/foobar.html"
> }
> }
>
> You can probably make this a bit more universal using patterns(7) for
> the locations block. Also, the example above is more or less copied from
> httpd.conf(5).
>
>
> Another alternative, like you said, is to create a copy of the page. To
> prevent duplicate content and let clients know where your "real" page
> is, use a link canonical tag. E.g,
>
> <link rel="canonical" href="http://domain.tld/foobar.html">
>
> However, this won't solve the issue with others linking to the wrong
> pages and it will probably be a real pain to maintain your site.
>
>
> Jesper Wallin
>
>

Re: PATCH: cython python3 flavor

Another try. OK?.


diff -r 580f8136c527 devel/quirks/Makefile
--- devel/quirks/Makefile Thu Aug 31 17:05:19 2017 +0000
+++ devel/quirks/Makefile Thu Aug 31 23:55:53 2017 +0200
@@ -5,7 +5,7 @@
DISTFILES =

# API.rev
-PKGNAME = quirks-2.358
+PKGNAME = quirks-2.359
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

diff -r 580f8136c527 devel/quirks/files/Quirks.pm
--- devel/quirks/files/Quirks.pm Thu Aug 31 17:05:19 2017 +0000
+++ devel/quirks/files/Quirks.pm Thu Aug 31 23:55:53 2017 +0200
@@ -484,6 +484,7 @@
'cargo' => 'rust',
'apertium-fr-ca' => 'apertium-fra-cat',
'py-doit' => 'doit',
+ 'cython' => 'py-cython',
};

my $obsolete_reason = {
diff -r 580f8136c527 lang/Makefile
--- lang/Makefile Thu Aug 31 17:05:19 2017 +0000
+++ lang/Makefile Thu Aug 31 23:55:53 2017 +0200
@@ -14,6 +14,7 @@
SUBDIR += clisp
SUBDIR += clojure
SUBDIR += cython
+ SUBDIR += cython,python3
SUBDIR += datalog
SUBDIR += duktape
SUBDIR += eagle
diff -r 580f8136c527 lang/cython/Makefile
--- lang/cython/Makefile Thu Aug 31 17:05:19 2017 +0000
+++ lang/cython/Makefile Thu Aug 31 23:55:53 2017 +0200
@@ -3,9 +3,9 @@
COMMENT = optimising static compiler for Python and Cython

MODPY_EGG_VERSION = 0.26.1
-REVISION = 0
+REVISION = 1
DISTNAME = Cython-${MODPY_EGG_VERSION}
-PKGNAME = ${DISTNAME:L}
+PKGNAME = py-cython-${MODPY_EGG_VERSION}
CATEGORIES = lang

HOMEPAGE = http://www.cython.org/
@@ -23,8 +23,8 @@
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes

-#FLAVORS = python3
-#FLAVOR ?=
+FLAVORS = python3
+FLAVOR ?=

TEST_TARGET = test

@@ -34,4 +34,9 @@
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
${ALL_TEST_FLAGS} -f ${MAKE_FILE} ${TEST_TARGET}

+post-install:
+.for i in cygdb cython cythonize
+ mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
+.endfor
+
.include <bsd.port.mk>
diff -r 580f8136c527 lang/cython/pkg/PLIST
--- lang/cython/pkg/PLIST Thu Aug 31 17:05:19 2017 +0000
+++ lang/cython/pkg/PLIST Thu Aug 31 23:55:53 2017 +0200
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.8 2017/08/31 06:54:04 ajacoutot Exp $
-bin/cygdb
-bin/cython
-bin/cythonize
+bin/cygdb${MODPY_BIN_SUFFIX}
+bin/cython${MODPY_BIN_SUFFIX}
+bin/cythonize${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/Cython/
lib/python${MODPY_VERSION}/site-packages/Cython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Cython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -12,187 +12,191 @@
lib/python${MODPY_VERSION}/site-packages/Cython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/Cython/Build/
lib/python${MODPY_VERSION}/site-packages/Cython/Build/BuildExecutable.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/BuildExecutable.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Cythonize.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Cythonize.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Dependencies.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Dependencies.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Distutils.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Distutils.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Inline.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Inline.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/IpythonMagic.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/IpythonMagic.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestInline.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestInline.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestIpythonMagic.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestIpythonMagic.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestStripLiterals.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestStripLiterals.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestInline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestIpythonMagic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestStripLiterals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Build/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Build/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}BuildExecutable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}Cythonize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}Dependencies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}Distutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}Inline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}IpythonMagic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/CodeWriter.py
-lib/python${MODPY_VERSION}/site-packages/Cython/CodeWriter.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/AnalysedTreeTransforms.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/AnalysedTreeTransforms.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Annotate.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Annotate.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/AutoDocTransforms.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/AutoDocTransforms.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Buffer.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Buffer.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Builtin.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Builtin.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CmdLine.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CmdLine.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CodeGeneration.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CodeGeneration.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CythonScope.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CythonScope.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/DebugFlags.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/DebugFlags.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Errors.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Errors.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ExprNodes.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ExprNodes.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FlowControl.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FlowControl.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FlowControl.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FlowControl.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FusedNode.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/FusedNode.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Future.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Future.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Interpreter.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Interpreter.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Lexicon.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Lexicon.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Lexicon.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Main.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Main.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/MemoryView.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/MemoryView.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ModuleNode.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ModuleNode.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Naming.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Naming.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Nodes.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Nodes.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Optimize.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Optimize.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Options.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Options.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ParseTreeTransforms.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ParseTreeTransforms.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ParseTreeTransforms.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Pipeline.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Pipeline.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/PyrexTypes.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/PyrexTypes.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Pythran.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Pythran.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Scanning.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Scanning.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Scanning.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Scanning.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/StringEncoding.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/StringEncoding.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Symtab.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Symtab.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestBuffer.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestBuffer.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestCmdLine.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestCmdLine.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestFlowControl.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestFlowControl.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestGrammar.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestGrammar.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestMemView.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestMemView.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestParseTreeTransforms.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestParseTreeTransforms.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestSignatureMatching.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestSignatureMatching.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreeFragment.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreeFragment.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreePath.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreePath.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTypes.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTypes.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestUtilityLoad.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestUtilityLoad.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestVisitor.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestVisitor.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestBuffer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestCmdLine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestFlowControl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestGrammar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestMemView.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestParseTreeTransforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestSignatureMatching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTreeFragment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTreePath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestUtilityLoad.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestVisitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreeFragment.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreeFragment.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreePath.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreePath.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeInference.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeInference.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeSlots.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeSlots.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilNodes.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilNodes.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilityCode.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilityCode.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Version.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Version.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Visitor.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Visitor.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Visitor.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Visitor.so
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}AnalysedTreeTransforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Annotate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}AutoDocTransforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Buffer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Builtin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CmdLine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CodeGeneration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CythonScope.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}DebugFlags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}ExprNodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}FlowControl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}FusedNode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Future.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Interpreter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Lexicon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}MemoryView.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}ModuleNode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Naming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Nodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Optimize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}ParseTreeTransforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Parsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Pipeline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}PyrexTypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Pythran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Scanning.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}StringEncoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Symtab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TreeFragment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TreePath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TypeInference.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TypeSlots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UtilNodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UtilityCode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Visitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Coverage.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Coverage.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Cygdb.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Cygdb.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/DebugWriter.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/DebugWriter.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/TestLibCython.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/TestLibCython.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/${MODPY_PYCACHE}TestLibCython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/${MODPY_PYCACHE}test_libcython_in_gdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/${MODPY_PYCACHE}test_libpython_in_gdb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/cfuncs.c
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/codefile
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/test_libcython_in_gdb.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/test_libcython_in_gdb.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/test_libpython_in_gdb.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/Tests/test_libpython_in_gdb.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}Cygdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}DebugWriter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}libcython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/${MODPY_PYCACHE}libpython.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/libcython.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/libcython.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/libpython.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugger/libpython.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Debugging.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Debugging.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/
lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/${MODPY_PYCACHE}build_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/${MODPY_PYCACHE}old_build_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/build_ext.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/build_ext.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/extension.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/extension.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/old_build_ext.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/old_build_ext.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Includes/
lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/
lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python.pxd
@@ -334,62 +338,63 @@
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.so
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/DFA.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/DFA.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Errors.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Errors.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Lexicons.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Lexicons.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Machines.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Machines.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Regexps.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Regexps.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.pxd
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.so
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Timing.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Timing.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Traditional.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Traditional.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Transitions.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Transitions.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Plex/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Actions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}DFA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Lexicons.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Machines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Regexps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Scanners.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Timing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Traditional.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Transitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/
lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/refnanny.pyx
lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/refnanny.so
lib/python${MODPY_VERSION}/site-packages/Cython/Shadow.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Shadow.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/StringIOTree.py
-lib/python${MODPY_VERSION}/site-packages/Cython/StringIOTree.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/${MODPY_PYCACHE}_looper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/${MODPY_PYCACHE}_tempita.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/${MODPY_PYCACHE}compat3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/_looper.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/_looper.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/_tempita.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/_tempita.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/_tempita.so
lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/compat3.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/compat3.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/TestUtils.py
-lib/python${MODPY_VERSION}/site-packages/Cython/TestUtils.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestCodeWriter.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestCodeWriter.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestJediTyper.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestJediTyper.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestStringIOTree.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestStringIOTree.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tests/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestCodeWriter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestJediTyper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestStringIOTree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}xmlrunner.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Tests/xmlrunner.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Tests/xmlrunner.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Buffer.c
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Builtins.c
@@ -422,18 +427,27 @@
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/TestUtilityLoader.c
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/TypeConversion.c
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Utility/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Cython/Utility/arrayarray.h
lib/python${MODPY_VERSION}/site-packages/Cython/Utils.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Utils.pyc
lib/python${MODPY_VERSION}/site-packages/Cython/__init__.py
-lib/python${MODPY_VERSION}/site-packages/Cython/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}CodeWriter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}Coverage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}Debugging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}Shadow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}StringIOTree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}TestUtils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cython.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cython.py
-lib/python${MODPY_VERSION}/site-packages/cython.pyc
lib/python${MODPY_VERSION}/site-packages/pyximport/
lib/python${MODPY_VERSION}/site-packages/pyximport/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pyximport/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyxbuild.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyximport.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyximport/pyxbuild.py
-lib/python${MODPY_VERSION}/site-packages/pyximport/pyxbuild.pyc
lib/python${MODPY_VERSION}/site-packages/pyximport/pyximport.py
-lib/python${MODPY_VERSION}/site-packages/pyximport/pyximport.pyc

[update] PHP 7.0.23

Simple diff.

OK?

martijn@

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 24 Aug 2017 10:52:48 -0000 1.35
+++ Makefile 31 Aug 2017 21:19:45 -0000
@@ -3,7 +3,7 @@
BROKEN-sparc64= SIGBUS during phar generation

PV= 7.0
-V= ${PV}.22
+V= ${PV}.23

WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline

Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/php/7.0/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 24 Aug 2017 10:52:48 -0000 1.17
+++ distinfo 31 Aug 2017 21:19:45 -0000
@@ -1,4 +1,4 @@
-SHA256 (php-7.0.22.tar.bz2) = iOCyf2mr3RLs3oHwAMWp6kea9yGEVup/ZVfttDxt/d4=
+SHA256 (php-7.0.23.tar.bz2) = b+lM78fSxg7iwWSLl3vu11atnNCn5OqLuM9SHZNVoJw=
SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
-SIZE (php-7.0.22.tar.bz2) = 15391136
+SIZE (php-7.0.23.tar.bz2) = 14630426
SIZE (suhosin-0.9.38.tar.gz) = 122800

Re: Moving a Web site from IIS to httpd

On Thu, Aug 31, 2017 at 07:20:16PM +0000, Peter Fraser wrote:
>
> It would be nice if httpd could be used to convert or ignore case in URL's.

Hi Peter,

First of all, from an SEO standpoint, you shouldn't ignore the case in
URL's, as you end up with duplicate content. Pick a certain naming style
and use it everywhere on your site.

Your best luck is to check your logs for incorrect links. Then simply
add a "location" block for every link and redirect it to the correct one
using a "block return 301". Be sure to use the 301 (Permanently moved)
to tell clients not to use the old URL anymore.

server "domain.tld" {
listen on * port 80

location "/FOOBAR.HTML" {
block return 301 "http://domain.tld/foobar.html"
}
}

You can probably make this a bit more universal using patterns(7) for
the locations block. Also, the example above is more or less copied from
httpd.conf(5).


Another alternative, like you said, is to create a copy of the page. To
prevent duplicate content and let clients know where your "real" page
is, use a link canonical tag. E.g,

<link rel="canonical" href="http://domain.tld/foobar.html">

However, this won't solve the issue with others linking to the wrong
pages and it will probably be a real pain to maintain your site.


Jesper Wallin

Re: [update] dunst-1.2.0

On 2017/08/31 23:45, Timo Myyrä wrote:
>
> Yeah, I tried some variations but that doesn't seem to work.
>
> The direct path to source tarball is as follows:
> https://github.com/dunst-project/dunst/archive/v1.2.0.tar.gz
>
> The combo in the first diff is something that works. Other option would be to
> skip GH_* variables and set necessary stuff manually.
> With just the GH_* variables set the ports tries to fetch the distfile with url:
> https://github.com/dunst-project/dunst/archive/1.2.0/dunst-1.2.0.tar.gz
>
> The source file name isn't that great as v1.2.0.tar.gz though.

Ah, you didn't quite have the right GH_TAGNAME, it's v1.2.0 not 1.2.0.

GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
GH_TAGNAME = v1.2.0

The actual filename requested from github is flexible, as long as it has
/archive/TAGNAME/foo.tar.gz. In this case you get
https://github.com/dunst-project/dunst/archive/v1.2.0/dunst-1.2.0.tar.gz
which works fine.

> Any case, here's the slightly updated diff. Still needs a bit of tuning of GH_*
> variables:

Thanks, fixed those & committed.

Re: New: net/wildfly

On 2017/08/29 13:39, Ian Darwin wrote:
> Ping?
>
> On Mon, Aug 21, 2017 at 03:58:37PM -0400, Ian Darwin wrote:
> > On Tue, Aug 15, 2017 at 09:49:24PM -0400, Ian Darwin wrote:
> > > Here is a port of Wildfly 10, the Java-based app server formerly known as
> > > JBoss AS.
> > >
> > > It packages and works.
> > >
> > > Like Tomcat it goes through revisions a lot, so there's a v10 subdirectory
> > > (v11 is already in beta).
> > >
> > > It needs write access to its configuration files in several directories,
> > > which is why it's all
> > > under /var, with @mode +w for the places that need write access.
> >
> > Improved packaging, now removes cleanly (with -c)
> >
> > OK?
>

Comments from my earlier mail (offlist) still apply..

----- Forwarded message from Stuart Henderson <stu@spacehopper.org> -----

From: Stuart Henderson <stu@spacehopper.org>
Date: Wed, 16 Aug 2017 09:17:26 +0100
Subject: Re: test of attach

[..]

No attachment in this one. The one you sent to ports@ was an uncompressed tar
but named .tgz.

Sorry I didn't comment on your earlier mail, but 130-odd MB in /var seems
like maybe a bit much,

For the find(1) invocation, -delete would be safer than piping to xargs,
especially given that upstream isn't averse to including files with spaces
in the names. (Or "find .. -print0 | xargs -r0", but now we finally have
-delete we might as well use it :). I suppose the powershell (.ps1) files
aren't much use here either.


----- End forwarded message -----

Also, the USER/GROUP in Makefile are unused, and I wonder about
ownership/permissions, do *all* the files need to be owned by _wildfly?
If it's only the u+w ones that need to be writable I'd be a lot happier
if the rest were root-owned.. Additionally if it's expecting to write
to the u+w files, they probably need to be renamed/@sample'd, otherwise
if they're changed, upgrades won't work properly..

Re: [update] dunst-1.2.0

Stuart Henderson <stu@spacehopper.org> writes:

> On 2017/08/31 22:31, Timo Myyrä wrote:
>
>> Hi,
>>
>> Dunst seems to have gotten new release a while back.
>> Here's an update to bring the port up to date.
>>
>> Seems the port includes systemd stuff, should these be removed or just leave
>> them in?
>
> Personally I would @comment them in PLIST, but you will probably get
> 3 different answers from 3 different porters.
>

Ok, commenting seems a good method.

>> Timo
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/x11/dunst/Makefile,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 Makefile
>> --- Makefile 3 Nov 2016 09:46:44 -0000 1.2
>> +++ Makefile 31 Aug 2017 19:32:56 -0000
>> @@ -2,35 +2,39 @@
>>
>> COMMENT= customizable and lightweight notification-daemon
>>
>> -DISTNAME = dunst-1.1.0
>> -
>> -REVISION = 0
>> +DISTNAME = v${GH_TAGNAME}
>> +PKGNAME = dunst-${GH_TAGNAME}
>>
>> CATEGORIES = x11
>>
>> -HOMEPAGE= http://www.knopwob.org/dunst/
>> +HOMEPAGE= https://dunst-project.org/
>>
>> MAINTAINER = Timo Myyra <timo.myyra@wickedbsd.net>
>>
>> +GH_ACCOUNT = dunst-project
>> +GH_PROJECT = dunst
>> +GH_TAGNAME = 1.2.0
>> +
>
> Move GH_* up to the top where you have DISTNAME/PKGNAME.
> Get rid of DISTNAME/PKGNAME, your PKGNAME is the same as the
> default with GH_*, and your DISTNAME results in a badly named
> distfile ("v1.2.0.tar.gz").
>

Yeah, I tried some variations but that doesn't seem to work.

The direct path to source tarball is as follows:
https://github.com/dunst-project/dunst/archive/v1.2.0.tar.gz

The combo in the first diff is something that works. Other option would be to
skip GH_* variables and set necessary stuff manually.
With just the GH_* variables set the ports tries to fetch the distfile with url:
https://github.com/dunst-project/dunst/archive/1.2.0/dunst-1.2.0.tar.gz

The source file name isn't that great as v1.2.0.tar.gz though.

>> # BSD
>> PERMIT_PACKAGE_CDROM= Yes
>>
>> # uses pledge()
>> -WANTLIB += X11 Xext Xft Xinerama Xss c freetype m pthread z \
>> - cairo dbus-1 gio-2.0 glib-2.0 gobject-2.0 intl \
>> +WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xi Xrandr Xrender \
>> + X11 Xinerama Xss c m pthread z \
>> + cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0 \
>> + gdk-x11-2.0 gio-2.0 glib-2.0 gobject-2.0 intl \
>> pango-1.0 pangocairo-1.0 xdg-basedir
>
> This could do with a bit of a tidy-up; please kill the current
> WANTLIB lines, rerun port-lib-depends-check, and paste the
> results straight in, then they'll be nicely sorted and wrapped.
>
>>
>> -MASTER_SITES= http://www.knopwob.org/public/dunst-release/
>> -EXTRACT_SUFX = .tar.bz2
>> -
>> USE_GMAKE = Yes
>>
>> -LIB_DEPENDS += x11/dbus \
>> - x11/libxdg-basedir \
>> - devel/pango \
>> +LIB_DEPENDS += devel/gettext \
>> devel/glib2 \
>> + devel/pango \
>> graphics/cairo \
>> - devel/gettext
>> + graphics/gdk-pixbuf2 \
>> + x11/gtk+2 \
>> + x11/libxdg-basedir \
>> + x11/dbus
>>
>> MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
>>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/x11/dunst/distinfo,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 distinfo
>> --- distinfo 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ distinfo 31 Aug 2017 19:32:56 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (dunst-1.1.0.tar.bz2) = xyvxZ+qrTkSpjshxAbAj7+4KqJFt9WYwuZpbxT+NcHA=
>> -SIZE (dunst-1.1.0.tar.bz2) = 79032
>> +SHA256 (v1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
>> +SIZE (v1.2.0.tar.gz) = 110628
>> Index: patches/patch-config_mk
>> ===================================================================
>> RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 patch-config_mk
>> --- patches/patch-config_mk 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ patches/patch-config_mk 31 Aug 2017 19:32:56 -0000
>> @@ -1,12 +1,13 @@
>> $OpenBSD: patch-config_mk,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
>> ---- config.mk.orig Tue Jul 29 22:49:11 2014
>> -+++ config.mk Sat Apr 30 23:59:21 2016
>> -@@ -23,7 +23,7 @@ endif
>> +Index: config.mk
>> +--- config.mk.orig
>> ++++ config.mk
>> +@@ -28,7 +28,7 @@ endif
>>
>> # flags
>> - CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}
>> --CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
>> -+CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
>> + CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
>> +-CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS}
>> ++CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS}
>>
>> - pkg_config_packs := dbus-1 x11 freetype2 xext xft xscrnsaver \
>> + pkg_config_packs := dbus-1 x11 xscrnsaver \
>> "glib-2.0 >= 2.36" gio-2.0 \
>> Index: patches/patch-dunst_c
>> ===================================================================
>> RCS file: patches/patch-dunst_c
>> diff -N patches/patch-dunst_c
>> --- patches/patch-dunst_c 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,22 +0,0 @@
>> -$OpenBSD: patch-dunst_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
>> -Pledge rpath for config file, proc/exec for running scripts.
>> ---- dunst.c.orig Tue Jul 29 22:49:11 2014
>> -+++ dunst.c Sat Apr 30 23:13:54 2016
>> -@@ -4,6 +4,7 @@
>> - #define XLIB_ILLEGAL_ACCESS
>> -
>> - #include <assert.h>
>> -+#include <err.h>
>> - #include <unistd.h>
>> - #include <time.h>
>> - #include <stdio.h>
>> -@@ -361,6 +362,9 @@ int main(int argc, char *argv[])
>> -
>> - g_unix_signal_add(SIGUSR1, pause_signal, NULL);
>> - g_unix_signal_add(SIGUSR2, unpause_signal, NULL);
>> -+
>> -+ if (pledge("stdio rpath proc exec", NULL) == -1)
>> -+ err(1, "pledge");
>> -
>> - run(NULL);
>> - g_main_loop_run(mainloop);
>> Index: patches/patch-menu_c
>> ===================================================================
>> RCS file: patches/patch-menu_c
>> diff -N patches/patch-menu_c
>> --- patches/patch-menu_c 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,16 +0,0 @@
>> -$OpenBSD: patch-menu_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
>> -Refactor to exclude GNU extensions in regex
>> ---- menu.c.orig Tue Jul 29 22:49:11 2014
>> -+++ menu.c Sat Apr 30 23:27:00 2016
>> -@@ -27,10 +27,7 @@ char *extract_urls(const char *to_match)
>> - static regex_t cregex;
>> -
>> - if (!is_initialized) {
>> -- char *regex =
>> -- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
>> -- "[[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*"
>> -- "(\\([[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*\\)|[[:alnum:]\\-\\@;/?:&=%$+*~])+";
>> -+ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
>> - int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
>> - if (ret != 0) {
>> - printf("failed to compile regex\n");
>> Index: patches/patch-notification_c
>> ===================================================================
>> RCS file: patches/patch-notification_c
>> diff -N patches/patch-notification_c
>> --- patches/patch-notification_c 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,11 +0,0 @@
>> -$OpenBSD: patch-notification_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
>> ---- notification.c.orig Sat Apr 30 22:47:20 2016
>> -+++ notification.c Sat Apr 30 23:04:16 2016
>> -@@ -5,6 +5,7 @@
>> - #include <time.h>
>> - #include <glib.h>
>> - #include <errno.h>
>> -+#include <libgen.h>
>> - #include <string.h>
>> - #include <stdbool.h>
>> - #include <unistd.h>
>> Index: patches/patch-src_dunst_c
>> ===================================================================
>> RCS file: patches/patch-src_dunst_c
>> diff -N patches/patch-src_dunst_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-src_dunst_c 31 Aug 2017 19:32:56 -0000
>> @@ -0,0 +1,25 @@
>> +$OpenBSD$
>> +
>> +Index: src/dunst.c
>> +--- src/dunst.c.orig
>> ++++ src/dunst.c
>> +@@ -14,6 +14,9 @@
>> + #include <stdlib.h>
>> + #include <time.h>
>> +
>> ++#include <err.h>
>> ++#include <unistd.h>
>> ++
>> + #include "dbus.h"
>> + #include "menu.h"
>> + #include "notification.h"
>> +@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[])
>> + int owner_id = initdbus();
>> +
>> + x_setup();
>> ++
>> ++ if (pledge("stdio rpath proc exec", NULL) == -1)
>> ++ err(1, "pledge");
>> +
>> + if (settings.startup_notification) {
>> + notification *n = notification_create();
>> Index: patches/patch-src_menu_c
>> ===================================================================
>> RCS file: patches/patch-src_menu_c
>> diff -N patches/patch-src_menu_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-src_menu_c 31 Aug 2017 19:32:56 -0000
>> @@ -0,0 +1,17 @@
>> +$OpenBSD$
>> +
>> +Index: src/menu.c
>> +--- src/menu.c.orig
>> ++++ src/menu.c
>> +@@ -27,10 +27,7 @@ static int regex_init(void)
>> + if (is_initialized)
>> + return 1;
>> +
>> +- char *regex =
>> +- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
>> +- "[-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*"
>> +- "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+";
>> ++ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
>> + int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
>> + if (ret != 0) {
>> + fputs("failed to compile regex", stderr);
>> Index: patches/patch-src_notification_c
>> ===================================================================
>> RCS file: patches/patch-src_notification_c
>> diff -N patches/patch-src_notification_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-src_notification_c 31 Aug 2017 19:32:56 -0000
>> @@ -0,0 +1,13 @@
>> +$OpenBSD$
>> +
>> +Index: src/notification.c
>> +--- src/notification.c.orig
>> ++++ src/notification.c
>> +@@ -5,6 +5,7 @@
>> +
>> + #include <assert.h>
>> + #include <errno.h>
>> ++#include <libgen.h>
>> + #include <glib.h>
>> + #include <stdbool.h>
>> + #include <stdio.h>
>> Index: pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 PLIST
>> --- pkg/PLIST 3 May 2016 18:42:51 -0000 1.1.1.1
>> +++ pkg/PLIST 31 Aug 2017 19:32:56 -0000
>> @@ -1,5 +1,8 @@
>> @comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
>> @bin bin/dunst
>> +lib/systemd/
>> +lib/systemd/user/
>> +lib/systemd/user/dunst.service
>> @man man/man1/dunst.1
>> share/dbus-1/services/org.knopwob.dunst.service
>> share/examples/dunst/
>>

Any case, here's the slightly updated diff. Still needs a bit of tuning of GH_*
variables:

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 3 Nov 2016 09:46:44 -0000 1.2
+++ Makefile 31 Aug 2017 20:46:13 -0000
@@ -2,13 +2,16 @@

COMMENT= customizable and lightweight notification-daemon

-DISTNAME = dunst-1.1.0
+GH_ACCOUNT = dunst-project
+GH_PROJECT = dunst
+GH_TAGNAME = 1.2.0

-REVISION = 0
+DISTNAME = v${GH_TAGNAME}
+PKGNAME = dunst-${GH_TAGNAME}

CATEGORIES = x11

-HOMEPAGE= http://www.knopwob.org/dunst/
+HOMEPAGE= https://dunst-project.org/

MAINTAINER = Timo Myyra <timo.myyra@wickedbsd.net>

@@ -16,21 +19,22 @@ MAINTAINER = Timo Myyra <timo.myyra@wick
PERMIT_PACKAGE_CDROM= Yes

# uses pledge()
-WANTLIB += X11 Xext Xft Xinerama Xss c freetype m pthread z \
- cairo dbus-1 gio-2.0 glib-2.0 gobject-2.0 intl \
- pango-1.0 pangocairo-1.0 xdg-basedir
-
-MASTER_SITES= http://www.knopwob.org/public/dunst-release/
-EXTRACT_SUFX
= .tar.bz2
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
+WANTLIB += z

USE_GMAKE = Yes

-LIB_DEPENDS += x11/dbus \
- x11/libxdg-basedir \
- devel/pango \
+LIB_DEPENDS += devel/gettext \
devel/glib2 \
+ devel/pango \
graphics/cairo \
- devel/gettext
+ graphics/gdk-pixbuf2 \
+ x11/gtk+2 \
+ x11/libxdg-basedir \
+ x11/dbus

MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"

Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 3 May 2016 18:42:51 -0000 1.1.1.1
+++ distinfo 31 Aug 2017 20:46:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.1.0.tar.bz2) = xyvxZ+qrTkSpjshxAbAj7+4KqJFt9WYwuZpbxT+NcHA=
-SIZE (dunst-1.1.0.tar.bz2) = 79032
+SHA256 (v1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
+SIZE (v1.2.0.tar.gz) = 110628
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_mk
--- patches/patch-config_mk 3 May 2016 18:42:51 -0000 1.1.1.1
+++ patches/patch-config_mk 31 Aug 2017 20:46:13 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
---- config.mk.orig Tue Jul 29 22:49:11 2014
-+++ config.mk Sat Apr 30 23:59:21 2016
-@@ -23,7 +23,7 @@ endif
+Index: config.mk
+--- config.mk.orig
++++ config.mk
+@@ -28,7 +28,7 @@ endif

# flags
- CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}
--CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
-+CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
+ CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
+-CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS}
++CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS}

- pkg_config_packs := dbus-1 x11 freetype2 xext xft xscrnsaver \
+ pkg_config_packs := dbus-1 x11 xscrnsaver \
"glib-2.0 >= 2.36" gio-2.0 \
Index: patches/patch-dunst_c
===================================================================
RCS file: patches/patch-dunst_c
diff -N patches/patch-dunst_c
--- patches/patch-dunst_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-dunst_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
-Pledge rpath for config file, proc/exec for running scripts.
---- dunst.c.orig Tue Jul 29 22:49:11 2014
-+++ dunst.c Sat Apr 30 23:13:54 2016
-@@ -4,6 +4,7 @@
- #define XLIB_ILLEGAL_ACCESS
-
- #include <assert.h>
-+#include <err.h>
- #include <unistd.h>
- #include <time.h>
- #include <stdio.h>
-@@ -361,6 +362,9 @@ int main(int argc, char *argv[])
-
- g_unix_signal_add(SIGUSR1, pause_signal, NULL);
- g_unix_signal_add(SIGUSR2, unpause_signal, NULL);
-+
-+ if (pledge("stdio rpath proc exec", NULL) == -1)
-+ err(1, "pledge");
-
- run(NULL);
- g_main_loop_run(mainloop);
Index: patches/patch-menu_c
===================================================================
RCS file: patches/patch-menu_c
diff -N patches/patch-menu_c
--- patches/patch-menu_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-menu_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
-Refactor to exclude GNU extensions in regex
---- menu.c.orig Tue Jul 29 22:49:11 2014
-+++ menu.c Sat Apr 30 23:27:00 2016
-@@ -27,10 +27,7 @@ char *extract_urls(const char *to_match)
- static regex_t cregex;
-
- if (!is_initialized) {
-- char *regex =
-- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
-- "[[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*"
-- "(\\([[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*\\)|[[:alnum:]\\-\\@;/?:&=%$+*~])+";
-+ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
- int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
- if (ret != 0) {
- printf("failed to compile regex\n");
Index: patches/patch-notification_c
===================================================================
RCS file: patches/patch-notification_c
diff -N patches/patch-notification_c
--- patches/patch-notification_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-notification_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
---- notification.c.orig Sat Apr 30 22:47:20 2016
-+++ notification.c Sat Apr 30 23:04:16 2016
-@@ -5,6 +5,7 @@
- #include <time.h>
- #include <glib.h>
- #include <errno.h>
-+#include <libgen.h>
- #include <string.h>
- #include <stdbool.h>
- #include <unistd.h>
Index: patches/patch-src_dunst_c
===================================================================
RCS file: patches/patch-src_dunst_c
diff -N patches/patch-src_dunst_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dunst_c 31 Aug 2017 20:46:13 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: src/dunst.c
+--- src/dunst.c.orig
++++ src/dunst.c
+@@ -14,6 +14,9 @@
+ #include <stdlib.h>
+ #include <time.h>
+
++#include <err.h>
++#include <unistd.h>
++
+ #include "dbus.h"
+ #include "menu.h"
+ #include "notification.h"
+@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[])
+ int owner_id = initdbus();
+
+ x_setup();
++
++ if (pledge("stdio rpath proc exec", NULL) == -1)
++ err(1, "pledge");
+
+ if (settings.startup_notification) {
+ notification *n = notification_create();
Index: patches/patch-src_menu_c
===================================================================
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_menu_c 31 Aug 2017 20:46:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/menu.c
+--- src/menu.c.orig
++++ src/menu.c
+@@ -27,10 +27,7 @@ static int regex_init(void)
+ if (is_initialized)
+ return 1;
+
+- char *regex =
+- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
+- "[-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*"
+- "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+";
++ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
+ int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
+ if (ret != 0) {
+ fputs("failed to compile regex", stderr);
Index: patches/patch-src_notification_c
===================================================================
RCS file: patches/patch-src_notification_c
diff -N patches/patch-src_notification_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_notification_c 31 Aug 2017 20:46:13 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/notification.c
+--- src/notification.c.orig
++++ src/notification.c
+@@ -5,6 +5,7 @@
+
+ #include <assert.h>
+ #include <errno.h>
++#include <libgen.h>
+ #include <glib.h>
+ #include <stdbool.h>
+ #include <stdio.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 3 May 2016 18:42:51 -0000 1.1.1.1
+++ pkg/PLIST 31 Aug 2017 20:46:13 -0000
@@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
@bin bin/dunst
+@comment lib/systemd/
+@comment lib/systemd/user/
+@comment lib/systemd/user/dunst.service
@man man/man1/dunst.1
share/dbus-1/services/org.knopwob.dunst.service
share/examples/dunst/