Merge branch 'master' of git+ssh://openadk.org/git/openadk

11 files changed, 69 insertions, 14 deletions

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 8e5f96d27..a6025ce43 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -101,9 +101,9 @@ CONFIGURE_ARGS+=	--with-ogg=${STAGING_DIR}/usr \
 TLDFLAGS+=		-logg
 endif
 ifneq (${ADK_PACKAGE_ASTERISK_CURL},)
-CONFIGURE_ARGS+=	--with-curl=${STAGING_DIR}/usr
+CONFIGURE_ARGS+=	--with-libcurl=${STAGING_DIR}/usr
 else
-CONFIGURE_ARGS+=	--without-curl
+CONFIGURE_ARGS+=	--without-libcurl
 endif
 ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},)
 CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
diff --git a/package/cpufrequtils/patches/patch-utils_aperf_c b/package/cpufrequtils/patches/patch-utils_aperf_c
new file mode 100644
index 000000000..3e39dd625
--- /dev/null
+++ b/package/cpufrequtils/patches/patch-utils_aperf_c
@@ -0,0 +1,18 @@
+--- cpufrequtils-008.orig/utils/aperf.c	2010-07-05 17:43:17.000000000 +0200
++++ cpufrequtils-008/utils/aperf.c	2010-08-01 22:41:37.905732041 +0200
+@@ -68,11 +68,15 @@ struct avg_perf_cpu_info
+ 
+ static int cpu_has_effective_freq()
+ {
++#if defined(__i386__) || defined(__x86_64__)
+ 	/* largest base level */
+ 	if (cpuid_eax(0) < 6)
+ 		return 0;
+ 
+ 	return cpuid_ecx(6) & 0x1;
++#else
++	return 0;
++#endif
+ }
+ 
+ /*
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 7f09627a1..34c2cdab8 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -31,8 +31,7 @@ $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESC
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-tls \
-			--enable-dynamic-e2fsck
+			--disable-tls
 INSTALL_TARGET+=	install-libs
 
 pre-build:
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 4b737e303..e70d9a790 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -89,6 +89,7 @@ eglibc-dev-install:
 	$(MAKE) -C $(WRKBUILD) \
 		install-headers install-bootstrap-headers=yes
 	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
+	@find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \;
 	# conflicts with libiconv
 	find $(IDIR_EGLIBC_DEV) -name iconv.h -exec rm {} \;
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 77e346308..b12f2a3ec 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -23,9 +23,10 @@ PKG_DEPENDS+=		glibc-dev
 PKG_BUILDDEP+=		glibc
 endif
 
-PKG_HOST_DEPENDS:=	!freebsd
 PKG_TARGET_DEPENDS:=	!ag241
 
+WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -43,7 +44,6 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--disable-__cxa_atexit \
 			--without-headers \
 			--libexecdir=/usr/lib \
-			--with-gnu-ld \
 			--disable-libssp \
 			--disable-nls \
 			--disable-sjlj-exceptions \
diff --git a/package/gcc/patches/gcc-cppflags.patch b/package/gcc/patches/gcc-cppflags.patch
new file mode 100644
index 000000000..0971bbec9
--- /dev/null
+++ b/package/gcc/patches/gcc-cppflags.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-4.4.4.orig/gcc/configure gcc-4.4.4/gcc/configure
+--- gcc-4.4.4.orig/gcc/configure	2009-10-19 14:15:27.000000000 +0200
++++ gcc-4.4.4/gcc/configure	2010-08-02 00:47:36.823620346 +0200
+@@ -13530,7 +13530,7 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+-	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 174690c7b..167af550a 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -27,9 +27,7 @@ CONFIGURE_ENV+=		EGREP="grep -E" \
 			ac_cv_func_strlcpy=no \
 			ac_cv_func_strlcat=no \
 			ac_cv_lib_nsl_gethostbyname=no
-CONFIGURE_ARGS+=	--without-x \
-			--disable-dbus
-
+CONFIGURE_ARGS+=	--disable-dbus
 TCFLAGS+=		-fPIC
 
 ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
@@ -40,9 +38,6 @@ else
 TLDFLAGS+=		-shared -pthread
 endif
 
-post-extract:
-	#@find ${WRKBUILD} -name *.rej -exec rm {} \;
-
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
 post-configure:
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 7d3834990..bb4e809c1 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -46,6 +46,10 @@ CONFIGURE_ENV+=		krb5_cv_attr_constructor_destructor=yes,yes \
 post-extract:
 	(cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz)
 
+pre-build:
+	# fix nm call in script, we need the GNU version of nm
+	$(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl
+
 post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc
diff --git a/package/krb5/patches/patch-src_util_export-check_pl b/package/krb5/patches/patch-src_util_export-check_pl
new file mode 100644
index 000000000..04d21a299
--- /dev/null
+++ b/package/krb5/patches/patch-src_util_export-check_pl
@@ -0,0 +1,11 @@
+--- krb5-1.8.1.orig/src/util/export-check.pl	Sun Aug  1 18:36:11 2010
++++ krb5-1.8.1/src/util/export-check.pl	Sun Aug  1 18:27:23 2010
+@@ -38,7 +38,7 @@ if ($#ARGV != 1) {
+ my($exfile, $libfile) = @ARGV;
+ 
+ @missing = ();
+-open NM, "nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
++open NM, "@@NM@@ -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
+ open EXPORT, "< $exfile" || die "can't read $exfile: $!";
+ 
+ @export = <EXPORT>;
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index e878ab1f5..aba32b12a 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
@@ -19,6 +19,11 @@ endif
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install
 
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
 CONFIGURE_ARGS+=	--enable-xlocale \
@@ -27,9 +32,15 @@ CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-malloc0returnsnull \
 			--without-xcb
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11
 
+libx11-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
+	${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
+	${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \
+		${IDIR_LIBX11_DEV}/usr/include/X11
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index dbf2e3c05..1adc4881b 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -17,6 +17,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq (${ADK_HOST_OPENBSD},y)
+XAKE_FLAGS+=		AUTOCONF_VERSION=2.62
+endif
+
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libltdl.so* ${IDIR_LIBLTDL}/usr/lib/