fix some compile errors

7 files changed, 8 insertions, 12 deletions

diff --git a/package/bind/Makefile b/package/bind/Makefile
index 0bb90297d..231ed042c 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -69,7 +69,7 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-CONFIGURE_ENV+=		BUILD_CC="${CC_FOR_BUILD}" BUILD_CFLAGS='${CFLAGS_FOR_BUILD}'
+CONFIGURE_ENV+=		BUILD_CC="${HOST_CC}" BUILD_CFLAGS='${HOST_CFLAGS}'
 
 bind-server-install:
 	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index c9c75cdba..3163669cd 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -21,8 +21,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		LIBS="-liconv" \
-			ac_cv_func_memcmp_working=yes
+CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--without-libiconv-prefix \
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index d03e1f7cf..48a4af497 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -24,7 +24,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-neon
-CONFIGURE_ENV+=		LIBS=-liconv
 
 davfs2-install:
 	${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index d61c32b4f..ef8323909 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -26,8 +26,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
-TARGET_LDFLAGS+=	-liconv
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--enable-ssl
 
 post-install:
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index f8711b6b1..3d122b91e 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		dosfstools
 PKG_VERSION:=		3.0.26
 PKG_RELEASE:=		5
 PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
-PKG_DESCR:=		utilities to create and check FAT filesystems
+PKG_DESCR:=		utilities to create and check fat filesystems
 PKG_SECTION:=		sys/fs
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
 PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile
index 328882ec4..e1b4b528c 100644
--- a/package/dosfstools/patches/patch-Makefile
+++ b/package/dosfstools/patches/patch-Makefile
@@ -1,17 +1,16 @@
 --- dosfstools-3.0.26.orig/Makefile	2014-01-17 07:09:28.000000000 +0100
-+++ dosfstools-3.0.26/Makefile	2014-05-22 13:55:10.763081049 +0200
-@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
++++ dosfstools-3.0.26/Makefile	2014-06-25 12:07:32.125122609 +0200
+@@ -32,7 +32,8 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
  #WARNFLAGS = -Wall -pedantic -std=c99
  WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
  DEBUGFLAGS = -g
 -CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
 +CFLAGS ?=
 +CFLAGS += $(WARNFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-+LDLIBS = -liconv
  
  VPATH = src
  
-@@ -48,7 +50,7 @@ mkfs.fat: mkfs.fat.o
+@@ -48,7 +49,7 @@ mkfs.fat: mkfs.fat.o
  
  rebuild: distclean build
  
@@ -20,7 +19,7 @@
  
  install-bin: build
  	install -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -73,7 +75,7 @@ install-man:
+@@ -73,7 +74,7 @@ install-man:
  			install -D -m 0644 $${MANPAGE} $(DESTDIR)/$(MANDIR)/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
  		done; \
  	done
diff --git a/package/pango/Makefile b/package/pango/Makefile
index 9d22d608e..dfd3d087c 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -23,6 +23,7 @@ $(eval $(call HOST_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
+CONFIGURE_ARGS+=	--disable-man
 
 pango-install:
 	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango