Hello @ports, Tested on amd64 and loongson.
I used nm as specified in [1], and no functions were added and/or removed. Also compared mikmod.h in both versions and no function signature changed. I understand that in this case, there is no need to bump anything in SHARED_LIBS. sndio support was merged upstream, so most patches are going to the attic. Lastly, HOMEPAGE listed in previous version Makefile redirects to http://mikmod.sourceforge.net/ so updated Makefile. If possible, I would like to adopt this port and added myself as MAINTAINER just in case this is approved. If not, please discard this line. [1] http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs Index: Makefile =================================================================== RCS file: /cvs/ports/audio/libmikmod/Makefile,v retrieving revision 1.28 diff -u -p -u -p -r1.28 Makefile --- Makefile 25 Aug 2015 13:18:24 -0000 1.28 +++ Makefile 19 Mar 2016 22:08:44 -0000 @@ -1,31 +1,28 @@ # $OpenBSD: Makefile,v 1.28 2015/08/25 13:18:24 sthen Exp $ -COMMENT= mikmod sound library +COMMENT = mikmod sound library -DISTNAME= libmikmod-3.3.7 +DISTNAME = libmikmod-3.3.8 SHARED_LIBS += mikmod 4.0 # .3.0 -CATEGORIES= audio devel -REVISION= 0 +CATEGORIES = audio devel -HOMEPAGE= http://mikmod.shlomifish.org/ +MAINTAINER = Frederic Cambus <f...@statdns.com> + +HOMEPAGE = http://mikmod.sourceforge.net/ # LGPLv2.1+ -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM = Yes WANTLIB += m pthread sndio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mikmod/} +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mikmod/} + +SEPARATE_BUILD = Yes +CONFIGURE_STYLE = gnu -SEPARATE_BUILD= Yes -CONFIGURE_STYLE= gnu -CFLAGS += -DDRV_SNDIO -CONFIGURE_ENV= LIBRARY_LIB="-lsndio" CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --disable-dl \ --disable-oss \ --disable-esd - -post-extract: - cp ${FILESDIR}/drv_sndio.c ${WRKSRC}/drivers .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/libmikmod/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 18 Oct 2014 14:56:28 -0000 1.5 +++ distinfo 19 Mar 2016 22:08:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (libmikmod-3.3.7.tar.gz) = TPQQQKmvmcuWBYAhC6kAwKUZ9zq5e1A8eA6CQoub2aI= -SIZE (libmikmod-3.3.7.tar.gz) = 1226732 +SHA256 (libmikmod-3.3.8.tar.gz) = Ss9mNKR32LlfGLVaPi52BSwUnmkNICSE6LCsdYnPN6I= +SIZE (libmikmod-3.3.8.tar.gz) = 1254702 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- Makefile.in.orig Thu Oct 9 20:26:32 2014 -+++ Makefile.in Thu Oct 9 20:27:37 2014 -@@ -120,7 +120,7 @@ am_libmikmod_la_OBJECTS = dlapi/dl_hpux.lo drivers/drv - drivers/drv_pulseaudio.lo drivers/drv_pipe.lo \ - drivers/drv_psp.lo drivers/drv_raw.lo drivers/drv_sam9407.lo \ - drivers/drv_sb.lo drivers/drv_sdl.lo drivers/drv_sgi.lo \ -- drivers/drv_stdout.lo drivers/drv_sun.lo drivers/drv_ultra.lo \ -+ drivers/drv_stdout.lo drivers/drv_sndio.lo drivers/drv_sun.lo drivers/drv_ultra.lo \ - drivers/drv_wav.lo drivers/drv_win.lo drivers/drv_wss.lo \ - drivers/drv_xaudio2.lo loaders/load_669.lo loaders/load_amf.lo \ - loaders/load_asy.lo loaders/load_dsm.lo loaders/load_far.lo \ -@@ -616,6 +616,8 @@ drivers/drv_sdl.lo: drivers/$(am__dirstamp) \ - drivers/drv_sgi.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) - drivers/drv_stdout.lo: drivers/$(am__dirstamp) \ -+ drivers/$(DEPDIR)/$(am__dirstamp) -+drivers/drv_sndio.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) - drivers/drv_sun.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 18 Oct 2014 14:56:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2014/10/18 14:56:28 bcallah Exp $ - -sndio - ---- configure.orig Thu Oct 9 20:22:35 2014 -+++ configure Thu Oct 9 20:23:31 2014 -@@ -15860,7 +15860,7 @@ done - libmikmod_driver_hp=yes - fi - ;; -- netbsd*|openbsd*) -+ netbsd*) - for ac_header in sys/audioio.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" -@@ -16089,7 +16089,7 @@ done - # otherwise no link library is needed. - oss_library="" - case $host_os in -- netbsd*|openbsd*) -+ netbsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 - $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } - if ${ac_cv_lib_ossaudio__oss_ioctl+:} false Index: patches/patch-drivers_Makefile_in =================================================================== RCS file: patches/patch-drivers_Makefile_in diff -N patches/patch-drivers_Makefile_in --- patches/patch-drivers_Makefile_in 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-drivers_Makefile_in,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- drivers/Makefile.in.orig Thu Oct 9 20:28:20 2014 -+++ drivers/Makefile.in Thu Oct 9 20:28:38 2014 -@@ -279,6 +279,7 @@ EXTRA_DIST = CMakeLists.txt \ - drv_sdl.c \ - drv_sgi.c \ - drv_stdout.c \ -+ drv_sndio.c \ - drv_sun.c \ - drv_ultra.c \ - drv_wav.c \ Index: patches/patch-include_mikmod_h =================================================================== RCS file: patches/patch-include_mikmod_h diff -N patches/patch-include_mikmod_h --- patches/patch-include_mikmod_h 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-include_mikmod_h,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- include/mikmod.h.orig Thu Oct 9 20:31:54 2014 -+++ include/mikmod.h Thu Oct 9 20:32:29 2014 -@@ -814,6 +814,7 @@ MIKMODAPI extern struct MDRIVER drv_oss; /* OpenSou - MIKMODAPI extern struct MDRIVER drv_openal; /* OpenAL driver */ - MIKMODAPI extern struct MDRIVER drv_sdl; /* SDL audio driver */ - MIKMODAPI extern struct MDRIVER drv_sgi; /* SGI audio library */ -+MIKMODAPI extern struct MDRIVER drv_sndio; /* sndio, baby! */ - MIKMODAPI extern struct MDRIVER drv_sun; /* Sun/NetBSD/OpenBSD audio device */ - - MIKMODAPI extern struct MDRIVER drv_dart; /* OS/2 Direct Audio RealTime */ Index: patches/patch-playercode_mdreg_c =================================================================== RCS file: patches/patch-playercode_mdreg_c diff -N patches/patch-playercode_mdreg_c --- patches/patch-playercode_mdreg_c 18 Oct 2014 14:56:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-playercode_mdreg_c,v 1.3 2014/10/18 14:56:28 bcallah Exp $ ---- playercode/mdreg.c.orig Thu Oct 9 20:28:59 2014 -+++ playercode/mdreg.c Thu Oct 9 20:29:37 2014 -@@ -80,6 +80,9 @@ static void _mm_registeralldrivers(void) - #ifdef DRV_SGI - _mm_registerdriver(&drv_sgi); - #endif -+#ifdef DRV_SNDIO -+ _mm_registerdriver(&drv_sndio); -+#endif - #ifdef DRV_SUN - _mm_registerdriver(&drv_sun); - #endif Index: patches/patch-playercode_mplayer_c =================================================================== RCS file: /cvs/ports/audio/libmikmod/patches/patch-playercode_mplayer_c,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-playercode_mplayer_c --- patches/patch-playercode_mplayer_c 18 Oct 2014 14:56:28 -0000 1.7 +++ patches/patch-playercode_mplayer_c 19 Mar 2016 22:08:44 -0000 @@ -1,9 +1,6 @@ -$OpenBSD: patch-playercode_mplayer_c,v 1.7 2014/10/18 14:56:28 bcallah Exp $ - -Avoid setting envelope cursors to negative values. - ---- playercode/mplayer.c.orig Thu Oct 9 20:29:53 2014 -+++ playercode/mplayer.c Thu Oct 9 20:30:34 2014 +$OpenBSD$ +--- playercode/mplayer.c.orig Mon Apr 27 04:51:00 2015 ++++ playercode/mplayer.c Fri Mar 18 07:39:21 2016 @@ -368,9 +368,9 @@ static SWORD StartEnvelope(ENVPR *t,UBYTE flg,UBYTE pt }
