Hi ports@,

Here is a diff to update snes9x to 1.55.

Notable changes:

- Switch to GTK+ 3 and regenerate WANTLIB
- Remove now useless CONFIGURE_ENV directive and pre-configure target
- Fix PERMIT_PACKAGE_CDROM marker
- Take MAINTAINER

Comments? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile    21 Nov 2017 00:13:00 -0000      1.39
+++ Makefile    30 Dec 2017 17:28:36 -0000
@@ -5,33 +5,35 @@ BROKEN-alpha =        ICE/failure on filter/hq2
 BROKEN-hppa =  ICE/failure on filter/hq2x.cpp
 BROKEN-powerpc =ICE/failure on filter/hq2x.cpp
 
-DISTNAME =     snes9x-1.54.1
+DISTNAME =     snes9x-1.55
+
 CATEGORIES =   emulators games
-REVISION =     1
 
 HOMEPAGE =     http://www.snes9x.com/
 
+MAINTAINER =   Frederic Cambus <fcam...@openbsd.org>
+
 # non-commercial
-PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_CDROM = non-commercial
 PERMIT_PACKAGE_FTP =   Yes
 
-WANTLIB += SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender Xv atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 png pthread xml2 z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} SDL X11 Xext Xrandr Xv atk-1.0 c
+WANTLIB += cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gthread-2.0 gtk-3 intl m pango-1.0 pangocairo-1.0
+WANTLIB += png xml2 z
 
 MASTER_SITES = https://sites.google.com/site/bearoso/snes9x/
 EXTRACT_SUFX = .tar.bz2
 
 RUN_DEPENDS =  devel/desktop-file-utils \
                x11/gtk+3,-guic
+
 LIB_DEPENDS =  devel/sdl \
                graphics/png \
                textproc/libxml \
-               x11/gtk+2 
+               x11/gtk+3
 
-MODULES =      textproc/intltool \
+MODULES =      textproc/intltool
 
 COMPILER =     base-clang ports-gcc
 
@@ -42,17 +44,13 @@ CONFIGURE_ARGS = --without-portaudio \
                 --without-oss \
                 --without-alsa \
                 --without-pulseaudio \
-                --without-opengl 
-CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-               LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+                --without-opengl \
+                --without-system-zip \
+                --with-gtk3
 
 NO_TEST =      Yes
 
 WRKSRC =       ${WRKDIST}/gtk
-
-# fix build with glib2>=2.50
-pre-configure:
-       sed -i "s,-pedantic,," ${WRKSRC}/configure
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo    18 Nov 2016 07:28:57 -0000      1.7
+++ distinfo    30 Dec 2017 17:28:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (snes9x-1.54.1.tar.bz2) = J9urVeQBk9Y3Td7MD9VP5TqzWyqtfu8emJwMC6mCtmI=
-SIZE (snes9x-1.54.1.tar.bz2) = 1990069
+SHA256 (snes9x-1.55.tar.bz2) = JcVO2B5XJq87NZyUj7AvxZX5xiWiS+Yln9JKe75jfUs=
+SIZE (snes9x-1.55.tar.bz2) = 2033103
Index: patches/patch-gtk_configure
===================================================================
RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-gtk_configure
--- patches/patch-gtk_configure 18 Nov 2016 07:28:57 -0000      1.5
+++ patches/patch-gtk_configure 30 Dec 2017 17:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-gtk_configure,v 1.5 2016/11/18 07:28:57 bentley Exp $
---- gtk/configure.orig Fri Oct 14 20:19:21 2016
-+++ gtk/configure      Mon Oct 17 01:16:27 2016
-@@ -7072,7 +7072,7 @@ else
+Index: gtk/configure
+--- gtk/configure.orig
++++ gtk/configure
+@@ -7170,7 +7170,7 @@ else
    CFLAGS="$CFLAGS -fomit-frame-pointer"
  fi
  

Reply via email to