Mercurial > hg > dhcpcd

changeset 2833:900c3485291d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove RCSIDs from dhcpcd, they belong in the upstream project only.
author Roy Marples <roy@marples.name>
date Fri, 07 Nov 2014 20:56:47 +0000
parents 5746a9f0a44a
children 137faa6ce13a
files Makefile configure dhcpcd-hooks/Makefile
diffstat 3 files changed, 2 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 07 20:03:19 2014 +0000
+++ b/Makefile	Fri Nov 07 20:56:47 2014 +0000
@@ -168,67 +168,6 @@
 			tr ' ' '\n' | \
 			sort -u) /tmp/${DISTPREFIX}/compat; \
 	fi;
-	if test -n "${IMPORT_RCSID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/*.c \
-		    /tmp/${DISTPREFIX}/crypt/*.c \
-		    /tmp/${DISTPREFIX}/compat/*.c \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_RCSID}\n\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_HID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/*.h \
-		    /tmp/${DISTPREFIX}/crypt/*.h \
-		    /tmp/${DISTPREFIX}/compat/*.h \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_HID}\n\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_MANID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/dhcpcd.8.in \
-		    /tmp/${DISTPREFIX}/dhcpcd-run-hooks.8.in \
-		    /tmp/${DISTPREFIX}/dhcpcd.conf.5.in \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_MANID}\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_SHID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/dhcpcd-run-hooks.in \
-		    /tmp/${DISTPREFIX}/dhcpcd.conf \
-		    /tmp/${DISTPREFIX}/dhcpcd-definitions.conf \
-		; do \
-			if test -e "$$x"; then \
-				if test "$$(sed -ne 1p $$x)" = "#!/bin/sh" \
-				; then \
-					echo "#!/bin/sh" > "$$x".new; \
-					printf "${IMPORT_SHID}\n" >>"$$x".new; \
-					echo "" >>"$$x".new; \
-					sed 1d "$$x" >>"$$x".new; \
-				else \
-					printf "${IMPORT_SHID}\n" >>"$$x".new; \
-					echo "" >>"$$x".new; \
-					cat "$$x" >>"$$x".new; \
-				fi; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
 	cd dhcpcd-hooks; ${MAKE} DISTPREFIX=${DISTPREFIX} $@
 
 include Makefile.inc
--- a/configure	Fri Nov 07 20:03:19 2014 +0000
+++ b/configure	Fri Nov 07 20:56:47 2014 +0000
@@ -1131,20 +1131,6 @@
 fi
 echo "HOOKSCRIPTS=	$HOOKS" >>$CONFIG_MK
 
-# Define any RCSIDs for import into 3rd party systems
-case "$OS" in
-netbsd)
-	echo "IMPORT_RCSID=	\#include <sys/cdefs.h>\\n" >>$CONFIG_MK
-	echo "IMPORT_RCSID+=	__RCSID(\\\"\\\$\$NetBSD: \\\$\$\\\");" >> \
-	    $CONFIG_MK
-	echo "IMPORT_HID+=	/* \\\$\$NetBSD: \\\$\$ */" >> \
-	    $CONFIG_MK
-	echo "IMPORT_MANID=	.\\\\\\\\\\\"     \\\$\$NetBSD: \$\$ " >> \
-	    $CONFIG_MK
-	echo "IMPORT_SHID=	\# \\\$\$NetBSD: \$\$ " >>$CONFIG_MK
-	;;
-esac
-
 echo
 echo "   SYSCONFDIR =		$SYSCONFDIR"
 echo "   SBINDIR =		$SBINDIR"
--- a/dhcpcd-hooks/Makefile	Fri Nov 07 20:03:19 2014 +0000
+++ b/dhcpcd-hooks/Makefile	Fri Nov 07 20:56:47 2014 +0000
@@ -19,7 +19,7 @@
 clean:
 	rm -f 50-ypbind
 
-proginstall:
+proginstall: ${HOOKSCRIPTS}
 	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
 	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
 
@@ -27,16 +27,4 @@
 
 import: ${HOOKSCRIPTS}
 	${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks
-	for x in ${SCRIPTS}; do \
-		t="/tmp/${DISTPREFIX}/dhcpcd-hooks/$$x"; \
-		if test "$$(sed -ne 1p $$x)" = "#!/bin/sh"; then \
-			echo "#!/bin/sh" >"$$t"; \
-			printf "${IMPORT_SHID}\n" >>"$$t"; \
-			echo "" >>"$$t"; \
-			sed 1d "$$x" >>"$$t"; \
-		else \
-			printf "${IMPORT_SHID}\n" >"$$t"; \
-			echo "" >>"$$t"; \
-			cat "$$x" >>"$$t"; \
-		fi; \
-	done;
+	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks