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?
~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 -0000 1.12
+++ Makefile 17 Nov 2017 15:06:37 -0000
@@ -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 <bcal...@openbsd.org>
# 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 <bsd.port.mk>
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 -0000 1.2
+++ distinfo 17 Nov 2017 15:06:37 -0000
@@ -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 -0000
+++ patches/patch-doc_makefile_in 17 Nov 2017 15:06:37 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: doc/makefile.in
+--- doc/makefile.in.orig
++++ doc/makefile.in
+@@ -55,13 +55,11 @@ install :
+ cp galois-$$L.html \
+ ${prefix}/share/gnome/help/galois/$$L/galois.html ;\
+ done
+- mkdir -p ${prefix}/share/man/man6
+- cp galois.6 ${prefix}/share/man/man6
+- gzip -9 -f ${prefix}/share/man/man6/galois.6
++ install -d ${prefix}/man/man6
++ install -c -S -m 644 galois.6 ${prefix}/man/man6
+ for L in it ; do \
+- mkdir -p ${prefix}/share/man/$$L/man6 ;\
+- cp galois-$$L.6 ${prefix}/share/man/$$L/man6/galois.6 ;\
+- gzip -9 -f ${prefix}/share/man/$$L/man6/galois.6 ;\
++ install -d ${prefix}/man/$$L/man6 ;\
++ install -c -S -m 644 galois-$$L.6 ${prefix}/man/$$L/man6/galois.6 ;\
+ done
+ mkdir -p ${prefix}/share/omf/galois
+ cp ${OMF} ${prefix}/share/omf/galois
Index: patches/patch-src_grid_h
===================================================================
RCS file: patches/patch-src_grid_h
diff -N patches/patch-src_grid_h
--- patches/patch-src_grid_h 14 May 2017 12:02:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_grid_h,v 1.1 2017/05/14 12:02:03 espie Exp $
-assigning a slice to a gslice is a gnu extension actually
-turns out the non working code does work in both clang and eg++
-
-Index: src/grid.h
---- src/grid.h.orig
-+++ src/grid.h
-@@ -126,10 +126,11 @@ template <class T> void grid<T>::add(const coords &c,
- size_t len[] = { size_t(rows), size_t(cols), size_t(layers), };
- size_t str[] = { size_t(ncols), 1, size_t(ncols * nrows), };
- // doesn't work?
-- // std::gslice g(d0.x + ncols * (d0.y + nrows * d0.z),
-- // std::valarray<size_t>(len, 3),
-- // std::valarray<size_t>(str, 3));
-- // mask[g] = m;
-+ std::gslice g(d0.x + ncols * (d0.y + nrows * d0.z),
-+ std::valarray<size_t>(len, 3),
-+ std::valarray<size_t>(str, 3));
-+ mask[g] = m;
-+#if 0
- for (int i=0; i<layers; ++i)
- {
- std::gslice g(d0.x + ncols * (d0.y + nrows * (d0.z + i)),
-@@ -138,6 +139,7 @@ template <class T> void grid<T>::add(const coords &c,
- std::slice s(cols * rows * i, cols * rows, 1);
- mask[g] = m[s];
- }
-+#endif
-
- c0 = n0;
- rows = nrows;
Index: patches/patch-src_main_cc
===================================================================
RCS file: patches/patch-src_main_cc
diff -N patches/patch-src_main_cc
--- patches/patch-src_main_cc 15 Jul 2015 02:26:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2015/07/15 02:26:34 bcallah Exp $
-
-Disable HelpContents. This requires yelp, which
-requires webkit, which needlessly breaks galois
-on archs without webkit.
-
---- src/main.cc.orig Sun Jul 12 20:00:13 2015
-+++ src/main.cc Wed Jul 15 02:21:27 2015
-@@ -480,7 +480,6 @@ MainWindow::MainWindow()
- " <menuitem action='GameQuit'/>"
- " </menu>"
- " <menu action='HelpMenu'>"
-- " <menuitem action='HelpContents'/>"
- " <menuitem action='HelpAbout'/>"
- " </menu>"
- " </menubar>"
Index: patches/patch-src_makefile_in
===================================================================
RCS file: patches/patch-src_makefile_in
diff -N patches/patch-src_makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_makefile_in 17 Nov 2017 15:06:37 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/makefile.in
+--- src/makefile.in.orig
++++ src/makefile.in
+@@ -50,8 +50,8 @@ distclean : clean
+ - rm -f ${AC}
+
+ install : galois
+- mkdir -p ${prefix}/games
+- cp galois ${prefix}/games
++ install -d ${prefix}/bin
++ install -c -S -s -m 755 galois ${prefix}/bin
+ uninstall :
+ - rm -f ${prefix}/games/galois
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/galois/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 15 May 2014 15:26:48 -0000 1.2
+++ pkg/PLIST 17 Nov 2017 15:06:37 -0000
@@ -1,7 +1,33 @@
@comment $OpenBSD: PLIST,v 1.2 2014/05/15 15:26:48 bcallah Exp $
@bin bin/galois
+man/it/
+man/it/man6/
+@man man/it/man6/galois.6
@man man/man6/galois.6
share/applications/galois.desktop
+share/gnome/
+share/gnome/help/
+share/gnome/help/galois/
+share/gnome/help/galois/C/
+share/gnome/help/galois/C/fdl-1.3.xml
+share/gnome/help/galois/C/figure1.png
+share/gnome/help/galois/C/figure2.png
+share/gnome/help/galois/C/figure3.png
+share/gnome/help/galois/C/galois.html
+share/gnome/help/galois/C/galois.xml
+share/gnome/help/galois/C/gpl.dbk
+share/gnome/help/galois/it/
+share/gnome/help/galois/it/fdl-1.3.xml
+share/gnome/help/galois/it/figure1.png
+share/gnome/help/galois/it/figure2.png
+share/gnome/help/galois/it/figure3.png
+share/gnome/help/galois/it/galois.html
+share/gnome/help/galois/it/galois.xml
+share/gnome/help/galois/it/gpl.dbk
+share/omf/
+share/omf/galois/
+share/omf/galois/galois-C.omf
+share/omf/galois/galois-it.omf
share/pixmaps/
share/pixmaps/galois.png
@exec %D/bin/update-desktop-database
