libmpcdec: rename as musepack, clean up build

libmpcdec/.signature

@@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37PTknRXcXiRF/5njf5PqtHz/Fc7GDRsMViTjnxYlVKKao+KCepv4PM6XV/rJc18UsM45T6H+Dx3mMNULjQ/Wg0=
-SHA256 (Pkgfile) = d3240cabbf4cab7c223be028a618d3bb6236d35f41119f6ce3d75fce127e3d41
-SHA256 (.footprint) = 396baec3c3dd9e50a5b019a10cb8d64e312851b698f7ad3af0f2c1c673b6a4f2
-SHA256 (musepack_src_r475.tar.gz) = a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b

moc/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38Sf1pcQeWkNDXZ3Y5vwqLMDqQlfzuAiS6zEs4dII5KTHn0t9DRUsHzWEI5kcFqqJdNII+D03MCQSOprbgTXmwo=
-SHA256 (Pkgfile) = f82c62a4da0f03cca5b7fc5d1e21c48dc12146981b8e24f66970510fe9960781
+RWSagIOpLGJF3ypE4//nGfkF+KiTQHv+JmURj1JUtcvmGivgiSfGfSmzrndVJIzpzN2RaEkOdO9w0nHNLd4X8sulOwnYWKNpEwo=
+SHA256 (Pkgfile) = a90a095447006c799347cafb0468ac8cb4ac3a23025aa9886bce09757a99e169
 SHA256 (.footprint) = c739c03c6c90f9487c51f38a03c2cb807316a6a3bef00967c088c59252b57078
 SHA256 (moc-2.5.2.tar.bz2) = f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08
 SHA256 (moc-https.patch) = d5ace9820974912e4f3d9361ad5d03d1d655348f17c9710dff527020101e98fa

moc/Pkgfile

@@ -2,7 +2,7 @@
 # URL: http://moc.daper.net/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: curl libid3tag libmad libsndfile popt
-# Optional: faad2 lame libmpcdec libmodplug mpg123 speex taglib wavpack
+# Optional: faad2 lame libmodplug mpg123 musepack speex taglib wavpack
 
 name=moc
 version=2.5.2

musepack/.footprint

@@ -17,5 +17,3 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libmpcdec.so -> libmpcdec.so.6.1.0
 lrwxrwxrwx	root/root	usr/lib/libmpcdec.so.6 -> libmpcdec.so.6.1.0
 -rwxr-xr-x	root/root	usr/lib/libmpcdec.so.6.1.0
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libmpcdec.pc

musepack/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF30SrSLhn0u8pJpczo166ebtgb0zUiWJSFMtkfI5wTH7O2igJ9shAkPjGAEzdwuK9cpXlK7+2/PMprECs7Db5/Qo=
+SHA256 (Pkgfile) = 8afdfb55e6ea2340c8283e567c71889126b7e343aa3646393de5758039124e69
+SHA256 (.footprint) = 52032441765ce4aafd633c1abed43bded50553a14a7019879e39fbe1b003bedc
+SHA256 (musepack_src_r475.tar.gz) = a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b

musepack/Pkgfile

@@ -4,22 +4,19 @@
 # Depends on: 
 # Nice to have: libcuefile libreplaygain
 
-name=libmpcdec
+name=musepack
 version=1.3.0
 release=1
-source=(https://files.musepack.net/source/musepack_src_r475.tar.gz)
+source=(https://files.musepack.net/source/${name}_src_r475.tar.gz)
 
 build() {
 	cd musepack_src_r475
 
-	# disable mpcenc unless we have an older glibc
-	local build_enc=$(prt-get current glibc | \
-		awk -v FS="-" '{if ($1 < 2.32) print 1; else print 0;}')
-	[ "$build_enc" = 1 ] || sed -e '/add_subdirectory(mpcenc)/d' \
-				-e '/add_subdirectory(mpcpsy)/d' \
-				-i CMakeLists.txt
-	
-	# disable targets whose dependencies are not present
+	# disable mpcenc (broken when built against recent glibc)
+	# and any targets whose dependencies are not present
+	sed -e '/add_subdirectory(mpcenc)/d' \
+		-e '/add_subdirectory(mpcpsy)/d' \
+		-i CMakeLists.txt
 	[ -e /usr/lib/libcuefile.so ] || \
 		sed '/add_subdirectory(mpcchap)/d' -i CMakeLists.txt
 	[ -e /usr/lib/libreplaygain.so ] || \
@@ -34,29 +31,17 @@ build() {
 	done
 
 	mkdir build && cd build
-	cmake -G Ninja -Wno-dev	-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX="/usr" ..
+	cmake -G Ninja -Wno-dev	\
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_C_FLAGS="$CFLAGS" ..
 
 	ninja -j ${JOBS:-1}
 	DESTDIR=$PKG ninja install
 	rm -rf $PKG/usr/include/mpc/.svn
 
-	install -d "$PKG/usr/lib/pkgconfig"
+	install -d "$PKG/usr/lib"
 	install -m 0755 libmpcdec/libmpcdec.so "$PKG/usr/lib/libmpcdec.so.6.1.0"
 	ln -s libmpcdec.so.6.1.0 "$PKG/usr/lib/libmpcdec.so.6"
 	ln -s libmpcdec.so.6.1.0 "$PKG/usr/lib/libmpcdec.so"
-
-	cat >"$PKG/usr/lib/pkgconfig/$name.pc" <<EOF
-prefix=/usr
-includedir=\${prefix}/include/mpc
-libdir=\${prefix}/lib
-
-Name: $name
-Description: decoder library for MusePack files
-Version: $version
-URL: https://www.musepack.net/
-Libs: -L\${libdir} -l${name#lib}
-Cflags: -I\${includedir}
-EOF
 }