First part of minor dropbear package cleanup - this part lets the

package build as a normal user

+ don't refer to MAKEFLAGS outside of pkgsrc/mk
+ add comments to patch files
+ use BSD_INSTALL_* definitions in the build Makefile
+ re-order some parts of the pkgsrc Makefile
+ use pkgsrc definitions for CFLAGS.${OPSYS} rather than conditionals

XXX - TO DO - fix the xauth issue here

4 files changed, 67 insertions, 34 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 320e2e040f4..70be9551dec 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.29 2014/01/27 19:53:06 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/31 17:32:19 agc Exp $
 
 DISTNAME=	dropbear-2013.62
 CATEGORIES=	security
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://matt.ucc.asn.au/dropbear/dropbear.html
 COMMENT=	Small SSH2 server and client, aimed at embedded market
+LICENSE=	modified-bsd
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-EXTRACT_SUFX=	.tar.bz2
-
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_TOOLS+=		gmake
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dropbear
 PKG_SUPPORTED_OPTIONS=	pam
+
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpam)
@@ -28,8 +30,6 @@ SUBST_FILES.pam=	options.h
 SUBST_SED.pam=		-e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
 .endif
 
-MAKEFLAGS+=	ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
-
 OWN_DIRS+=		${PKG_SYSCONFDIR}/dropbear
 
 SUBST_CLASSES+=		config
@@ -48,9 +48,7 @@ CPPFLAGS+=-DXAUTH_COMMAND="\"${X11BASE}/bin/xauth\""
 CPPFLAGS+=-DXAUTH_COMMAND="\"${X11PREFIX}/bin/xauth\""
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=	-DHAVE_NETINET_IN_SYSTM_H
-.endif
+CFLAGS.NetBSD+=		-DHAVE_NETINET_IN_SYSTM_H
 
 INSTALLATION_DIRS=	share/doc/dropbear ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index b904e7bf066..47d4b4504a3 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2014/01/27 19:53:06 drochner Exp $
+$NetBSD: distinfo,v 1.22 2014/01/31 17:32:19 agc Exp $
 
 SHA1 (dropbear-2013.62.tar.bz2) = 1d0abb6c46206a2c95b26a6f454844855f585403
 RMD160 (dropbear-2013.62.tar.bz2) = 0eff5a4caf353898d3f5d4518786b2ec2473554a
 Size (dropbear-2013.62.tar.bz2) = 1598084 bytes
-SHA1 (patch-aa) = d0ba545503307ff39745823fe3382cd7899aed1d
-SHA1 (patch-ab) = 911a0525f309386901d32c23404d13ae67c2e2d1
+SHA1 (patch-aa) = d5cc422972ad8bf0dc016cd568d55f258f052ed0
+SHA1 (patch-ab) = 35d96409e8763b6e79533c1f05dce02924092c55
diff --git a/security/dropbear/patches/patch-aa b/security/dropbear/patches/patch-aa
index 9f6f6ac4b85..d4150cf67fc 100644
--- a/security/dropbear/patches/patch-aa
+++ b/security/dropbear/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.9 2014/01/27 19:53:06 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2014/01/31 17:32:19 agc Exp $
 
---- Makefile.in.orig	2013-12-03 13:39:15.000000000 +0000
-+++ Makefile.in
-@@ -73,6 +73,7 @@ datarootdir = @datarootdir@
+use pkgsrc macros to install programs and man pages
+set up dropbear default key locations correctly
+
+--- Makefile.in.orig	2013-12-03 05:39:15.000000000 -0800
++++ Makefile.in	2014-01-29 16:14:08.000000000 -0800
+@@ -73,6 +73,7 @@
  bindir=@bindir@
  sbindir=@sbindir@
  mandir=@mandir@
@@ -10,7 +13,7 @@ $NetBSD: patch-aa,v 1.9 2014/01/27 19:53:06 drochner Exp $
  
  CC=@CC@
  AR=@AR@
-@@ -96,6 +97,9 @@ ifneq (,$(strip $(foreach prog, $(PROGRA
+@@ -96,6 +97,9 @@
  	CFLAGS+= -DDROPBEAR_CLIENT
  endif
  
@@ -20,24 +23,53 @@ $NetBSD: patch-aa,v 1.9 2014/01/27 19:53:06 drochner Exp $
  
  # these are exported so that libtomcrypt's makefile will use them
  export CC
-@@ -142,12 +146,16 @@ insmulti%: dropbearmulti
+@@ -125,31 +129,30 @@
+ install: $(addprefix inst_, $(TARGETS))
+ 
+ insmultidropbear: dropbearmulti
+-	$(INSTALL) -d $(DESTDIR)$(sbindir)
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
+ 	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
+ 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
+-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
++	$(BSD_INSTALL_MAN) dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
+ 
+ insmulti%: dropbearmulti
+-	$(INSTALL) -d $(DESTDIR)$(bindir)
+-	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
+ 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
+-	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
++	$(BSD_INSTALL_MAN) $*.1  $(DESTDIR)$(mandir)/man1/$*.1
+ 
+ # dropbear should go in sbin, so it needs a seperate rule
  inst_dropbear: dropbear
- 	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	$(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
-+	-chown ${ROOT_USER} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
-+	-chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
- 	$(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
+-	$(INSTALL) -d $(DESTDIR)$(sbindir)
+-	$(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
+-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
++	$(BSD_INSTALL_PROGRAM) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
++	$(BSD_INSTALL_MAN) dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
  
  inst_%: $*
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
-+	-chown ${ROOT_USER} $(DESTDIR)$(bindir)/$*$(EXEEXT)
-+	-chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/$*$(EXEEXT)
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- 	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
- 
-@@ -187,7 +195,7 @@ link%:
+-	$(INSTALL) -d $(DESTDIR)$(bindir)
+-	$(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
+-	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+-	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_PROGRAM) $*$(EXEEXT) $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
++	if test -e $*.1; then $(BSD_INSTALL_MAN) $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
+ 
+ inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) 
+ 
+@@ -187,7 +190,7 @@
  	-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
  
  $(LTC): options.h
diff --git a/security/dropbear/patches/patch-ab b/security/dropbear/patches/patch-ab
index 002400a1b24..d1e65ae1e56 100644
--- a/security/dropbear/patches/patch-ab
+++ b/security/dropbear/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2009/08/26 21:10:11 snj Exp $
+$NetBSD: patch-ab,v 1.8 2014/01/31 17:32:19 agc Exp $
+
+comment out the path to the dropbear ssh client
+- this is passed through CFLAGS
 
 --- options.h.orig	2009-08-26 13:15:07.000000000 -0700
 +++ options.h	2009-08-26 13:15:14.000000000 -0700