Here's a new diff after feedback from bentley@, zhuk@, and sthen@. Changes from previous diff:
* Use intltool module, since it is required * Use SDL2 instead of SDL * Add NO_TEST since the tests don't work * Change MASTER_SITES (thanks abieber@) * Don't use gnu libtool * Don't create *.a files * Remove *.la files in post-install * Rearrange PLIST so exec is at the end Currently this is only compile tested. I'll do the run time tests tonight. OKs? Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/pcsxr/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 1 Oct 2013 09:07:14 -0000 1.7 +++ Makefile 5 Feb 2014 16:21:51 -0000 @@ -4,8 +4,8 @@ SHARED_ONLY = Yes COMMENT = Playstation 1 emulator -DISTNAME = pcsxr-1.9.92 -REVISION = 1 +DISTNAME = pcsxr-1.9.94.r87113 +PKGNAME = pcsxr-1.9.94beta0 CATEGORIES = emulators games HOMEPAGE = http://pcsxr.codeplex.com/ @@ -15,28 +15,45 @@ MAINTAINER = Jeremy Evans <jeremy@openbs # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = https://distfiles.bsdfrog.org/ +MASTER_SITES = http://deftly.net/ EXTRACT_SUFX = .tar.bz2 USE_GMAKE = Yes -MODULES = devel/gettext +MODULES = devel/gettext textproc/intltool -WANTLIB += GL SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst Xv Xxf86vm atk-1.0 -WANTLIB += c cairo cdio drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 +WANTLIB += GL ICE SDL2 SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xv +WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB += cdio dbus-1 drm expat ffi fontconfig freetype gdk-3 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs -WANTLIB += sndio usbhid xcb xcb-render xcb-shm xml2 z +WANTLIB += sndio stdc++ usbhid xcb xcb-dri2 xcb-glx xcb-render +WANTLIB += xcb-shm z + +BUILD_DEPENDS = devel/autoconf/2.69 \ + devel/automake/1.14 CONFIGURE_STYLE = gnu -CONFIGURE_ENV = CFLAGS="-I/usr/X11R6/include/" -CONFIGURE_ARGS = --enable-libcdio --enable-opengl +CONFIGURE_SCRIPT = autogen.sh +CONFIGURE_ENV = CPPFLAGS="-I/usr/X11R6/include/" \ + LDFLAGS="-L/usr/X11R6/lib" \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} +CONFIGURE_ARGS = --enable-libcdio --enable-opengl --enable-dynarec=no +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.14 +LIBTOOL_FLAGS = --tag=disable-static LIB_DEPENDS = audio/libcdio \ - devel/libglade2 \ - devel/sdl + x11/gtk+3 \ + devel/sdl2 RUN_DEPENDS = devel/desktop-file-utils + +post-install: + find ${WRKINST} -name '*.la' -print0 | xargs -0 rm + +NO_TEST = Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/pcsxr/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 1 Apr 2011 17:18:55 -0000 1.1.1.1 +++ distinfo 5 Feb 2014 03:01:23 -0000 @@ -1,5 +1,2 @@ -MD5 (pcsxr-1.9.92.tar.bz2) = KEEa7QtEJPlyJ9lL3vrsgw== -RMD160 (pcsxr-1.9.92.tar.bz2) = GAJuHvw0iuz2fyca2X6nDaS8z8A= -SHA1 (pcsxr-1.9.92.tar.bz2) = 0PM29JzcLtvsI+daAdEMjVQG7Vg= -SHA256 (pcsxr-1.9.92.tar.bz2) = +5bb8X6i1SFbWDOFNDURQ+jvcxbCVQSZG6djCfyTFhE= -SIZE (pcsxr-1.9.92.tar.bz2) = 1471890 +SHA256 (pcsxr-1.9.94.r87113.tar.bz2) = yySywHEfYqy4ZuRIPboIXpD8DLnkAl0WX9WmGIgtqTg= +SIZE (pcsxr-1.9.94.r87113.tar.bz2) = 1389412 Index: patches/patch-doc_pcsx_1 =================================================================== RCS file: /cvs/ports/emulators/pcsxr/patches/patch-doc_pcsx_1,v retrieving revision 1.1 diff -u -p -r1.1 patch-doc_pcsx_1 --- patches/patch-doc_pcsx_1 7 Sep 2011 16:00:19 -0000 1.1 +++ patches/patch-doc_pcsx_1 5 Feb 2014 03:05:51 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-doc_pcsx_1,v 1.1 2011/09/07 16:00:19 jeremy Exp $ ---- doc/pcsx.1.orig Mon Aug 2 01:39:52 2010 -+++ doc/pcsx.1 Wed Sep 7 08:42:19 2011 -@@ -29,7 +29,6 @@ Loads savestate STATENUM +--- doc/pcsxr.1.orig Tue Sep 10 02:55:59 2013 ++++ doc/pcsxr.1 Tue Feb 4 19:05:51 2014 +@@ -33,7 +33,6 @@ Loads savestate STATENUM .TP .B -help (-h) Display help message -.TP .SH AUTHOR - pcsx was written by Linuzappz <[email protected]>. PCSX-df was written by Ryan Schultz <[email protected]> and Andrew Burton <[email protected]>. + PCSX was written by Linuzappz <[email protected]>. PCSX-df was written by Ryan Schultz <[email protected]> and Andrew Burton <[email protected]>. PCSX-Reloaded was written by Wei Mingzhi <[email protected]>. This manual page was written by Ryan Schultz <[email protected]> for the Debian Project. Index: patches/patch-plugins_bladesio1_gui_c =================================================================== RCS file: patches/patch-plugins_bladesio1_gui_c diff -N patches/patch-plugins_bladesio1_gui_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_bladesio1_gui_c 5 Feb 2014 03:29:22 -0000 @@ -0,0 +1,43 @@ +$OpenBSD$ +--- plugins/bladesio1/gui.c.orig Tue Feb 4 19:27:11 2014 ++++ plugins/bladesio1/gui.c Tue Feb 4 19:29:14 2014 +@@ -26,8 +26,6 @@ + #include <gtk/gtk.h> + + #include <sys/socket.h> +-#include <sys/ioctl.h> +-#include <linux/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <netdb.h> +@@ -42,6 +40,7 @@ + + #define MAXINTERFACES 16 + ++#if 0 + void sockGetIP(char *IPAddress) { + int fd, intrface; + struct ifreq buf[MAXINTERFACES]; +@@ -66,6 +65,22 @@ void sockGetIP(char *IPAddress) { + close(fd); + } + } ++ ++#else ++ ++void sockGetIP(char *IPAddress) { ++ struct hostent *host; ++ char str[256]; ++ ++ gethostname(str, 256); ++ host = gethostbyname(str); ++ ++ if (host != NULL) ++ strcpy(IPAddress, inet_ntoa(*((struct in_addr *)host->h_addr_list[0]))); ++ else strcpy(IPAddress, "127.0.0.1"); ++} ++ ++#endif + + void cfgSysMessage(const char *fmt, ...) { + GtkWidget *MsgDlg; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/pcsxr/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 1 Apr 2011 21:56:21 -0000 1.2 +++ pkg/PLIST 5 Feb 2014 15:54:48 -0000 @@ -1,44 +1,58 @@ @comment $OpenBSD: PLIST,v 1.2 2011/04/01 21:56:21 jeremy Exp $ -@bin bin/pcsx +@bin bin/pcsxr lib/games/ lib/games/psemu/ +@bin lib/games/psemu/cfgBladeSio1 @bin lib/games/psemu/cfgDFCdrom @bin lib/games/psemu/cfgDFInput @bin lib/games/psemu/cfgDFNet @bin lib/games/psemu/cfgDFSound @bin lib/games/psemu/cfgDFXVideo @bin lib/games/psemu/cfgpeopsxgl -@comment lib/games/psemu/libDFCdrom.la +lib/games/psemu/libBladeSio1.so lib/games/psemu/libDFCdrom.so -@comment lib/games/psemu/libDFInput.la lib/games/psemu/libDFInput.so -@comment lib/games/psemu/libDFNet.la lib/games/psemu/libDFNet.so -@comment lib/games/psemu/libDFSound.la lib/games/psemu/libDFSound.so -@comment lib/games/psemu/libDFXVideo.la lib/games/psemu/libDFXVideo.so -@comment lib/games/psemu/libpeopsxgl.la lib/games/psemu/libpeopsxgl.so -@man man/man1/pcsx.1 -share/applications/pcsx.desktop -share/locale/it/LC_MESSAGES/pcsx.mo -share/locale/pt_BR/LC_MESSAGES/pcsx.mo +@man man/man1/pcsxr.1 +share/applications/pcsxr.desktop +share/locale/fr_FR/ +share/locale/fr_FR/LC_MESSAGES/ +share/locale/fr_FR/LC_MESSAGES/pcsxr.mo +share/locale/hu_HU/ +share/locale/hu_HU/LC_MESSAGES/ +share/locale/hu_HU/LC_MESSAGES/pcsxr.mo +share/locale/it/LC_MESSAGES/pcsxr.mo +share/locale/pt_BR/LC_MESSAGES/pcsxr.mo share/locale/ru_RU/ share/locale/ru_RU/LC_MESSAGES/ -share/locale/ru_RU/LC_MESSAGES/pcsx.mo -share/locale/zh_CN/LC_MESSAGES/pcsx.mo -share/locale/zh_TW/LC_MESSAGES/pcsx.mo -share/pcsx/ -share/pcsx/pcsx.glade2 -share/pcsx/pcsx.jpg +share/locale/ru_RU/LC_MESSAGES/pcsxr.mo +share/locale/zh_CN/LC_MESSAGES/pcsxr.mo +share/locale/zh_TW/LC_MESSAGES/pcsxr.mo +share/pcsxr/ +share/pcsxr/cd.png +share/pcsxr/cdr.png +share/pcsxr/gpu.png +share/pcsxr/iso-open.png +share/pcsxr/iso-reopen.png +share/pcsxr/memcard.png +share/pcsxr/pad.png +share/pcsxr/pcsxr.png +share/pcsxr/pcsxr.ui +share/pcsxr/play.png +share/pcsxr/sio1.png +share/pcsxr/spu.png share/pixmaps/ -share/pixmaps/pcsx-icon.png +share/pixmaps/pcsxr-icon.png share/psemu/ -share/psemu/dfcdrom.glade2 -share/psemu/dfinput.glade2 -share/psemu/dfnet.glade2 -share/psemu/dfsound.glade2 -share/psemu/dfxvideo.glade2 +share/psemu/dfcdrom.ui +share/psemu/dfinput.ui +share/psemu/dfnet.ui +share/psemu/dfsound.ui +share/psemu/dfxvideo.ui +share/psemu/peopsxgl.ui +share/psemu/sio1.ui @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database
