Re: UPDATE x2: audio/libmikmod 3.2.0 => 3.3.7 and audio/mikmod 3.2.2 => 3.2.6

2014-10-16 Thread Brian Callahan 


On 10/16/14 12:33, Christian Weisgerber wrote:

On 2014-10-10, Brian Callahan  wrote:


Attached is a single diff to update both audio/libmikmod and
audio/mikmod to their latest versions.
Runs well on amd64, testing elsewhere appreciated.

Quick thoughts:
* Does XMMS still build (work) with this?


It does now with the xmms commit sthen@ just made. That commit also 
fixes MOD support with the libmikmod that is currently in-tree 
(previously, xmms would segfault when loading a MOD file).



* Time to remove pval as maintainer of libmikmod?


Sure; I can take libmikmod, seeing as mikmod is already mine.


* While you're there, consider overhauling the DESCR files.



Have something in mind? the DESCR files reflect the documentation as it 
is currently written.


~Brian

Re: UPDATE x2: audio/libmikmod 3.2.0 => 3.3.7 and audio/mikmod 3.2.2 => 3.2.6

2014-10-16 Thread Christian Weisgerber 
On 2014-10-10, Brian Callahan  wrote:

> Attached is a single diff to update both audio/libmikmod and 
> audio/mikmod to their latest versions.
> Runs well on amd64, testing elsewhere appreciated.

Quick thoughts:
* Does XMMS still build (work) with this?
* Time to remove pval as maintainer of libmikmod?
* While you're there, consider overhauling the DESCR files.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

UPDATE x2: audio/libmikmod 3.2.0 => 3.3.7 and audio/mikmod 3.2.2 => 3.2.6

2014-10-10 Thread Brian Callahan 

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 -	1.26
+++ libmikmod/Makefile	10 Oct 2014 01:08:22 -
@@ -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 
 
+# 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 -	1.4
+++ libmikmod/distinfo	10 Oct 2014 01:08:22 -
@@ -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 -
+++ libmikmod/patches/patch-Makefile_in	10 Oct 2014 01:08:22 -
@@ -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 -	1.2
+++ libmikmod/patches/patch-configure	10 Oct 2014 01:08:22 -
@@ -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 -
+++ libmikmod/patches/patch-drivers_Makefile_in	10 Oct 2014 01:08:22 -
@@ -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_