Hi ports --
Attached is a simple update to x11/sakura.
Instead of maintaining the patch, we could just set -std=c99 in CFLAGS.
Run tested on amd64, build tested on armv7.
Take MAINTAINER while here.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/sakura/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 11 Jun 2017 15:14:18 -0000 1.19
+++ Makefile 1 Jan 2018 19:43:23 -0000
@@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.19 2017/06/11 15:14:18 jasper Exp $
-V = 3.4.0
+V = 3.5.0
COMMENT = GTK and VTE based terminal emulator
DISTNAME = sakura-${V}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11
HOMEPAGE = http://www.pleyades.net/david/projects/sakura/
+MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
@@ -29,7 +30,7 @@ RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
pre-configure:
- sed -i -e 's,-O2,,g' -e 's,share/man,man,g' \
+ sed -i -e 's,-O2,-std=c99,g' -e 's,share/man,man,g' \
${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/sakura/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 11 Jun 2017 15:14:18 -0000 1.11
+++ distinfo 1 Jan 2018 19:43:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (sakura-3.4.0.tar.bz2) = BEh1EQSdWWhW1wDVJMM1RhDHyq6LuHujwWhRNW0/QO4=
-SIZE (sakura-3.4.0.tar.bz2) = 54907
+SHA256 (sakura-3.5.0.tar.bz2) = 6zDt5BCD/aKwfGo7c5MVD0iGfoHSjvcLFYJHQMqwDDo=
+SIZE (sakura-3.5.0.tar.bz2) = 55432
Index: patches/patch-src_sakura_c
===================================================================
RCS file: patches/patch-src_sakura_c
diff -N patches/patch-src_sakura_c
--- patches/patch-src_sakura_c 12 Jun 2017 16:40:26 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-$OpenBSD: patch-src_sakura_c,v 1.4 2017/06/12 16:40:26 jasper Exp $
-
-error: 'for' loop initial declaration used outside C99 mode
-
-Index: src/sakura.c
---- src/sakura.c.orig
-+++ src/sakura.c
-@@ -1343,9 +1343,10 @@ sakura_color_dialog (GtkWidget *widget, void *data)
- static void
- sakura_fade_out()
- {
-+ int i;
- GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
- if( (x.red + x.green + x.blue) / 3.0 > 0.5) {
-- for( int i=0; i<NUM_COLORSETS; i++) {
-+ for( i=0; i<NUM_COLORSETS; i++) {
- GdkRGBA x = sakura.forecolors[i];
- x.red = x.red/100.0 * FADE_PERCENT;
- x.green = x.green/100.0 * FADE_PERCENT;
-@@ -1353,7 +1354,7 @@ sakura_fade_out()
- sakura.forecolors[i]=x;
- }
- } else {
-- for( int i=0; i<NUM_COLORSETS; i++) {
-+ for( i=0; i<NUM_COLORSETS; i++) {
- GdkRGBA x = sakura.forecolors[i];
- x.red = 1.0-x.red/100.0 * FADE_PERCENT;
- x.green = 1.0-x.green/100.0 * FADE_PERCENT;
-@@ -1366,9 +1367,10 @@ sakura_fade_out()
- static void
- sakura_fade_in()
- {
-+ int i;
- GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
- if( (x.red + x.green + x.blue) / 3.0 > 0.5) {
-- for( int i=0; i<NUM_COLORSETS; i++) {
-+ for( i=0; i<NUM_COLORSETS; i++) {
- GdkRGBA x = sakura.forecolors[i];
- x.red = x.red/FADE_PERCENT * 100.0;
- x.green = x.green/FADE_PERCENT * 100.0;
-@@ -1376,7 +1378,7 @@ sakura_fade_in()
- sakura.forecolors[i]=x;
- }
- } else {
-- for( int i=0; i<NUM_COLORSETS; i++) {
-+ for( i=0; i<NUM_COLORSETS; i++) {
- GdkRGBA x = sakura.forecolors[i];
- x.red = 1.0-x.red/FADE_PERCENT * 100.0;
- x.green = 1.0-x.green/FADE_PERCENT * 100.0;
