Sun Mar 4 19:50:21 2012 UTC ()
Honour MANINSTALL


(joerg)
diff -r1.43 -r1.44 pkgsrc/archivers/pax/Makefile
diff -r1.11 -r1.12 pkgsrc/archivers/pax/files/Makefile.in
cvs diff -r1.43 -r1.44 pkgsrc/archivers/pax/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/pax/Makefile 2010/07/06 23:36:51 1.43
+++ pkgsrc/archivers/pax/Makefile 2012/03/04 19:50:21 1.44
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.43 2010/07/06 23:36:51 obache Exp $ 1# $NetBSD: Makefile,v 1.44 2012/03/04 19:50:21 joerg Exp $
2 2
3DISTNAME= pax-20080110 3DISTNAME= pax-20080110
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://www.NetBSD.org/ 9HOMEPAGE= http://www.NetBSD.org/
10COMMENT= POSIX standard archiver with many extensions 10COMMENT= POSIX standard archiver with many extensions
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
14CHECK_PERMS= no 14CHECK_PERMS= no
15 15
 16MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
 17
16USE_FEATURES= nbcompat 18USE_FEATURES= nbcompat
17 19
18.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
19 21
20 22
21.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != "" 23.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
22CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q} 24CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
23 25
24.else 26.else
25 27
26# pax installs "tar" and "cpio" 28# pax installs "tar" and "cpio"
27.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) 29.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX)
28CONFLICTS+= gcpio-[0-9]* 30CONFLICTS+= gcpio-[0-9]*
cvs diff -r1.11 -r1.12 pkgsrc/archivers/pax/files/Makefile.in (expand / switch to unified diff)

--- pkgsrc/archivers/pax/files/Makefile.in 2008/07/20 23:31:50 1.11
+++ pkgsrc/archivers/pax/files/Makefile.in 2012/03/04 19:50:21 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.in,v 1.11 2008/07/20 23:31:50 dbj Exp $ 1# $NetBSD: Makefile.in,v 1.12 2012/03/04 19:50:21 joerg Exp $
2 2
3srcdir= @srcdir@ 3srcdir= @srcdir@
4 4
5DESTDIR=  5DESTDIR=
6prefix= @prefix@ 6prefix= @prefix@
7program_transform_name= @program_transform_name@ 7program_transform_name= @program_transform_name@
8exec_prefix= @exec_prefix@ 8exec_prefix= @exec_prefix@
9bindir= @bindir@ 9bindir= @bindir@
10mandir= @mandir@ 10mandir= @mandir@
11 11
12man1dir= $(mandir)/man1 12man1dir= $(mandir)/man1
13cat1dir= $(mandir)/cat1 13cat1dir= $(mandir)/cat1
14 14
@@ -37,23 +37,25 @@ all: $(PROG) @@ -37,23 +37,25 @@ all: $(PROG)
37$(PROG): $(OBJS) 37$(PROG): $(OBJS)
38 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) 38 $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
39 39
40clean: 40clean:
41 rm -f $(OBJS) $(PROG) 41 rm -f $(OBJS) $(PROG)
42 42
43distclean: clean 43distclean: clean
44 rm -f Makefile config.cache config.h config.status 44 rm -f Makefile config.cache config.h config.status
45 rm -f configure.lineno config.log 45 rm -f configure.lineno config.log
46 46
47install: 47install:
48 $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 48 $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
49 $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir) 49 $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir)
50 $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir) 
51 $(INSTALL) $(PROG) $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') 50 $(INSTALL) $(PROG) $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)')
52 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo cpio | sed '$(program_transform_name)') 51 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo cpio | sed '$(program_transform_name)')
53 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo tar | sed '$(program_transform_name)') 52 ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo tar | sed '$(program_transform_name)')
54 $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1 53 $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1
55 $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0 
56 $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/$$(echo cpio | sed '$(program_transform_name)').1 54 $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/$$(echo cpio | sed '$(program_transform_name)').1
57 $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0 
58 $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1 55 $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1
 56.if !empty(MANINSTALL:Mcatinstall)
 57 $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir)
 58 $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0
 59 $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0
59 $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0 60 $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0
 61.endif