resolve some FreeBSD specific issues

- use numeric ids for cups configure (FreeBSD has no root group)
- use /usr/lib for libexec dir for cups on BSD, too
- update dhcp to latest upstream
- fix readline dependency in mysql package
- heimdal needs -pthread explicitely on FreeBSD host

5 files changed, 39 insertions, 13 deletions

diff --git a/package/cups/Makefile b/package/cups/Makefile
index d17d58cda..c8cac765f 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -24,9 +24,9 @@ $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
-			OPTIM=''
-CONFIGURE_ARGS+=	--with-cups-user=root \
-			--with-cups-group=root \
+			OPTIM='-fPIC'
+CONFIGURE_ARGS+=	--with-cups-user=0 \
+			--with-cups-group=0 \
 			--disable-ldap \
 			--disable-gssapi \
 			--disable-pam \
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--with-cups-user=root \
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
-XAKE_FLAGS+=		OPTIM=''
+XAKE_FLAGS+=		OPTIM='-fPIC'
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index 773a2da96..82550e632 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,7 +1,17 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cups-1.3.10.orig/configure	2009-04-16 22:02:06.000000000 +0200
-+++ cups-1.3.10/configure	2009-05-09 22:44:29.000000000 +0200
-@@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib
++++ cups-1.3.10/configure	2009-05-31 19:41:18.000000000 +0200
+@@ -7460,9 +7460,6 @@ done
+ 
+ 
+ case $uname in
+-        Darwin* | *BSD*)
+-                ARFLAGS="-rcv"
+-                ;;
+         *)
+                 ARFLAGS="crvs"
+                 ;;
+@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib
  			;;
  		Linux*)
  			if test -d /usr/lib64; then
@@ -10,3 +20,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  			fi
  			;;
  		HP-UX*)
+@@ -9587,11 +9584,6 @@ _ACEOF
+ 
+ # Server executables...
+ case "$uname" in
+-	*BSD* | Darwin*)
+-		# *BSD and Darwin (MacOS X)
+-		INSTALL_SYSV=""
+-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+-		;;
+ 	*)
+ 		# All others
+ 		INSTALL_SYSV="install-sysv"
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index adaa35c17..ae19e898e 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -6,9 +6,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp
-PKG_VERSION:=		3.0.7
+PKG_VERSION:=		4.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		426bfa1712ababaff4be6dadee9c1982
+PKG_MD5SUM:=		1fffed2e8c3d67b111316d6a9b33db7a
 PKG_DESCR:=		ISC DHCP server
 PKG_SECTION:=		net
 PKG_URL:=		https://www.isc.org/software/dhcp
@@ -21,12 +21,14 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
-do-configure:
-	(cd ${WRKBUILD} ; \
-		./configure --copts "${TARGET_CFLAGS}" linux-2.2 \
-	);
+ifeq ($(ADK_IPV6),y)
+CONFIGURE_ARGS+=       --enable-dhcpv6         
+else
+CONFIGURE_ARGS+=       --disable-dhcpv6                
+endif
 
-MAKE_FLAGS+=		RANLIB=${TARGET_CROSS}ranlib
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 8106ee2ec..163d0632a 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -67,6 +67,7 @@ else
 CONFIGURE_OPTS+=	--disable-pk-init
 endif
 
+TCFLAGS+=              -pthread
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_OPTS}
 CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes
diff --git a/package/mysql/Config.in b/package/mysql/Config.in
index 29a3f1c82..14b27169e 100644
--- a/package/mysql/Config.in
+++ b/package/mysql/Config.in
@@ -5,6 +5,7 @@ config ADK_COMPILE_MYSQL
 	depends ADK_CXX
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_ZLIB
+	select ADK_PACKAGE_LIBREADLINE
 
 config ADK_PACKAGE_LIBMYSQLCLIENT
 	prompt "libmysqlclient.................... MySQL client library"