Sun Jun 14 22:40:45 2009 UTC ()
Drop @dirrm logic. Bump version.


(joerg)
diff -r1.46 -r1.47 pkgsrc/pkgtools/createbuildlink/Makefile
diff -r1.2 -r1.3 pkgsrc/pkgtools/createbuildlink/files/substplistbasedirs
cvs diff -r1.46 -r1.47 pkgsrc/pkgtools/createbuildlink/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/createbuildlink/Makefile 2009/04/09 00:48:11 1.46
+++ pkgsrc/pkgtools/createbuildlink/Makefile 2009/06/14 22:40:45 1.47
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.46 2009/04/09 00:48:11 joerg Exp $ 1# $NetBSD: Makefile,v 1.47 2009/06/14 22:40:45 joerg Exp $
2 2
3DISTNAME= createbuildlink-3.14 3DISTNAME= createbuildlink-3.15
4CATEGORIES= pkgtools sysutils 4CATEGORIES= pkgtools sysutils
5MASTER_SITES= # Nothing 5MASTER_SITES= # Nothing
6DISTFILES= # Nothing 6DISTFILES= # Nothing
7 7
8MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
9COMMENT= Shell script to help creating buildlink3.mk files 9COMMENT= Shell script to help creating buildlink3.mk files
10 10
11PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14WRKSRC= ${WRKDIR} 14WRKSRC= ${WRKDIR}
15USE_LANGUAGES= # empty 15USE_LANGUAGES= # empty
16NO_BUILD= yes 16NO_BUILD= yes
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/createbuildlink/files/substplistbasedirs (expand / switch to unified diff)

--- pkgsrc/pkgtools/createbuildlink/files/substplistbasedirs 2004/09/27 00:31:30 1.2
+++ pkgsrc/pkgtools/createbuildlink/files/substplistbasedirs 2009/06/14 22:40:45 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: substplistbasedirs,v 1.2 2004/09/27 00:31:30 rh Exp $ 3# $NetBSD: substplistbasedirs,v 1.3 2009/06/14 22:40:45 joerg Exp $
4# 4#
5# Copyright (c) 2002 The NetBSD Foundation, Inc. 5# Copyright (c) 2002 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Rene Hexel. 9# by Rene Hexel.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 30# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
31# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 31# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 32# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 33# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 34# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 35# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 36# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37# POSSIBILITY OF SUCH DAMAGE. 37# POSSIBILITY OF SUCH DAMAGE.
38# 38#
39# Create substitution patterns for dependent packages for directories listed 39# Create substitution patterns for dependent packages for directories listed
40# in a base package 40# in a base package
41# 41#
42 42
43REV=`echo '$Revision: 1.2 $' | sed 's/\\$//g'` 43REV=`echo '$Revision: 1.3 $' | sed 's/\\$//g'`
44CURDIR=`pwd | sed 's|^.*/\([^/]*/[^/]*\)$|\1|'` 44CURDIR=`pwd | sed 's|^.*/\([^/]*/[^/]*\)$|\1|'`
45PLIST=PLIST 45PLIST=PLIST
46MDFLAG=true 46MDFLAG=true
47 47
48args=`getopt n $*` 48args=`getopt n $*`
49if [ $? != 0 ]; then 49if [ $? != 0 ]; then
50 echo "Usage: $0 [-n]" 50 echo "Usage: $0 [-n]"
51 exit 2 51 exit 2
52fi 52fi
53set -- $args 53set -- $args
54while [ $# -gt 0 ]; do 54while [ $# -gt 0 ]; do
55 case "$1" in 55 case "$1" in
56 -n) 56 -n)
@@ -61,30 +61,13 @@ while [ $# -gt 0 ]; do @@ -61,30 +61,13 @@ while [ $# -gt 0 ]; do
61 ;; 61 ;;
62 esac 62 esac
63 shift 63 shift
64done 64done
65 65
66## 66##
67## some simple integrity checking 67## some simple integrity checking
68## 68##
69if [ ! -f $PLIST ]; then 69if [ ! -f $PLIST ]; then
70 echo "###> Incomplete package! To create a substitution pattern <###" 70 echo "###> Incomplete package! To create a substitution pattern <###"
71 echo "###> a working $PLIST is required! <###" 71 echo "###> a working $PLIST is required! <###"
72 exit 1 72 exit 1
73fi 73fi
74 
75## 
76## create @dirrm substitution patterns 
77##  
78grep '^@dirrm' $PLIST | sort | sed \ 
79 -e 's|/|\\/|g' \ 
80 -e 's|^|PRINT_PLIST_AWK+= /\^|' \ 
81 -e "s|$|\$\$/ { print \"@comment in ${CURDIR}: \" \$\$0; next; }|" 
82 
83## 
84## create @exec ${MKDIR} removal patterns 
85##  
86[ "$MDFLAG" != "true" ] || grep '^@dirrm' $PLIST | sort | sed \ 
87 -e 's|/|\\/|g' \ 
88 -e 's|^|PRINT_PLIST_AWK+= /\^|' \ 
89 -e 's|@dirrm |@exec \\$${MKDIR} %D\\/|' \ 
90 -e "s|$|\$\$/ { next; }|"