James Turner <[email protected]> writes:
> On Tue, Apr 21, 2020 at 04:48:25PM -0400, Andrea Fleckenstein wrote:
>> Hello,
>>
>> here is an update to games/golly. RIP John Conway.
>>
>> I only had to modify one patch, because detection of the gtk3 toolkit
>> is now upstream. builds/runs on amd64, no tests. I assume if
>> "make show-required-by" prints nothing there's nothing that depends on
>> golly that I have to test, is this right?
>>
>> obviously can wait until after 6.7 release
>>
>> this is my first port update, so I would really appreciate any advice
>> on porting, both things to look out for when doing updates and how to
>> submit to ports@ (i've just put the output of `cvs diff` below, is
>> that okay?)
>>
>> Thanks very much,
>> Andrea
>>
>
> Hi Andrea,
>
> I think you are missing some of your diff? I'm not seeing the updates to
> Makefile or distinfo for the change to 3.3?
Oops. See below.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/golly/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 12 Jul 2019 20:46:19 -0000 1.17
+++ Makefile 21 Apr 2020 22:38:58 -0000
@@ -2,8 +2,7 @@
COMMENT = game of life simulator
-PKGNAME = golly-3.2
-REVISION = 2
+PKGNAME = golly-3.3
DISTNAME = ${PKGNAME}-src
WRKSRC = ${WRKDIST}/gui-wx/configure
CATEGORIES = games math
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/golly/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 2 Jan 2019 12:43:19 -0000 1.5
+++ distinfo 21 Apr 2020 22:38:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (golly-3.2-src.tar.gz) = TQL3hZK16iEfHO2i1bpV6xDgE+z5W4phxwYTV/mq6TE=
-SIZE (golly-3.2-src.tar.gz) = 5261483
+SHA256 (golly-3.3-src.tar.gz) = iP13axr9dj7zKsbm2V3fy8UbdPbvah87qaplkpXVc8g=
+SIZE (golly-3.3-src.tar.gz) = 5465595
cvs server: Diffing files
cvs server: Diffing patches
Index: patches/patch-gui-wx_configure_configure
===================================================================
RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-gui-wx_configure_configure
--- patches/patch-gui-wx_configure_configure 2 Jan 2019 12:43:19 -0000
1.4
+++ patches/patch-gui-wx_configure_configure 21 Apr 2020 22:38:58 -0000
@@ -45,38 +45,14 @@ Index: gui-wx/configure/configure
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; }
- else
- TOOLKIT="$withval"
-
-- if test "$TOOLKIT" != "gtk1" -a
"$TOOLKIT" != "gtk2" -a \
-+ if test "$TOOLKIT" != "gtk1" -a
"$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
- "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
- "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
- "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
-@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
-
- WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
- WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
-+ WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
- WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
- WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
- WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
-@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
- WX_PORT="unknown"
- if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
- if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
-+ if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
- if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
- if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
- if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
-@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; }
- if test "$DEBUG" = "1"; then
- CXXFLAGS="$CXXFLAGS -g -O0"
+@@ -6335,8 +6319,8 @@ $as_echo "$WX_PORT" >&6; }
CFLAGS="$CFLAGS -g -O0"
-- else
+ elif test "$DEBUG" = "0"; then
+ BUILD="release"
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
++ CXXFLAGS="$CXXFLAGS"
++ CFLAGS="$CFLAGS"
fi
if test "x$WX_RESCOMP" != x; then
