From owner-svn-src-all@FreeBSD.ORG Sun Sep 15 13:49:25 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 02148252; Sun, 15 Sep 2013 13:49:25 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E34772288; Sun, 15 Sep 2013 13:49:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDnOJ9018286; Sun, 15 Sep 2013 13:49:24 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDnO6q018283; Sun, 15 Sep 2013 13:49:24 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151349.r8FDnO6q018283@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:49:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255593 - in head/contrib/unbound: . smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:49:25 -0000 Author: des Date: Sun Sep 15 13:49:23 2013 New Revision: 255593 URL: http://svnweb.freebsd.org/changeset/base/255593 Log: Regenerate. Approved by: re (blanket) Modified: head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/smallapp/unbound-control-setup.sh Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/config.h Sun Sep 15 13:49:23 2013 (r255593) @@ -8,10 +8,10 @@ #define CONFIGFILE "/etc/unbound/unbound.conf" /* configure flags */ -#define CONFIGURE_BUILD_WITH " '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'" +#define CONFIGURE_BUILD_WITH " '--prefix=' '--exec-prefix=/usr' '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'" /* configure date */ -#define CONFIGURE_DATE "Sun Sep 15 02:01:38 CEST 2013" +#define CONFIGURE_DATE "Sun Sep 15 15:38:41 CEST 2013" /* configure target system */ #define CONFIGURE_TARGET "x86_64-unknown-freebsd10.0" Modified: head/contrib/unbound/configure ============================================================================== --- head/contrib/unbound/configure Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/configure Sun Sep 15 13:49:23 2013 (r255593) @@ -12552,14 +12552,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18180,7 +18176,7 @@ _ACEOF -ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8" +ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh" ac_config_headers="$ac_config_headers config.h" @@ -19169,6 +19165,7 @@ do "doc/unbound-checkconf.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-checkconf.8" ;; "doc/unbound.conf.5") CONFIG_FILES="$CONFIG_FILES doc/unbound.conf.5" ;; "doc/unbound-control.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-control.8" ;; + "smallapp/unbound-control-setup.sh") CONFIG_FILES="$CONFIG_FILES smallapp/unbound-control-setup.sh" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; Modified: head/contrib/unbound/smallapp/unbound-control-setup.sh ============================================================================== --- head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:49:23 2013 (r255593) @@ -36,7 +36,8 @@ # settings: # directory for files -DESTDIR=/usr/local/etc/unbound +prefix= +DESTDIR=${prefix}/etc/unbound # issuer and subject name for certificates SERVERNAME=unbound