summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-14 21:41:42 +0000
committerjlam <jlam>2006-07-14 21:41:42 +0000
commit13ad8df80d4fc9ed0a52e2eb9bf6f850a3b501ca (patch)
treea119297d73e40b71606780428a0069dd545aaa3e /net
parent667f13dc9e9c0edcbc9bfd56a7c226a6f9b49e8e (diff)
downloadpkgsrc-13ad8df80d4fc9ed0a52e2eb9bf6f850a3b501ca.tar.gz
Create a separate pkgtools/tnftp package that is installed as part of
the bootstrap process and which may be needed by pkg_install. This is distinct from the net/tnftp package that is now a "normal" package. Modify the bootstrap script to use pkgtools/tnftp instead, and clean up some of the registration code.
Diffstat (limited to 'net')
-rw-r--r--net/tnftp/Makefile29
-rw-r--r--net/tnftp/Makefile.common27
2 files changed, 32 insertions, 24 deletions
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index 4f454c1f57b..17526a212f8 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,31 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2006/07/14 16:24:29 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.20 2006/07/14 21:41:42 jlam Exp $
-DISTNAME= tnftp-20050625
-SVR4_PKGNAME= tnftp
-CATEGORIES= net
-MASTER_SITES= # empty
-DISTFILES= # empty
+.include "Makefile.common"
-# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
+CATEGORIES= net
-MAINTAINER= lukem@NetBSD.org
-COMMENT= The enhanced FTP client in NetBSD
-
-GNU_CONFIGURE= YES
-
-CONFLICTS+= kth-krb4-[0-9]*
-CONFLICTS+= lukemftp-[0-9]*
-
-NO_CHECKSUM= yes
-NO_MTREE= yes
+CONFLICTS+= kth-krb4-[0-9]*
+CONFLICTS+= lukemftp-[0-9]*
.include "options.mk"
-OPSYSVARS+= MAKE_ENV
-MAKE_ENV.SunOS+= CPPFLAGS=""
-
-do-extract:
- @${CP} -R ${FILESDIR} ${WRKSRC}
-
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tnftp/Makefile.common b/net/tnftp/Makefile.common
new file mode 100644
index 00000000000..3cb8176c28b
--- /dev/null
+++ b/net/tnftp/Makefile.common
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile.common,v 1.1 2006/07/14 21:41:42 jlam Exp $
+
+DISTNAME= tnftp-20050625
+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}