Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/openresolv/dist Sync
details: https://anonhg.NetBSD.org/src/rev/87619f0a43cb
branches: trunk
changeset: 965344:87619f0a43cb
user: roy <roy%NetBSD.org@localhost>
date: Fri Sep 13 13:35:06 2019 +0000
description:
Sync
diffstat:
external/bsd/openresolv/dist/.gitignore | 12 --
external/bsd/openresolv/dist/GNUmakefile | 4 -
external/bsd/openresolv/dist/Makefile | 118 -------------------
external/bsd/openresolv/dist/config-null.mk | 1 -
external/bsd/openresolv/dist/configure | 167 ----------------------------
5 files changed, 0 insertions(+), 302 deletions(-)
diffs (truncated from 322 to 300 lines):
diff -r d7b839546417 -r 87619f0a43cb external/bsd/openresolv/dist/.gitignore
--- a/external/bsd/openresolv/dist/.gitignore Fri Sep 13 12:13:18 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-config.mk
-
-resolvconf
-resolvconf.8
-resolvconf.conf.5
-
-dnsmasq
-libc
-named
-pdnsd
-pdns_recursor
-unbound
diff -r d7b839546417 -r 87619f0a43cb external/bsd/openresolv/dist/GNUmakefile
--- a/external/bsd/openresolv/dist/GNUmakefile Fri Sep 13 12:13:18 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# Nasty hack so that make clean works without configure being run
-CONFIG_MK?=$(shell test -e config.mk && echo config.mk || echo config-null.mk)
-
-include Makefile
diff -r d7b839546417 -r 87619f0a43cb external/bsd/openresolv/dist/Makefile
--- a/external/bsd/openresolv/dist/Makefile Fri Sep 13 12:13:18 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-PKG= openresolv
-
-# Nasty hack so that make clean works without configure being run
-_CONFIG_MK!= test -e config.mk && echo config.mk || echo config-null.mk
-CONFIG_MK?= ${_CONFIG_MK}
-include ${CONFIG_MK}
-
-SBINDIR?= /sbin
-SYSCONFDIR?= /etc
-LIBEXECDIR?= /libexec/resolvconf
-VARDIR?= /var/run/resolvconf
-
-ECHO?= echo
-INSTALL?= install
-SED?= sed
-
-VERSION!= ${SED} -n 's/OPENRESOLV_VERSION="\(.*\)".*/\1/p' resolvconf.in
-
-BINMODE?= 0755
-DOCMODE?= 0644
-MANMODE?= 0444
-
-RESOLVCONF= resolvconf resolvconf.8 resolvconf.conf.5
-SUBSCRIBERS= libc dnsmasq named pdnsd pdns_recursor unbound
-TARGET= ${RESOLVCONF} ${SUBSCRIBERS}
-SRCS= ${TARGET:C,$,.in,} # pmake
-SRCS:= ${TARGET:=.in} # gmake
-
-SED_SBINDIR= -e 's:@SBINDIR@:${SBINDIR}:g'
-SED_SYSCONFDIR= -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
-SED_LIBEXECDIR= -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
-SED_VARDIR= -e 's:@VARDIR@:${VARDIR}:g'
-SED_RCDIR= -e 's:@RCDIR@:${RCDIR}:g'
-SED_RESTARTCMD= -e 's:@RESTARTCMD@:${RESTARTCMD}:g'
-SED_RCDIR= -e 's:@RCDIR@:${RCDIR}:g'
-SED_STATUSARG= -e 's:@STATUSARG@:${STATUSARG}:g'
-
-DISTPREFIX?= ${PKG}-${VERSION}
-DISTFILEGZ?= ${DISTPREFIX}.tar.gz
-DISTFILE?= ${DISTPREFIX}.tar.xz
-DISTINFO= ${DISTFILE}.distinfo
-DISTINFOSIGN= ${DISTINFO}.asc
-CKSUM?= cksum -a SHA256
-PGP?= netpgp
-
-GITREF?= HEAD
-
-.SUFFIXES: .in
-
-all: ${TARGET}
-
-.in: Makefile ${CONFIG_MK}
- ${SED} ${SED_SBINDIR} ${SED_SYSCONFDIR} ${SED_LIBEXECDIR} \
- ${SED_VARDIR} \
- ${SED_RCDIR} ${SED_RESTARTCMD} ${SED_RCDIR} ${SED_STATUSARG} \
- $< > $@
-
-clean:
- rm -f ${TARGET}
-
-distclean: clean
- rm -f config.mk ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN}
-
-installdirs:
-
-proginstall: ${TARGET}
- ${INSTALL} -d ${DESTDIR}${SBINDIR}
- ${INSTALL} -m ${BINMODE} resolvconf ${DESTDIR}${SBINDIR}
- ${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
- test -e ${DESTDIR}${SYSCONFDIR}/resolvconf.conf || \
- ${INSTALL} -m ${DOCMODE} resolvconf.conf ${DESTDIR}${SYSCONFDIR}
- ${INSTALL} -d ${DESTDIR}${LIBEXECDIR}
- ${INSTALL} -m ${DOCMODE} ${SUBSCRIBERS} ${DESTDIR}${LIBEXECDIR}
-
-maninstall:
- ${INSTALL} -d ${DESTDIR}${MANDIR}/man8
- ${INSTALL} -m ${MANMODE} resolvconf.8 ${DESTDIR}${MANDIR}/man8
- ${INSTALL} -d ${DESTDIR}${MANDIR}/man5
- ${INSTALL} -m ${MANMODE} resolvconf.conf.5 ${DESTDIR}${MANDIR}/man5
-
-install: proginstall maninstall
-
-dist-git:
- git archive --prefix=${DISTPREFIX}/ ${GITREF} | xz >${DISTFILE}
-
-dist-inst:
- mkdir /tmp/${DISTPREFIX}
- cp -RPp * /tmp/${DISTPREFIX}
- (cd /tmp/${DISTPREFIX}; make clean)
- tar -cvjpf ${DISTFILE} -C /tmp ${DISTPREFIX}
- rm -rf /tmp/${DISTPREFIX}
-
-dist: dist-git
-
-distinfo: dist
- rm -f ${DISTINFO} ${DISTINFOSIGN}
- ${CKSUM} ${DISTFILE} >${DISTINFO}
- #printf "SIZE (${DISTFILE}) = %s\n" $$(wc -c <${DISTFILE}) >>${DISTINFO}
- ${PGP} --clearsign --output=${DISTINFOSIGN} ${DISTINFO}
- chmod 644 ${DISTINFOSIGN}
- ls -l ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN}
-
-import: dist
- rm -rf /tmp/${DISTPREFIX}
- ${INSTALL} -d /tmp/${DISTPREFIX}
- tar xvJpf ${DISTFILE} -C /tmp
-
-_import-src:
- rm -rf ${DESTDIR}/*
- ${INSTALL} -d ${DESTDIR}
- cp LICENSE README.md ${SRCS} resolvconf.conf ${DESTDIR};
- cp resolvconf.8.in resolvconf.conf.5.in ${DESTDIR};
- @${ECHO}
- @${ECHO} "============================================================="
- @${ECHO} "openresolv-${VERSION} imported to ${DESTDIR}"
-
-import-src:
- ${MAKE} _import-src DESTDIR=`if [ -n "${DESTDIR}" ]; then echo "${DESTDIR}"; else echo /tmp/${DISTPREFIX}; fi`
diff -r d7b839546417 -r 87619f0a43cb external/bsd/openresolv/dist/config-null.mk
--- a/external/bsd/openresolv/dist/config-null.mk Fri Sep 13 12:13:18 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-# This space left intentionally blank
diff -r d7b839546417 -r 87619f0a43cb external/bsd/openresolv/dist/configure
--- a/external/bsd/openresolv/dist/configure Fri Sep 13 12:13:18 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-#!/bin/sh
-# Try and be like autotools configure, but without autotools
-
-# Ensure that we do not inherit these from env
-OS=
-BUILD=
-HOST=
-TARGET=
-RESTARTCMD=
-RCDIR=
-STATUSARG=
-
-for x do
- opt=${x%%=*}
- var=${x#*=}
- case "$opt" in
- --os|OS) OS=$var;;
- --with-cc|CC) CC=$var;;
- --debug) DEBUG=$var;;
- --disable-debug) DEBUG=no;;
- --enable-debug) DEBUG=yes;;
- --prefix) PREFIX=$var;;
- --sysconfdir) SYSCONFDIR=$var;;
- --bindir|--sbindir) SBINDIR=$var;;
- --libexecdir) LIBEXECDIR=$var;;
- --statedir|--localstatedir) STATEDIR=$var;;
- --dbdir) DBDIR=$var;;
- --rundir) RUNDIR=$var;;
- --mandir) MANDIR=$var;;
- --with-ccopts|CFLAGS) CFLAGS=$var;;
- CPPFLAGS) CPPFLAGS=$var;;
- --build) BUILD=$var;;
- --host) HOST=$var;;
- --target) TARGET=$var;;
- --libdir) LIBDIR=$var;;
- --restartcmd) RESTARTCMD=$var;;
- --rcdir) RCDIR=$var;;
- --statusarg) STATUSARG=$var;;
- --includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
- --datadir|--infodir) ;; # ignore autotools
- --disable-maintainer-mode|--disable-dependency-tracking) ;;
- --help) echo "See the README file for available options"; exit 0;;
- *) echo "$0: WARNING: unknown option $opt" >&2;;
- esac
-done
-
-: ${SED:=sed}
-
-CONFIG_MK=config.mk
-
-if [ -z "$BUILD" ]; then
- # autoconf target triplet: cpu-vendor-os
- BUILD=$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]')
-fi
-: ${HOST:=$BUILD}
-
-if [ -z "$OS" ]; then
- echo "Deriving operating system from ... $HOST"
- # Derive OS from cpu-vendor-[kernel-]os
- CPU=${HOST%%-*}
- REST=${HOST#*-}
- if [ "$CPU" != "$REST" ]; then
- VENDOR=${REST%%-*}
- REST=${REST#*-}
- if [ "$VENDOR" != "$REST" ]; then
- # Use kernel if given, otherwise os
- OS=${REST%%-*}
- else
- # 2 tupple
- OS=$VENDOR
- VENDOR=
- fi
- fi
-
- # Work with cpu-kernel-os, ie Debian
- case "$VENDOR" in
- linux*|kfreebsd*) OS=$VENDOR; VENDOR= ;;
- esac
- # Special case
- case "$OS" in
- gnu*) OS=hurd;; # No HURD support as yet
- esac
-fi
-
-echo "Configuring openresolv for ... $OS"
-rm -rf $CONFIG_MK
-echo "# $OS" >$CONFIG_MK
-
-case "$OS" in
-dragonfly*)
- # This means /usr HAS to be mounted not via dhcpcd
- : ${LIBEXECDIR:=${PREFIX:-/usr}/libexec/resolvconf}
- ;;
-linux*)
- # cksum does't support -a and netpgp is rare
- echo "CKSUM= sha256sum --tag" >>$CONFIG_MK
- echo "PGP= gpg2" >>$CONFIG_MK
- ;;
-esac
-
-case "$OS" in
-dragonfly*|freebsd*)
- # On FreeBSD, /etc/init.d/foo status returns 0 if foo is not enabled
- # regardless of if it's not running.
- # So we force onestatus to work around this silly bug.
- if [ -z "$STATUSARG" ]; then
- STATUSARG="onestatus"
- fi
- ;;
-esac
-
-
-if [ -z "$LIBEXECDIR" ]; then
- printf "Checking for directory /libexec ... "
- if [ -d /libexec ]; then
- echo "yes"
- LIBEXECDIR=$PREFIX/libexec/resolvconf
- else
- echo "no"
- LIBEXECDIR=$PREFIX/lib/resolvconf
- fi
-fi
-if [ -z "$RUNDIR" ]; then
- printf "Checking for directory /run ... "
- if [ -d /run ]; then
- echo "yes"
- RUNDIR=/run
- else
- echo "no"
- RUNDIR=/var/run
- fi
-fi
-
-: ${SYSCONFDIR:=$PREFIX/etc}
-: ${SBINDIR:=$PREFIX/sbin}
-: ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
-: ${STATEDIR:=/var}
-: ${RUNDIR:=$STATEDIR/run}
-: ${MANDIR:=${PREFIX:-/usr}/share/man}
-
-eval SYSCONFDIR="$SYSCONFDIR"
-eval SBINDIR="$SBINDIR"
-eval LIBEXECDIR="$LIBEXECDIR"
-eval VARDIR="$RUNDIR/resolvconf"
-eval MANDIR="$MANDIR"
Home |
Main Index |
Thread Index |
Old Index