pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/bmp bmp: Merge makefiles.
details: https://anonhg.NetBSD.org/pkgsrc/rev/925968169067
branches: trunk
changeset: 449744:925968169067
user: nia <nia%pkgsrc.org@localhost>
date: Mon Apr 05 08:56:55 2021 +0000
description:
bmp: Merge makefiles.
diffstat:
audio/bmp/Makefile | 78 ++++++++++++++++++++++++++++++++++++++++------
audio/bmp/Makefile.common | 69 -----------------------------------------
2 files changed, 68 insertions(+), 79 deletions(-)
diffs (171 lines):
diff -r 48f0260df8ce -r 925968169067 audio/bmp/Makefile
--- a/audio/bmp/Makefile Mon Apr 05 08:55:14 2021 +0000
+++ b/audio/bmp/Makefile Mon Apr 05 08:56:55 2021 +0000
@@ -1,16 +1,25 @@
-# $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/}
-USE_TOOLS+= unzip:run
+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
-PLIST_VARS+= cdaudio
-.if ${OPSYS} != "Darwin"
-PLIST.cdaudio= yes
-.endif
-PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
+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
# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
# any open plugin. libstdc++ gets dynamically linked in when the id3lib
@@ -19,9 +28,58 @@
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"
+PLIST.cdaudio= yes
+.endif
+PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
+
+.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"
diff -r 48f0260df8ce -r 925968169067 audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Mon Apr 05 08:55:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile.common,v 1.34 2021/04/05 08:51:29 nia Exp $
-#
-# used by audio/bmp/Makefile
-
-DISTNAME= bmp-0.9.7.1
-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
-
-DISTINFO_FILE= ${.CURDIR}/../../audio/bmp/distinfo
-FILESDIR= ${.CURDIR}/../../audio/xmms/files
-PATCHDIR= ${.CURDIR}/../../audio/bmp/patches
-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
-
-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"
-
-.if ${OPSYS} == "NetBSD"
-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/libmikmod/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 "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index