summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/libmpg123/Makefile45
-rw-r--r--audio/libmpg123/Makefile.common35
-rw-r--r--audio/libmpg123/Makefile.version8
-rw-r--r--audio/libmpg123/buildlink3.mk20
-rw-r--r--audio/libmpg123/mpg123-options.mk (renamed from audio/libmpg123/options.mk)4
5 files changed, 64 insertions, 48 deletions
diff --git a/audio/libmpg123/Makefile b/audio/libmpg123/Makefile
index 48495bac147..68730eb3fce 100644
--- a/audio/libmpg123/Makefile
+++ b/audio/libmpg123/Makefile
@@ -1,51 +1,28 @@
-# $NetBSD: Makefile,v 1.3 2008/09/19 17:49:26 ahoka Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/15 01:58:53 bjs Exp $
#
-.include "../../audio/libmpg123/Makefile.version"
+.include "../../audio/libmpg123/Makefile.common"
-DISTNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= bjs@NetBSD.org
-HOMEPAGE= http://mpg123.sourceforge.net/
+PKGNAME= libmpg123-${LIBMPG123_VERSION}
COMMENT= MPEG layer 1, 2, and 3 decoder library
PKG_DESTDIR_SUPPORT= user-destdir
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
-
PKGCONFIG_OVERRIDE+= libmpg123.pc.in
+AUTO_MKDIRS= yes
+
BUILD_DIRS= src/libmpg123
INSTALL_DIRS= src/libmpg123
-CONFIGURE_ARGS+= --enable-fifo=yes
-CONFIGURE_ARGS+= --enable-modules=yes
-CONFIGURE_ARGS+= --enable-network=yes
-CONFIGURE_ARGS+= --enable-gapless=yes
-###
-### XXX Use pkgsrc-provided CFLAGS.
-###
-CONFIGURE_ARGS+= --with-optimization=0
-CFLAGS+= ${COPTS.mpg123:U${COPTS}}
-###
-### XXX This should be set to 'no' for platforms where it is required.
-### It's easier doing this here than patching configure.
-MPG123_XFERMEM?= yes
-.if !empty(MPG123_XFERMEM:tl:Myes)
-BUILDLINK_TRANSFORM+= rm:-DNO_XFERMEM
-.endif
-
-INSTALLATION_DIRS= lib/pkgconfig
+post-extract:
+ ${ECHO} "#!${CONFIG_SHELL}${.newline}${TRUE}" > \
+ ${WRKSRC:Q}/libltdl/configure
post-install:
- ${INSTALL_DATA} ${WRKSRC}/libmpg123.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC:Q}/libmpg123.pc \
+ ${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig
-.include "options.mk"
+.include "mpg123-options.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmpg123/Makefile.common b/audio/libmpg123/Makefile.common
new file mode 100644
index 00000000000..a2e2f603560
--- /dev/null
+++ b/audio/libmpg123/Makefile.common
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2008/10/15 01:58:53 bjs Exp $
+#
+# used by audio/libmpg123/Makefile
+
+.include "../../audio/libmpg123/Makefile.version"
+
+DISTNAME= mpg123-${MPG123_DISTVERSION}
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= bjs@NetBSD.org
+HOMEPAGE= http://mpg123.sourceforge.net/
+
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
+
+CONFIGURE_ARGS+= --enable-fifo=yes
+CONFIGURE_ARGS+= --enable-modules=yes
+CONFIGURE_ARGS+= --enable-network=yes
+CONFIGURE_ARGS+= --enable-gapless=yes
+###
+### XXX Use pkgsrc-provided CFLAGS.
+###
+CONFIGURE_ARGS+= --with-optimization=0
+CFLAGS+= ${COPTS.mpg123:U${COPTS}}
+###
+### XXX This should be set to 'no' for platforms where it is required.
+### It's easier doing this here than patching configure.
+MPG123_XFERMEM?= yes
+.if !empty(MPG123_XFERMEM:tl:Myes)
+BUILDLINK_TRANSFORM+= rm:-DNO_XFERMEM
+.endif
diff --git a/audio/libmpg123/Makefile.version b/audio/libmpg123/Makefile.version
index 76258a93716..c690c558ea8 100644
--- a/audio/libmpg123/Makefile.version
+++ b/audio/libmpg123/Makefile.version
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $
+# $NetBSD: Makefile.version,v 1.2 2008/10/15 01:58:53 bjs Exp $
#
-MPG123_VERSION= 1.5.1
+MPG123_DISTVERSION= 1.5.1
+###
+### This version number is found as LIBMPG123_VERSION in configure.ac.
+###
+LIBMPG123_VERSION= 0.7.0
diff --git a/audio/libmpg123/buildlink3.mk b/audio/libmpg123/buildlink3.mk
index 08468e626a2..7b97c4916a5 100644
--- a/audio/libmpg123/buildlink3.mk
+++ b/audio/libmpg123/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/15 01:58:53 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MPG123_BUILDLINK3_MK:= ${MPG123_BUILDLINK3_MK}+
+LIBMPG123_BUILDLINK3_MK:= ${LIBMPG123_BUILDLINK3_MK}+
.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mpg123
+BUILDLINK_DEPENDS+= libmpg123
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpg123}
-BUILDLINK_PACKAGES+= mpg123
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpg123
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpg123}
+BUILDLINK_PACKAGES+= libmpg123
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpg123
-.if ${MPG123_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.mpg123+= mpg123>=1.5.1
-BUILDLINK_PKGSRCDIR.mpg123?= ../../audio/libmpg123
-.endif # MPG123_BUILDLINK3_MK
+.if ${LIBMPG123_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libmpg123+= libmpg123>=0.7.0
+BUILDLINK_PKGSRCDIR.libmpg123?= ../../audio/libmpg123
+.endif # LIBMPG123_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmpg123/options.mk b/audio/libmpg123/mpg123-options.mk
index 05c068057db..dff7a13e033 100644
--- a/audio/libmpg123/options.mk
+++ b/audio/libmpg123/mpg123-options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2008/09/19 17:49:26 ahoka Exp $
+# $NetBSD: mpg123-options.mk,v 1.1 2008/10/15 01:58:53 bjs Exp $
#
-PKG_OPTIONS_VAR= PKG_OPTIONS.libmp123
+PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123
PKG_SUPPORTED_OPTIONS= inet6 debug
.include "../../mk/bsd.fast.prefs.mk"