diff options
| -rw-r--r-- | archivers/pax/Makefile | 31 | ||||
| -rw-r--r-- | archivers/pax/Makefile.common | 28 | ||||
| -rw-r--r-- | archivers/pax/files/Makefile.in | 27 | ||||
| -rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
| -rw-r--r-- | net/tnftp/Makefile | 42 | ||||
| -rw-r--r-- | net/tnftp/Makefile.common | 28 | ||||
| -rw-r--r-- | net/tnftp/files/src/Makefile.in | 11 | ||||
| -rw-r--r-- | pkgtools/pax/Makefile | 14 | ||||
| -rw-r--r-- | pkgtools/tnftp/Makefile | 15 |
9 files changed, 83 insertions, 119 deletions
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile index 10aebd8dfda..7d65d03fac8 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -1,17 +1,32 @@ -# $NetBSD: Makefile,v 1.34 2008/02/07 22:27:53 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2008/03/06 04:45:58 jlam Exp $ -USE_FEATURES= nbcompat +DISTNAME= pax-20080110 +CATEGORIES= archivers +MASTER_SITES= # empty +DISTFILES= # empty -.include "Makefile.common" +MAINTAINER= grant@NetBSD.org +HOMEPAGE= http://www.NetBSD.org/ +COMMENT= POSIX standard archiver with many extensions -CATEGORIES= archivers +PKG_DESTDIR_SUPPORT= user-destdir + +USE_FEATURES= nbcompat + +.include "../../mk/bsd.prefs.mk" # pax installs "tar" and "cpio" -.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == "" -CONFLICTS+= gcpio-[0-9]* +.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) +CONFLICTS+= gcpio-[0-9]* .endif -.if defined(GTAR_PROGRAM_PREFIX) && ${GTAR_PROGRAM_PREFIX} == "" -CONFLICTS+= gtar-base-[0-9]* +.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) +CONFLICTS+= gtar-base-[0-9]* .endif +GNU_CONFIGURE= yes +NO_CHECKSUM= yes + +do-extract: + ${CP} -R ${FILESDIR} ${WRKSRC} + .include "../../mk/bsd.pkg.mk" diff --git a/archivers/pax/Makefile.common b/archivers/pax/Makefile.common deleted file mode 100644 index a2d44d79b63..00000000000 --- a/archivers/pax/Makefile.common +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile.common,v 1.4 2008/02/07 22:27:53 joerg Exp $ -# -# This Makefile fragment is included by: -# -# pkgsrc/archivers/pax/Makefile -# pkgsrc/pkgtools/pax/Makefile -# - -DISTNAME= pax-20080110 -MASTER_SITES= # empty -DISTFILES= # empty - -MAINTAINER= grant@NetBSD.org -HOMEPAGE= http://www.NetBSD.org/ -COMMENT= POSIX standard archiver with many extensions - -GNU_CONFIGURE= yes - -NO_CHECKSUM= yes -NO_MTREE= yes - -FILESDIR= ${.CURDIR}/../../archivers/pax/files -PKGDIR= ${.CURDIR}/../../archivers/pax - -.include "../../mk/bsd.prefs.mk" - -do-extract: - ${CP} -R ${FILESDIR} ${WRKSRC} diff --git a/archivers/pax/files/Makefile.in b/archivers/pax/files/Makefile.in index 4b26ee7cf9f..3576de8590b 100644 --- a/archivers/pax/files/Makefile.in +++ b/archivers/pax/files/Makefile.in @@ -1,7 +1,8 @@ -# $NetBSD: Makefile.in,v 1.9 2005/12/01 03:00:01 minskim Exp $ +# $NetBSD: Makefile.in,v 1.10 2008/03/06 04:45:58 jlam Exp $ srcdir= @srcdir@ +DESTDIR= prefix= @prefix@ exec_prefix= @exec_prefix@ bindir= @bindir@ @@ -43,15 +44,15 @@ distclean: clean rm -f configure.lineno config.log install: - $(INSTALL) -m 755 -d $(bindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(bindir) - ln -f $(bindir)/$(PROG) $(bindir)/cpio - ln -f $(bindir)/$(PROG) $(bindir)/tar - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 - $(INSTALL) -m 444 cpio.1 $(man1dir)/cpio.1 - $(INSTALL) -m 444 cpio.cat1 $(cat1dir)/cpio.0 - $(INSTALL) -m 444 tar.1 $(man1dir)/tar.1 - $(INSTALL) -m 444 tar.cat1 $(cat1dir)/tar.0 + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) + $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir) + $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir) + $(INSTALL) $(PROG) $(DESTDIR)$(bindir) + ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/cpio + ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/tar + $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$(PROG).0 + $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/cpio.1 + $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/cpio.0 + $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/tar.1 + $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/tar.0 diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index cbe5e450f11..a9dd4ffc448 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.120 2008/01/30 22:57:31 tron Exp $ +# $NetBSD: bootstrap,v 1.121 2008/03/06 04:45:58 jlam Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -1026,10 +1026,10 @@ case "$need_extras" in yes) build_package "pkgtools/bootstrap-extras";; esac case "$need_ftp" in -yes) build_package "pkgtools/tnftp";; +yes) build_package "net/tnftp";; esac case "$need_pax" in -yes) build_package "pkgtools/pax";; +yes) build_package "archivers/pax";; esac build_package "pkgtools/pkg_install" diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index 8c4930fad49..22d624a075e 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,12 +1,44 @@ -# $NetBSD: Makefile,v 1.22 2007/08/07 04:59:52 lukem Exp $ +# $NetBSD: Makefile,v 1.23 2008/03/06 04:45:58 jlam Exp $ -.include "Makefile.common" +DISTNAME= tnftp-20070806 +SVR4_PKGNAME= tnftp +CATEGORIES= net +MASTER_SITES= # empty +DISTFILES= # empty -CATEGORIES= net +# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp -CONFLICTS+= kth-krb4-[0-9]* -CONFLICTS+= lukemftp-[0-9]* +CONFLICTS+= kth-krb4-[0-9]* +CONFLICTS+= lukemftp-[0-9]* + +MAINTAINER= lukem@NetBSD.org +COMMENT= The enhanced FTP client in NetBSD + +PKG_DESTDIR_SUPPORT= user-destdir + +GNU_CONFIGURE= yes +NO_CHECKSUM= yes + +OPSYSVARS+= MAKE_ENV +MAKE_ENV.SunOS+= CPPFLAGS="" .include "options.mk" +do-extract: + @${CP} -R ${FILESDIR} ${WRKSRC} + @${RM} -f ${WRKSRC}/INSTALL + +# Use readline/builtin.mk to check for an editline library on the +# system. If we use the system editline library, then use the built-in +# termcap library. +# +CHECK_BUILTIN.readline:= yes +.include "../../devel/readline/builtin.mk" +CHECK_BUILTIN.readline:= no + +.if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +USE_BUILTIN.termcap= yes +.endif + +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tnftp/Makefile.common b/net/tnftp/Makefile.common deleted file mode 100644 index a388e7c9190..00000000000 --- a/net/tnftp/Makefile.common +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile.common,v 1.3 2007/08/07 04:56:22 lukem Exp $ - -DISTNAME= tnftp-20070806 -SVR4_PKGNAME= tnftp -MASTER_SITES= # empty -DISTFILES= # empty - -# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp - -MAINTAINER= lukem@NetBSD.org -COMMENT= The enhanced FTP client in NetBSD - -GNU_CONFIGURE= YES - -NO_CHECKSUM= yes -NO_MTREE= yes - -FILESDIR= ${.CURDIR}/../../net/tnftp/files -PKGDIR= ${.CURDIR}/../../net/tnftp - -OPSYSVARS+= MAKE_ENV -MAKE_ENV.SunOS+= CPPFLAGS="" - -.include "../../mk/bsd.prefs.mk" - -do-extract: - @${CP} -R ${FILESDIR} ${WRKSRC} - @${RM} -f ${WRKSRC}/INSTALL diff --git a/net/tnftp/files/src/Makefile.in b/net/tnftp/files/src/Makefile.in index ac763418e43..6ea18fb8b2e 100644 --- a/net/tnftp/files/src/Makefile.in +++ b/net/tnftp/files/src/Makefile.in @@ -1,10 +1,11 @@ -# $NetBSD: Makefile.in,v 1.5 2007/08/07 02:07:01 lukem Exp $ +# $NetBSD: Makefile.in,v 1.6 2008/03/06 04:45:58 jlam Exp $ # srcdir = @srcdir@ VPATH = @srcdir@ SHELL = /bin/sh +DESTDIR = prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -39,10 +40,10 @@ ${OBJS}: ${srcdir}/../tnftp.h ../config.h ${CC} ${CFLAGS} ${CPPFLAGS} -c $< install: all - -mkdir -p ${bindir} - ${INSTALL} -m 555 ${PROG} ${bindir}/`echo ${PROG}|sed '$(transform)'` - -mkdir -p ${mandircat1} - ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0 + -mkdir -p ${DESTDIR}${bindir} + ${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'` + -mkdir -p ${DESTDIR}${mandircat1} + ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0 clean: rm -f core ${PROG} ${OBJS} diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile deleted file mode 100644 index 793fc69844d..00000000000 --- a/pkgtools/pax/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2008/02/07 22:27:53 joerg Exp $ -# -# This version of pax installs into ${PKG_TOOLS_BIN}. -# - -USE_FEATURES= nbcompat - -.include "../../archivers/pax/Makefile.common" - -CATEGORIES= pkgtools - -NO_PKGTOOLS_REQD_CHECK= yes - -.include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/tnftp/Makefile b/pkgtools/tnftp/Makefile deleted file mode 100644 index fb886a5182c..00000000000 --- a/pkgtools/tnftp/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2007/08/07 05:05:04 lukem Exp $ -# -# This version of tnftp installs into ${PKG_TOOLS_BIN}. -# - -.include "../../net/tnftp/Makefile.common" - -CATEGORIES= pkgtools - -NO_PKGTOOLS_REQD_CHECK= yes - -CONFLICTS+= kth-krb4-[0-9]* -CONFLICTS+= lukemftp-[0-9]* - -.include "../../mk/bsd.pkg.mk" |