Re: UPDATE: games/galois 0.4 => 0.5

[Marc Espie]

On Fri, Nov 17, 2017 at 06:01:54PM -0500, Brian Callahan wrote:
> 
> On 11/17/17 14:15, Marc Espie wrote:
> >On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:
> >>Hi ports --
> >>
> >>Attached is a small update to games/galois.
> >>I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
> >>responsible for it again.
> >>
> >>The gettext MODULE gets removed from this port as a natural effect of the
> >>update.
> >>
> >>OK?
> >Explain what happened to grid.h
> >
> >Specifically, is that template code still there. Does it compile with both
> >clang and ports-gcc ?
> 
> For grid,h, the code that was put in the #if 0 block is gone, and the code
> that is uncommented is now the only code (and uncommented).
> 
> However, the game compiles but does not link with ports-gcc. It fails to
> link with undefined reference errors to glib functions. Some research
> suggests that there are linking problems with libxml++ and glib when some
> libraries/code is compiled with clang and others with gcc-4.9 and trying to
> link it all together. Are there any platforms for which using a 'COMPILER =
> base-clang ports-clang' line would cause issues? I notice that libxml++ uses
> 'COMPILER= base-clang ports-gcc'

Oh, going to compile with ports-gcc requires compiling every dependency,
obviously.

Which is why I just asked for *compile*. I know that linking is going
to be harder :)

okay espie@

Re: UPDATE: games/galois 0.4 => 0.5

[Brian Callahan]

On 11/17/17 14:15, Marc Espie wrote:

On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:

Hi ports --

Attached is a small update to games/galois.
I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
responsible for it again.

The gettext MODULE gets removed from this port as a natural effect of the
update.

OK?

Explain what happened to grid.h

Specifically, is that template code still there. Does it compile with both
clang and ports-gcc ?


For grid,h, the code that was put in the #if 0 block is gone, and the 
code that is uncommented is now the only code (and uncommented).


However, the game compiles but does not link with ports-gcc. It fails to 
link with undefined reference errors to glib functions. Some research 
suggests that there are linking problems with libxml++ and glib when 
some libraries/code is compiled with clang and others with gcc-4.9 and 
trying to link it all together. Are there any platforms for which using 
a 'COMPILER = base-clang ports-clang' line would cause issues? I notice 
that libxml++ uses 'COMPILER= base-clang ports-gcc'


~Brian

Re: UPDATE: games/galois 0.4 => 0.5

[Marc Espie]

On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a small update to games/galois.
> I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
> responsible for it again.
> 
> The gettext MODULE gets removed from this port as a natural effect of the
> update.
> 
> OK?

Explain what happened to grid.h

Specifically, is that template code still there. Does it compile with both
clang and ports-gcc ?

Re: UPDATE: games/galois 0.4 => 0.5

[Brian Callahan]

On 11/17/17 10:35, Landry Breuil wrote:

On Fri, Nov 17, 2017 at 10:31:23AM -0500, Brian Callahan wrote:


On 11/17/2017 10:29 AM, Landry Breuil wrote:

On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:

Hi ports --

Attached is a small update to games/galois.
I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
responsible for it again.

The gettext MODULE gets removed from this port as a natural effect of the
update.

OK?

Since it installs stuff in share/gnome/help/ i think it needs some RDEP
on yelp or something .. aja ?
Otherwise looks okayish


Oh. That must be the helpbrowser stuff we ripped out before.
The comment said there are more archs that could run galois than run
webkit. I wonder if that's still true in a C++14 world.

Doubtful. Either way, your call, either add is at an rdep or rip the
code calling out yelp from the help menu if there is some..



I'm fond of keeping it as it was, so I removed the help browser stuff.
It'll launch your preferred web browser if you pull up the help menu 
(which was always the fallback),


~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/galois/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile	16 Nov 2017 23:20:38 -	1.12
+++ Makefile	17 Nov 2017 16:29:06 -
@@ -1,31 +1,28 @@
 # $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $
 
 COMMENT =	free multi-dimensional Tetris-like game
-DISTNAME =	galois-0.4
+DISTNAME =	galois-0.5
 CATEGORIES =	games x11
-REVISION =	2
 
 HOMEPAGE =	http://www.nongnu.org/galois/
+MAINTAINER =	Brian Callahan 
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 c cairo cairomm-1.0
-WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
-WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-x11-2.0
-WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pangomm-1.4 pthread sigc-2.0 xml++-2.6 xml2 z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} atk-1.0 atkmm-1.6 c cairo cairo-gobject
+WANTLIB += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+WANTLIB += xml++-2.6 xml2
 
 MASTER_SITES =	${MASTER_SITE_SAVANNAH:=galois/source/}
 
-MODULES =	devel/gettext
-
-# c++11
-COMPILER =	base-clang ports-gcc
+# C++14
+COMPILER =	base-clang ports-clang ports-gcc
 
 LIB_DEPENDS =	textproc/libxml++>=2.40.0 \
