CVS commit: pkgsrc/audio/bmp

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr  5 08:56:55 UTC 2021

Modified Files:
        pkgsrc/audio/bmp: Makefile
Removed Files:
        pkgsrc/audio/bmp: Makefile.common

Log Message:
bmp: Merge makefiles.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/audio/bmp/Makefile
cvs rdiff -u -r1.34 -r0 pkgsrc/audio/bmp/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/bmp/Makefile
diff -u pkgsrc/audio/bmp/Makefile:1.82 pkgsrc/audio/bmp/Makefile:1.83
--- pkgsrc/audio/bmp/Makefile:1.82      Mon Apr  5 08:51:29 2021
+++ pkgsrc/audio/bmp/Makefile   Mon Apr  5 08:56:55 2021
@@ -1,10 +1,43 @@
-# $NetBSD: Makefile,v 1.82 2021/04/05 08:51:29 nia Exp $
+# $NetBSD: Makefile,v 1.83 2021/04/05 08:56:55 nia Exp $
 #
 
-.include "Makefile.common"
-PKGREVISION=           54
+DISTNAME=      bmp-0.9.7.1
+PKGREVISION=   54
+CATEGORIES=    audio
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=beepmp/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://beepmp.sourceforge.net/
+COMMENT=       Beep Media Player (fork of XMMS to work with GTK+ 2.x)
+LICENSE=       gnu-gpl-v2
+
+FILESDIR=              ${.CURDIR}/../../audio/xmms/files
+PATCH_SITES=           http://izb.knu.ac.kr/~bh/diffs/
+PATCHFILES=            bmp-0.9.7-ipv6-simple.diff
+PATCH_DIST_STRIP=      -p1
+
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            pkg-config unzip:run
 
-USE_TOOLS+=            unzip:run
+# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
+# any open plugin.  libstdc++ gets dynamically linked in when the id3lib
+# library is loaded, and is the one causing problems.  See PR pkg/26846
+# for more information.
+USE_LANGUAGES=         c c++
+LDFLAGS.NetBSD+=       -lstdc++ -lm
+
+CONFIGURE_ARGS+=       --disable-alsa
+CONFIGURE_ARGS+=       --disable-esd
+CONFIGURE_ARGS+=       --disable-opengl
+CONFIGURE_ARGS+=       --enable-mp3
+CONFIGURE_ARGS+=       --enable-ogg
+CONFIGURE_ARGS+=       --enable-vorbis
+
+PKGCONFIG_OVERRIDE+=   bmp.pc
+
+.include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=           cdaudio
 .if ${OPSYS} != "Darwin"
@@ -12,16 +45,41 @@ PLIST.cdaudio=              yes
 .endif
 PRINT_PLIST_AWK+=      /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
 
-# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
-# any open plugin.  libstdc++ gets dynamically linked in when the id3lib
-# library is loaded, and is the one causing problems.  See PR pkg/26846
-# for more information.
-USE_LANGUAGES=         c c++
-LDFLAGS.NetBSD+=       -lstdc++ -lm
+.if ${OPSYS} == "NetBSD"
+.  include "../../mk/oss.buildlink3.mk"
+RAWPART_cmd=           /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
+CONFIGURE_ARGS+=       --with-dev-dsp=${DEVOSSAUDIO:Q}                 \
+                       --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh}   \
+                       --with-cdda-dir=/cdrom/
+
+post-extract:
+       ${RM} ${WRKSRC}/Output/OSS/soundcard.h
+       ${LN} -s /usr/include/soundcard.h ${WRKSRC}/Output/OSS/soundcard.h
+
+.  if ${MACHINE_ARCH} == "i386"
+post-patch:
+.    if ${OBJECT_FMT} == "a.out"
+       ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/Input/mpg123/decode_i586.s
+.    endif
+       cd ${WRKSRC}/Input/mpg123 && \
+           ${MV} decode_i586.s decode_i586.s.orig && \
+           ${SED} -e 's@^/@#/@g' <decode_i586.s.orig >decode_i586.s
+.  endif
+.endif
 
+BUILDLINK_DEPMETHOD.libXt?=    build
+
+.include "options.mk"
 .include "../../audio/id3lib/buildlink3.mk"
+.include "../../audio/libmikmod/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"