From 4660c9f359108cb23813a40e988fce8627a68725 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 14 Jul 2006 19:38:47 +0000
Subject: Create a separate "pax" package in the pkgtools category that
 installs into ${PKG_TOOLS_BIN}.  This package is used in the case where pax
 is a requirement for the pkg_install tools.  The archivers/pax package is now
 a normal package with no special PKG_PRESERVE flags set.

---
 archivers/pax/Makefile        | 30 ++----------------------------
 archivers/pax/Makefile.common | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 archivers/pax/Makefile.common

(limited to 'archivers')

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 76e756a266f..c04dbba02d8 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,31 +1,5 @@
-# $NetBSD: Makefile,v 1.25 2006/07/14 18:48:43 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.26 2006/07/14 19:38:47 jlam Exp $
 
-DISTNAME=		pax-20060202
-CATEGORIES=		archivers pkgtools
-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_PKGTOOLS_REQD_CHECK=	yes
-NO_CHECKSUM=		yes
-NO_MTREE=		yes
-PKG_PRESERVE=		yes
-
-.include "../../mk/bsd.prefs.mk"
-
-do-extract:
-	${CP} -R ${FILESDIR} ${WRKSRC}
-
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
+.include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile.common b/archivers/pax/Makefile.common
new file mode 100644
index 00000000000..f5ca7b7606b
--- /dev/null
+++ b/archivers/pax/Makefile.common
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2006/07/14 19:38:47 jlam Exp $
+#
+# This Makefile fragment is included by:
+#
+#	pkgsrc/archivers/pax/Makefile
+#	pkgsrc/pkgtools/pax/Makefile
+#
+
+DISTNAME=		pax-20060202
+CATEGORIES=		archivers pkgtools
+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"
+
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
+
+do-extract:
+	${CP} -R ${FILESDIR} ${WRKSRC}
-- 
cgit v1.2.3