-		x11/gtk2mm
+		x11/gtk3mm
 
 RUN_DEPENDS =	devel/desktop-file-utils
 
@@ -33,16 +30,8 @@ CONFIGURE_STYLE =	gnu
 
 MAKE_FILE =	makefile
 ALL_TARGET =	default
-MAKE_FLAGS =	CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++11"
+MAKE_FLAGS =	CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++14"
 
 NO_TEST =	Yes
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/galois ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/galois.6 ${PREFIX}/man/man6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/misc/galois.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/misc/galois.png ${PREFIX}/share/pixmaps
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/galois/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo	15 Jul 2015 02:26:34 -	1.2
+++ distinfo	17 Nov 2017 16:29:06 -
@@ -1,2 +1,2 @@
-SHA256 (galois-0.4.tar.gz) = oWiuZRTaHtpa/XYfpO6vUQ15mI1FCnFqDEHOl42Z5Ec=
-SIZE (galois-0.4.tar.gz) = 289202
+SHA256 (galois-0.5.tar.gz) = lO7NnxA431/RmxTKWyY0vQDQzZxTSlCpllWNisKfs5Q=
+SIZE (galois-0.5.tar.gz) = 291895
Index: patches/patch-doc_makefile_in
===
RCS file: patches/patch-doc_makefile_in
diff -N patches/patch-doc_makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-doc_makefile_in	17 Nov 2017 16:29:06 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Don't install gnome help pages.
+
+Index: doc/makefile.in
+--- doc/makefile.in.orig
 doc/makefile.in
+@@ -45,26 +45,12 @@ distclean : clean
+ 	- rm -f ${AC}
+ 
+ install :
+-	mkdir -p ${prefix}/share/gnome/help/galois/C
+-	cp ${HELP} ${prefix}/share/gnome/help/galois/C
++	install -d ${prefix}/man/man6
++	install -c -S -m 644 galois.6 ${prefix}/man/man6
+ 	for L in it ; do \
+-	mkdir -p ${prefix}/share/gnome/help/galois/$$L ;\
+-	cp galois-$$L.xml \
+-	   ${prefix}/share/gnome/help/galois/$$L/galois.xml ;\
+-	cp ${HELP_DEPS} ${prefix}/share/gnome/help/galois/$$L ;\
+-	cp galois-$$L.html \
+-	   ${prefix}/share/gnome/help/galois/$$L/galois.html ;\
++	install -d ${prefix}/man/$$L/man6 ;\
++	install -c -S -m 644 galois-$$L.6 ${prefix}/man/$$L/man6/galois.6 ;\
+ 	done
+-	mkdir -p 

Re: UPDATE: games/galois 0.4 => 0.5

[Landry Breuil]

On Fri, Nov 17, 2017 at 10:31:23AM -0500, Brian Callahan wrote:
> 
> 
> On 11/17/2017 10:29 AM, Landry Breuil wrote:
> > On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:
> >> Hi ports --
> >>
> >> Attached is a small update to games/galois.
> >> I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
> >> responsible for it again.
> >>
> >> The gettext MODULE gets removed from this port as a natural effect of the
> >> update.
> >>
> >> OK?
> > Since it installs stuff in share/gnome/help/ i think it needs some RDEP
> > on yelp or something .. aja ?
> > Otherwise looks okayish
> >
> 
> Oh. That must be the helpbrowser stuff we ripped out before.
> The comment said there are more archs that could run galois than run
> webkit. I wonder if that's still true in a C++14 world.

Doubtful. Either way, your call, either add is at an rdep or rip the
code calling out yelp from the help menu if there is some..

Re: UPDATE: games/galois 0.4 => 0.5

[Brian Callahan]

On 11/17/2017 10:29 AM, Landry Breuil wrote:
> On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:
>> Hi ports --
>>
>> Attached is a small update to games/galois.
>> I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
>> responsible for it again.
>>
>> The gettext MODULE gets removed from this port as a natural effect of the
>> update.
>>
>> OK?
> Since it installs stuff in share/gnome/help/ i think it needs some RDEP
> on yelp or something .. aja ?
> Otherwise looks okayish
>

Oh. That must be the helpbrowser stuff we ripped out before.
The comment said there are more archs that could run galois than run
webkit. I wonder if that's still true in a C++14 world.

Re: UPDATE: games/galois 0.4 => 0.5

[Landry Breuil]

On Fri, Nov 17, 2017 at 10:11:20AM -0500, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a small update to games/galois.
> I'll re-take MAINTAINER of this. I uploaded it way back when, I'll be
> responsible for it again.
> 
> The gettext MODULE gets removed from this port as a natural effect of the
> update.
> 
> OK?

Since it installs stuff in share/gnome/help/ i think it needs some RDEP
on yelp or something .. aja ?
Otherwise looks okayish