Hi ports --
Attached is a single diff to update both audio/libmikmod and
audio/mikmod to their latest versions.
Runs well on amd64, testing elsewhere appreciated.
OK?
~Brian
Index: libmikmod/Makefile
===================================================================
RCS file: /cvs/ports/audio/libmikmod/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- libmikmod/Makefile 21 Mar 2013 08:45:12 -0000 1.26
+++ libmikmod/Makefile 10 Oct 2014 01:08:22 -0000
@@ -2,19 +2,20 @@
COMMENT= mikmod sound library
-DISTNAME= libmikmod-3.2.0
-SHARED_LIBS += mikmod 3.0 # .3.0
+DISTNAME= libmikmod-3.3.7
+SHARED_LIBS += mikmod 4.0 # .3.0
CATEGORIES= audio devel
HOMEPAGE= http://mikmod.shlomifish.org/
MAINTAINER= Peter Valchev <pvalc...@openbsd.org>
+# LGPLv2.1+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}files/
+WANTLIB += m pthread sndio
-WANTLIB= m sndio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mikmod/}
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
Index: libmikmod/distinfo
===================================================================
RCS file: /cvs/ports/audio/libmikmod/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- libmikmod/distinfo 13 Jan 2013 09:10:40 -0000 1.4
+++ libmikmod/distinfo 10 Oct 2014 01:08:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (libmikmod-3.2.0.tar.gz) = c0yEkLv5sMWHkguSQU3Po8ImeDigzfaY1fH7a7qPZh4=
-SIZE (libmikmod-3.2.0.tar.gz) = 873258
+SHA256 (libmikmod-3.3.7.tar.gz) = TPQQQKmvmcuWBYAhC6kAwKUZ9zq5e1A8eA6CQoub2aI=
+SIZE (libmikmod-3.3.7.tar.gz) = 1226732
Index: libmikmod/patches/patch-Makefile_in
===================================================================
RCS file: libmikmod/patches/patch-Makefile_in
diff -N libmikmod/patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libmikmod/patches/patch-Makefile_in 10 Oct 2014 01:08:22 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- 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: libmikmod/patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/libmikmod/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- libmikmod/patches/patch-configure 13 Jan 2013 09:10:40 -0000 1.2
+++ libmikmod/patches/patch-configure 10 Oct 2014 01:08:22 -0000
@@ -2,14 +2,23 @@ $OpenBSD: patch-configure,v 1.2 2013/01/
sndio
---- configure.orig Thu Jan 10 00:24:22 2013
-+++ configure Thu Jan 10 00:24:28 2013
-@@ -13343,7 +13343,7 @@ done
+--- 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)
+- 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: libmikmod/patches/patch-drivers_Makefile_in
===================================================================
RCS file: libmikmod/patches/patch-drivers_Makefile_in
diff -N libmikmod/patches/patch-drivers_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libmikmod/patches/patch-drivers_Makefile_in 10 Oct 2014 01:08:22 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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: libmikmod/patches/patch-include_mikmod_h
===================================================================
RCS file: libmikmod/patches/patch-include_mikmod_h
diff -N libmikmod/patches/patch-include_mikmod_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libmikmod/patches/patch-include_mikmod_h 10 Oct 2014 01:08:22 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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: libmikmod/patches/patch-include_mikmod_h_in
===================================================================
RCS file: libmikmod/patches/patch-include_mikmod_h_in
diff -N libmikmod/patches/patch-include_mikmod_h_in
--- libmikmod/patches/patch-include_mikmod_h_in 13 Jan 2013 09:10:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-include_mikmod_h_in,v 1.3 2013/01/13 09:10:40 sthen Exp $
---- include/mikmod.h.in.orig Sat May 12 10:52:13 2012
-+++ include/mikmod.h.in Thu Jan 10 00:26:38 2013
-@@ -85,7 +85,7 @@ typedef char CHAR;
-
- @DOES_NOT_HAVE_SIGNED@
-
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(__LP64__)
- /* 64 bit architectures */
-
- typedef signed char SBYTE; /* 1 byte, signed */
-@@ -723,6 +723,7 @@ MIKMODAPI extern struct MDRIVER drv_nas; /* Network
- MIKMODAPI extern struct MDRIVER drv_oss; /* OpenSound System (Linux,FreeBSD...) */
- MIKMODAPI extern struct MDRIVER drv_sgi; /* SGI audio library */
- MIKMODAPI extern struct MDRIVER drv_sun; /* Sun/NetBSD/OpenBSD audio device */
-+MIKMODAPI extern struct MDRIVER drv_sndio; /* sndio, baby! */
-
- MIKMODAPI extern struct MDRIVER drv_dart; /* OS/2 Direct Audio RealTime */
- MIKMODAPI extern struct MDRIVER drv_os2; /* OS/2 MMPM/2 */
Index: libmikmod/patches/patch-libmikmod_Makefile_in
===================================================================
RCS file: libmikmod/patches/patch-libmikmod_Makefile_in
diff -N libmikmod/patches/patch-libmikmod_Makefile_in
--- libmikmod/patches/patch-libmikmod_Makefile_in 13 Jan 2013 09:10:40 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-libmikmod_Makefile_in,v 1.4 2013/01/13 09:10:40 sthen Exp $
---- libmikmod/Makefile.in.orig Fri Jun 1 14:16:08 2012
-+++ libmikmod/Makefile.in Thu Jan 10 00:28:02 2013
-@@ -30,13 +30,13 @@ MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
-
- DEFS=@DEFS@
- CFLAGS=@CFLAGS@ -Dunix
--COMPILE=$(LIBTOOL) --silent --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h
-+COMPILE=$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h
-
- LIB = libmikmod.la
- OBJ = $(LIBOBJS) $(DLOBJS) \
- drv_AF.lo drv_aiff.lo drv_aix.lo drv_alsa.lo drv_esd.lo drv_hp.lo drv_nos.lo \
- drv_oss.lo drv_osx.lo drv_mac.lo drv_nas.lo drv_pipe.lo drv_raw.lo drv_sam9407.lo drv_sgi.lo \
-- drv_stdout.lo drv_sun.lo drv_ultra.lo drv_wav.lo \
-+ drv_stdout.lo drv_sun.lo drv_sndio.lo drv_ultra.lo drv_wav.lo \
- load_669.lo load_amf.lo load_asy.lo load_dsm.lo load_far.lo \
- load_gdm.lo load_gt2.lo load_it.lo load_imf.lo load_m15.lo load_med.lo \
- load_mod.lo load_mtm.lo load_okt.lo \
-@@ -130,6 +130,9 @@ drv_stdout.lo: $(top_srcdir)/drivers/drv_stdout.c \
- drv_sun.lo: $(top_srcdir)/drivers/drv_sun.c \
- $(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
- $(COMPILE) -c $(top_srcdir)/drivers/drv_sun.c
-+drv_sndio.lo: $(top_srcdir)/drivers/drv_sndio.c \
-+ $(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
-+ $(COMPILE) -c $(top_srcdir)/drivers/drv_sndio.c
- drv_ultra.lo: $(top_srcdir)/drivers/drv_ultra.c \
- $(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
- $(COMPILE) -c $(top_srcdir)/drivers/drv_ultra.c
Index: libmikmod/patches/patch-playercode_mdreg_c
===================================================================
RCS file: /cvs/ports/audio/libmikmod/patches/patch-playercode_mdreg_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-playercode_mdreg_c
--- libmikmod/patches/patch-playercode_mdreg_c 13 Jan 2013 09:10:40 -0000 1.2
+++ libmikmod/patches/patch-playercode_mdreg_c 10 Oct 2014 01:08:22 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-playercode_mdreg_c,v 1.2 2013/01/13 09:10:40 sthen Exp $
---- playercode/mdreg.c.orig Wed Mar 14 17:03:00 2012
-+++ playercode/mdreg.c Thu Jan 10 00:18:55 2013
-@@ -69,6 +69,9 @@ void _mm_registeralldrivers(void)
- #ifdef DRV_SUN
- _mm_registerdriver(&drv_sun);
+--- 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_DART
- _mm_registerdriver(&drv_dart);
+ #ifdef DRV_SUN
+ _mm_registerdriver(&drv_sun);
#endif
Index: libmikmod/patches/patch-playercode_mplayer_c
===================================================================
RCS file: /cvs/ports/audio/libmikmod/patches/patch-playercode_mplayer_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-playercode_mplayer_c
--- libmikmod/patches/patch-playercode_mplayer_c 13 Jan 2013 09:10:40 -0000 1.6
+++ libmikmod/patches/patch-playercode_mplayer_c 10 Oct 2014 01:08:22 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-playercode_mplayer_c,v 1
Avoid setting envelope cursors to negative values.
---- playercode/mplayer.c.orig Thu Jan 10 00:29:05 2013
-+++ playercode/mplayer.c Thu Jan 10 00:31:08 2013
-@@ -365,9 +365,9 @@ static SWORD StartEnvelope(ENVPR *t,UBYTE flg,UBYTE pt
+--- playercode/mplayer.c.orig Thu Oct 9 20:29:53 2014
++++ playercode/mplayer.c Thu Oct 9 20:30:34 2014
+@@ -368,9 +368,9 @@ static SWORD StartEnvelope(ENVPR *t,UBYTE flg,UBYTE pt
}
/* Fit in the envelope, still */
Index: libmikmod/pkg/PFRAG.shared
===================================================================
RCS file: libmikmod/pkg/PFRAG.shared
diff -N libmikmod/pkg/PFRAG.shared
--- libmikmod/pkg/PFRAG.shared 23 Dec 2005 15:29:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:29:08 espie Exp $
-@lib lib/libmikmod.so.${LIBmikmod_VERSION}
Index: libmikmod/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/libmikmod/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- libmikmod/pkg/PLIST 6 Aug 2004 14:37:27 -0000 1.2
+++ libmikmod/pkg/PLIST 10 Oct 2014 01:08:22 -0000
@@ -4,7 +4,8 @@ include/mikmod.h
@info info/mikmod.info
lib/libmikmod.a
lib/libmikmod.la
+@lib lib/libmikmod.so.${LIBmikmod_VERSION}
+lib/pkgconfig/libmikmod.pc
@man man/man1/libmikmod-config.1
share/aclocal/
share/aclocal/libmikmod.m4
-%%SHARED%%
Index: mikmod/Makefile
===================================================================
RCS file: /cvs/ports/audio/mikmod/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- mikmod/Makefile 10 Mar 2013 22:55:03 -0000 1.4
+++ mikmod/Makefile 10 Oct 2014 01:08:22 -0000
@@ -1,20 +1,18 @@
# $OpenBSD: Makefile,v 1.4 2013/03/10 22:55:03 espie Exp $
COMMENT = module audio player
-DISTNAME = mikmod-3.2.2
+DISTNAME = mikmod-3.2.6
CATEGORIES = audio
-REVISION = 1
HOMEPAGE = http://mikmod.shlomifish.org/
-
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
-# GPLv2
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m mikmod ncurses pthread sndio
-MASTER_SITES = ${HOMEPAGE}/files/
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mikmod/}
CONFIGURE_STYLE = gnu
Index: mikmod/distinfo
===================================================================
RCS file: /cvs/ports/audio/mikmod/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- mikmod/distinfo 13 Jan 2013 16:33:58 -0000 1.1.1.1
+++ mikmod/distinfo 10 Oct 2014 01:08:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (mikmod-3.2.2.tar.gz) = 6FZmUb9JvwBiweLoK2gpUoJMeZjM4LsuR6hA5Wegu4A=
-SIZE (mikmod-3.2.2.tar.gz) = 262918
+SHA256 (mikmod-3.2.6.tar.gz) = BFRODts2oZ+rYSM9/5dDCWnP83ipj1mJoTeDIFUOJnM=
+SIZE (mikmod-3.2.6.tar.gz) = 278754
Index: mikmod/patches/patch-mikmodrc
===================================================================
RCS file: /cvs/ports/audio/mikmod/patches/patch-mikmodrc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-mikmodrc
--- mikmod/patches/patch-mikmodrc 13 Jan 2013 16:33:58 -0000 1.1.1.1
+++ mikmod/patches/patch-mikmodrc 10 Oct 2014 01:08:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mikmodrc,v 1.1.1.1 2013/01/13 16:33:58 bcallah Exp $
---- mikmodrc.orig Sun Jan 13 11:25:24 2013
-+++ mikmodrc Sun Jan 13 11:26:49 2013
-@@ -295,9 +295,9 @@ END "ARCHIVER"
+--- mikmodrc.orig Thu Oct 9 20:45:39 2014
++++ mikmodrc Thu Oct 9 20:46:45 2014
+@@ -299,9 +299,9 @@ END "ARCHIVER"
BEGIN "ARCHIVER"
LOCATION = -1
MARKER = ".TAR.BZ2 .TBZ .TBZ2"
Index: mikmod/patches/patch-src_marchive_c
===================================================================
RCS file: mikmod/patches/patch-src_marchive_c
diff -N mikmod/patches/patch-src_marchive_c
--- mikmod/patches/patch-src_marchive_c 13 Jan 2013 16:33:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_marchive_c,v 1.1.1.1 2013/01/13 16:33:58 bcallah Exp $
-
-fix off-by-one
-
---- src/marchive.c.orig Sat Jan 12 03:22:23 2013
-+++ src/marchive.c Sat Jan 12 03:23:04 2013
-@@ -268,8 +268,8 @@ static BOOL filename2short (char *l, char *s, int len_
-
- static BOOL filename2short (char *l, char *s, int len_s)
- {
-- strncpy (s, l, len_s);
-- s[len_s] = '\0';
-+ strncpy (s, l, len_s - 1);
-+ s[len_s - 1] = '\0';
- return 1;
- }
-
Index: mikmod/patches/patch-src_mlistedit_c
===================================================================
RCS file: /cvs/ports/audio/mikmod/patches/patch-src_mlistedit_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_mlistedit_c
--- mikmod/patches/patch-src_mlistedit_c 13 Jan 2013 16:33:58 -0000 1.1.1.1
+++ mikmod/patches/patch-src_mlistedit_c 10 Oct 2014 01:08:22 -0000
@@ -2,12 +2,12 @@ $OpenBSD: patch-src_mlistedit_c,v 1.1.1.
fix off-by-one
---- src/mlistedit.c.orig Sat Jan 12 03:20:10 2013
-+++ src/mlistedit.c Sat Jan 12 03:21:01 2013
-@@ -917,7 +917,7 @@ void freq_open (char *title, char *path, int actline,
+--- src/mlistedit.c.orig Thu Oct 9 20:45:03 2014
++++ src/mlistedit.c Thu Oct 9 20:45:27 2014
+@@ -930,7 +930,7 @@ void freq_open (const char *title, const char *path, i
static BOOL cb_list_scan_dir (char *path, int added, int removed, void *data)
{
- BOOL quiet = (BOOL)(long)data;
+ BOOL quiet = (BOOL)(SINTPTR_T)data;
- char str[70], *pos;
+ char str[71], *pos;
int i;
