summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-10 13:08:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-10 13:08:33 +0200
commit7d7d0ad0d61e22e7fd5c938f2aaf90b00416e6b7 (patch)
treebbf34cc9f8298b52e445aac2bd537acb2062cfab /package
parentbbdeb66b02904db8f592b5de5164898054dc8a92 (diff)
misc finetuning
Diffstat (limited to 'package')
-rw-r--r--package/font-util/Makefile6
-rw-r--r--package/section.lst2
-rw-r--r--package/sox/Makefile2
3 files changed, 6 insertions, 4 deletions
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index af4f4d5e0..150a5561c 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -26,12 +26,12 @@ $(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELE
# especially as all font packages still need patching to avoid
# calling pkg-config (which we don't provide) in order to
# automatically find the mappings.
-fonts-hack:
+post-build:
${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
- ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
+ ${CP} ${WRKBUILD}/map-* \
${STAGING_DIR}/usr/share/fonts/X11/util
-font-util-install: fonts-hack
+font-util-install:
${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/ucs2any \
${IDIR_FONT_UTIL}/usr/bin
diff --git a/package/section.lst b/package/section.lst
index d1fa5ebf3..b29d9dcb5 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -45,6 +45,6 @@ x11/apps X applications
x11/drivers X drivers
x11/server X server
x11/libs X libraries
-x11/misc X Misc
+x11/misc X misc
x11/fonts X fonts
x11/devel X headers
diff --git a/package/sox/Makefile b/package/sox/Makefile
index 4f633b2a6..2f5436146 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ARGS+= --without-ffmpeg
+
sox-install:
$(INSTALL_DIR) $(IDIR_SOX)/usr/lib
${CP} ${WRKINST}/usr/lib/libsox.so* $(IDIR_SOX)/usr/lib