Re: pkg/43352: [net/bftpd]Update to 2.8

[wen heping <wenheping%gmail.com@localhost>]

Please use this diff instead to fix:

diff -urN bftpd.orig/Makefile bftpd/Makefile
--- bftpd.orig/Makefile 2010-05-26 05:09:19.000000000 +0800
+++ bftpd/Makefile      2010-05-26 05:23:40.000000000 +0800
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.10 2008/07/10 15:52:03 joerg Exp $
 #

-DISTNAME=      bftpd-1.0.24
-PKGREVISION=   1
+DISTNAME=      bftpd-2.8
 CATEGORIES=    net
-MASTER_SITES=  http://bftpd.sourceforge.net/downloads/src/
+MASTER_SITES=  http://downloads.sourceforge.net/project/bftpd/bftpd/bftpd-2.8/

 MAINTAINER=    virtus%wanadoo.nl@localhost
 HOMEPAGE=      http://bftpd.sourceforge.net/
@@ -21,4 +20,6 @@

 PKG_DESTDIR_SUPPORT=   user-destdir

+WRKSRC=                ${WRKDIR}/bftpd
+
 .include "../../mk/bsd.pkg.mk"
diff -urN bftpd.orig/distinfo bftpd/distinfo
--- bftpd.orig/distinfo 2010-05-26 05:09:19.000000000 +0800
+++ bftpd/distinfo      2010-05-27 06:31:12.000000000 +0800
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.4 2008/07/10 15:52:03 joerg Exp $

-SHA1 (bftpd-1.0.24.tar.gz) = 4a047778e9435fc9221d02c1093f040186bb88d7
-RMD160 (bftpd-1.0.24.tar.gz) = 6eb162a5d692c5df2811c24fd07d40193e77d095
-Size (bftpd-1.0.24.tar.gz) = 75995 bytes
-SHA1 (patch-aa) = 5ddab875688e1c2b7ba82171a3a776503ffd7af7
+SHA1 (bftpd-2.8.tar.gz) = 91ae280010006c46719a1cad89b3bbb2872b645d
+RMD160 (bftpd-2.8.tar.gz) = 63166339ed8365d2b36c634c6816f9b25e82a597
+Size (bftpd-2.8.tar.gz) = 139341 bytes
+SHA1 (patch-aa) = 0f028cf6cba35f681dcb21781d4de8ab9f76c8c5
 SHA1 (patch-ab) = faef48266dd0fb7b095738207be2b26ee34e9359
diff -urN bftpd.orig/patches/patch-aa bftpd/patches/patch-aa
--- bftpd.orig/patches/patch-aa 2010-05-26 05:09:18.000000000 +0800
+++ bftpd/patches/patch-aa      2010-05-26 05:20:24.000000000 +0800
@@ -1,16 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2008/07/10 15:52:03 joerg Exp $
-
---- Makefile.in.orig   2003-05-09 16:47:48.000000000 -0500
-+++ Makefile.in
-@@ -4,6 +4,7 @@ INSTALL=@INSTALL@
- CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" @DEBUG@
+--- Makefile.in.orig   2010-05-26 05:17:41.000000000 +0800
++++ Makefile.in        2010-05-26 05:19:46.000000000 +0800
+@@ -4,6 +4,7 @@
+ CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\"
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @DEBUG@
  LIBS=@LIBS@
  prefix=@prefix@
 +datadir=@datadir@
  mandir=@mandir@
  sbindir=@sbindir@
  DESTDIR=
-@@ -26,14 +27,9 @@ bftpd: $(OBJS)
+@@ -26,15 +27,9 @@
  $(OBJS): $(HEADERS) Makefile

  install: all
@@ -18,13 +16,14 @@
 -      $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
 -      [ -f $(DESTDIR)/etc/bftpd.conf ] || \
 -              $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
--      touch /var/log/bftpd.log
--      chmod 644 /var/log/bftpd.log
--      mkdir -p /var/run/bftpd
--      chmod 755 /var/run/bftpd
+-      mkdir -p $(DESTDIR)/var/log
+-      touch $(DESTDIR)/var/log/bftpd.log
+-      chmod 644 $(DESTDIR)/var/log/bftpd.log
+-      mkdir -p $(DESTDIR)/var/run/bftpd
+-      chmod 755 $(DESTDIR)/var/run/bftpd
 +      $(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
 +      $(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
 +      $(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(datadir)/examples/bftpd

  clean distclean:
-       rm -f *~ $(OBJS) bftpd mksources.finished
+       rm -f *~ $(OBJS) bftpd mksources.finished config.cache