git: 6cb3a901b472 - main - emulators/hugo: Unbreak on HEAD
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 May 2023 15:31:55 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6cb3a901b47253e7aa7b23580ddfa951eaf4bb27
commit 6cb3a901b47253e7aa7b23580ddfa951eaf4bb27
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-15 13:06:54 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-15 15:31:46 +0000
emulators/hugo: Unbreak on HEAD
- Refresh patches
- Pet portclippy
- Adopt port
---
emulators/hugo/Makefile | 62 ++++++++++++-----------------
emulators/hugo/files/patch-Makefile.in | 12 +++---
emulators/hugo/files/patch-configure | 20 +++++-----
emulators/hugo/files/patch-osd_freebsd_cd.c | 8 ++--
emulators/hugo/files/patch-pce.c | 6 +--
5 files changed, 48 insertions(+), 60 deletions(-)
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 49078aa9a9b9..5da1c5c26f33 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.zeograd.com/download/ \
http://www.sourcefiles.org/Emulators/Videogames/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= bofh@FreeBSD.org
COMMENT= PC Engine (TurboGrafx 16) emulator
WWW= https://www.zeograd.com/
@@ -14,52 +14,42 @@ LICENSE_COMB= multi
LIB_DEPENDS= libargp.so:devel/argp-standalone
-OPTIONS_DEFINE= GTK2 DOCS NETPLAY SDL_MIXER
-OPTIONS_DEFAULT=GTK2
-OPTIONS_SUB= yes
-NETPLAY_DESC= Netplay support
-SDL_MIXER_DESC= SDL_mixer support
-
-USES= gmake pkgconfig sdl
-USE_SDL= sdl
+USES= gmake localbase:ldflags pkgconfig sdl
USE_CSTD= gnu89
+USE_SDL= sdl
+
GNU_CONFIGURE= yes
CFLAGS+= -Wno-return-type
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
CONFLICTS_INSTALL= gohugo
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= GTK2 DOCS NETPLAY SDL_MIXER
+OPTIONS_DEFAULT=GTK2
+OPTIONS_SUB= yes
-.if empty(PORT_OPTIONS:MGTK2) && ${PORT_OPTIONS:MNETPLAY}
-IGNORE= NETPLAY support requires GTK2 support
-.endif
+NETPLAY_DESC= Netplay support
+SDL_MIXER_DESC= SDL_mixer support
-.if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
+GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES+= gnome
-USE_GNOME= gtk20 cairo gdkpixbuf2
-.else
-CONFIGURE_ARGS+= --disable-gui --disable-gtktest
-.endif
-
-.if ${PORT_OPTIONS:MNETPLAY}
-USE_SDL+= net
-.else
-CONFIGURE_ENV+= ac_cv_lib_SDL_net_main=no
-.endif
-
-.if ${PORT_OPTIONS:MSDL_MIXER}
-LIB_DEPENDS+= libvorbis.so:audio/libvorbis
-USE_SDL+= mixer
-CFLAGS+= -DOGG_SUPPORT
-.else
-CONFIGURE_ENV+= ac_cv_lib_SDL_mixer_main=no \
+GTK2_USES= gnome
+GTK2_USE= GNOME=gtk20 cairo gdkpixbuf2
+GTK2_CONFIGURE_OFF= --disable-gui --disable-gtktest
+NETPLAY_IMPLIES= GTK2
+NETPLAY_USE= SDL=net
+NETPLAY_CONFIGURE_ENV_OFF= ac_cv_lib_SDL_net_main=no
+SDL_MIXER_LIB_DEPENDS= libvorbis.so:audio/libvorbis
+SDL_MIXER_USE= SDL=mixer
+SDL_MIXER_CONFIGURE_ENV_OFF= ac_cv_lib_SDL_mixer_main=no \
ac_cv_lib_vorbis_main=no \
ac_cv_lib_vorbisfile_main=no
+SDL_MIXER_CFLAGS= -DOGG_SUPPORT
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+= -Wno-error=int-conversion
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/hugo/files/patch-Makefile.in b/emulators/hugo/files/patch-Makefile.in
index 495d5cf814ca..41e8781c1115 100644
--- a/emulators/hugo/files/patch-Makefile.in
+++ b/emulators/hugo/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Apr 5 15:23:11 2005
-+++ Makefile.in Fri May 19 02:40:30 2006
-@@ -444,7 +444,7 @@
+--- Makefile.in.orig 2005-04-05 20:23:11 UTC
++++ Makefile.in
+@@ -444,7 +444,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
hugo$(EXEEXT): $(hugo_OBJECTS) $(hugo_DEPENDENCIES)
@rm -f hugo$(EXEEXT)
@@ -9,14 +9,12 @@
hugod$(EXEEXT): $(hugod_OBJECTS) $(hugod_DEPENDENCIES)
@rm -f hugod$(EXEEXT)
$(LINK) $(hugod_LDFLAGS) $(hugod_OBJECTS) $(hugod_LDADD) $(LIBS)
-@@ -813,11 +813,11 @@
- fi \
+@@ -814,10 +814,10 @@ install-data-local:
done \
fi && \
-- if test -d $(srcdir)/doc; then \
+ if test -d $(srcdir)/doc; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
- for doc in $(srcdir)/doc/*.{html,txt,css}; do \
-+ if test -d $(srcdir)/doc; then \
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/hugo; \
+ for doc in $(srcdir)/doc/*.html $(srcdir)/doc/*.txt $(srcdir)/doc/*.css; do \
if test -f $$doc; then \
diff --git a/emulators/hugo/files/patch-configure b/emulators/hugo/files/patch-configure
index 4ef7f94edf78..d66893a3840b 100644
--- a/emulators/hugo/files/patch-configure
+++ b/emulators/hugo/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2005-04-05 14:28:53.000000000 -0500
-+++ configure 2007-10-09 21:55:43.000000000 -0500
-@@ -3256,7 +3256,7 @@
+--- configure.orig 2005-04-05 19:28:53 UTC
++++ configure
+@@ -3256,7 +3256,7 @@ if test "${ac_cv_lib_SDL_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3312,7 +3312,7 @@
+@@ -3312,7 +3312,7 @@ if test $ac_cv_lib_SDL_main = yes; then
#define HAVE_LIBSDL 1
_ACEOF
@@ -18,7 +18,7 @@
fi
#,,[AC_MSG_ERROR([need SDL. See #http://www.libsdl.org])])
-@@ -7877,7 +7877,7 @@
+@@ -7877,7 +7877,7 @@ _ACEOF
echo "$as_me:$LINENO: checking whether netplay support was asked" >&5
echo $ECHO_N "checking whether netplay support was asked... $ECHO_C" >&6
@@ -27,7 +27,7 @@
then
-@@ -8657,13 +8657,13 @@
+@@ -8657,13 +8657,13 @@ fi
fi
;;
@@ -44,10 +44,11 @@
-@@ -8675,6 +8675,35 @@
+@@ -8674,6 +8674,35 @@ else
+ SDL_FREEBSD_TRUE='#'
SDL_FREEBSD_FALSE=
fi
-
++
+
+ if test "$USE_SDL_mixer" = "yes"; then
+ LIBS="$LIBS -lSDL_mixer "
@@ -76,7 +77,6 @@
+fi
+ # ZE_: needs to be processed after SDL_MIXER_LINUX...
+ fi
-+
+
;;
sun4u-SunOS)
- echo "Solaris build enabled"
diff --git a/emulators/hugo/files/patch-osd_freebsd_cd.c b/emulators/hugo/files/patch-osd_freebsd_cd.c
index 3aeca921b8c9..d42aea67712c 100644
--- a/emulators/hugo/files/patch-osd_freebsd_cd.c
+++ b/emulators/hugo/files/patch-osd_freebsd_cd.c
@@ -1,6 +1,6 @@
---- osd_freebsd_cd.c.orig Fri May 19 01:33:50 2006
-+++ osd_freebsd_cd.c Fri May 19 01:36:44 2006
-@@ -38,7 +38,7 @@
+--- osd_freebsd_cd.c.orig 2003-10-12 21:45:03 UTC
++++ osd_freebsd_cd.c
+@@ -38,7 +38,7 @@ void osd_cd_close()
}
@@ -9,7 +9,7 @@
{
/*
int retries = 0;
-@@ -236,15 +236,3 @@
+@@ -236,15 +236,3 @@ void osd_cd_play_audio_range(UChar min_from, UChar sec
perror("play_audio_range");
*/
}
diff --git a/emulators/hugo/files/patch-pce.c b/emulators/hugo/files/patch-pce.c
index 56aedae4cfb4..39fbb0a44fb4 100644
--- a/emulators/hugo/files/patch-pce.c
+++ b/emulators/hugo/files/patch-pce.c
@@ -1,6 +1,6 @@
---- pce.c.orig 2005-03-28 08:17:45.000000000 -0600
-+++ pce.c 2007-10-09 21:32:50.000000000 -0500
-@@ -358,7 +358,7 @@
+--- pce.c.orig 2005-03-28 14:17:45 UTC
++++ pce.c
+@@ -358,7 +358,7 @@ UInt32 timer_60 = 0;
int UPeriod = 0;
// Number of frame to skip