Fix permissions of include files. Fix linkage for systems with openssh

in base. Add destdir support.

3 files changed, 53 insertions, 5 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index a6d183d02b1..2b88df6d1a9 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/07/17 18:00:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2009/11/25 21:11:33 joerg Exp $
 #
 # This package currently exists as a dependency for the hydra package but
 # the later versions of it are not supported by hydra.
@@ -15,12 +15,17 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://0xbadc0de.be/
 COMMENT=	Library providing working SSH implementation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	share/doc/libssh
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
+			prefix=${DESTDIR}${PREFIX}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libssh
-	${INSTALL_DATA} ${WRKSRC}/doc/API.html ${PREFIX}/share/doc/libssh
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libssh
+	${INSTALL_DATA} ${WRKSRC}/doc/API.html ${DESTDIR}${PREFIX}/share/doc/libssh
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/libssh
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index 91f5d212205..59a2bd0baf1 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/02/25 00:57:54 yyamano Exp $
+$NetBSD: distinfo,v 1.5 2009/11/25 21:11:33 joerg Exp $
 
 SHA1 (libssh-0.11.tgz) = 307430249ded90332c4ec77a264913b3bc93a648
 RMD160 (libssh-0.11.tgz) = 69c2cc00becb84a62555fe884345398f155815a4
 Size (libssh-0.11.tgz) = 303761 bytes
 SHA1 (patch-aa) = d2e082d87643c80add1b4ff0f0f467ea09be851b
+SHA1 (patch-ab) = 820c7da4e4019c4a168972855dc7a10fa0c10b57
diff --git a/security/libssh/patches/patch-ab b/security/libssh/patches/patch-ab
new file mode 100644
index 00000000000..bef9ffd0f7c
--- /dev/null
+++ b/security/libssh/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.1 2009/11/25 21:11:33 joerg Exp $
+
+--- Makefile.in.orig	2005-03-04 20:54:59.000000000 +0100
++++ Makefile.in
+@@ -15,7 +15,7 @@ mandir = $(prefix)/man/man1
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -Iinclude/ -Wall -g
+ LDFLAGS = @LDFLAGS@ 
+-LIBS = -lssh -Llibssh/
++LIBS = -Llibssh -lssh
+ INSTALL = @INSTALL@
+ LN= @LN_S@
+ OBJECTS= sample.o samplesshd.o
+@@ -27,9 +27,9 @@ all: $(CONFIG) $(OBJECTS)
+ 	  (cd $$dir && $(MAKE) all) \
+ 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+ 	done && test -z "$$fail"
+-	$(CC) -o samplessh sample.o $(LDFLAGS) $(LIBS)
++	$(CC) -o samplessh sample.o $(LIBS) $(LDFLAGS)
+ 	$(LN) -sf samplessh samplesftp
+-	$(CC) -o samplesshd samplesshd.o $(LDFLAGS) $(LIBS)
++	$(CC) -o samplesshd samplesshd.o $(LIBS) $(LDFLAGS)
+ $(CONFIG):
+ 	$(LN) -f ../../config.h $(CONFIG)
+ dist:
+@@ -56,11 +56,11 @@ install: all
+ 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+ 	done && test -z "$$fail"
+ 	$(top_srcdir)/mkinstalldirs $(incldir)/libssh
+-	$(INSTALL) include/libssh/libssh.h $(incldir)/libssh/
+-	$(INSTALL) include/libssh/config.h $(incldir)/libssh/
+-	$(INSTALL) include/libssh/sftp.h $(incldir)/libssh/
+-	$(INSTALL) include/libssh/crypto.h $(incldir)/libssh/
+-	$(INSTALL) include/libssh/server.h $(incldir)/libssh/
++	$(BSD_INSTALL_DATA) include/libssh/libssh.h $(incldir)/libssh/
++	$(BSD_INSTALL_DATA) include/libssh/config.h $(incldir)/libssh/
++	$(BSD_INSTALL_DATA) include/libssh/sftp.h $(incldir)/libssh/
++	$(BSD_INSTALL_DATA) include/libssh/crypto.h $(incldir)/libssh/
++	$(BSD_INSTALL_DATA) include/libssh/server.h $(incldir)/libssh/
+ clean:
+ 	/bin/rm -f *~ *.o ssh sftp
+ 	@for dir in ${subdirs}; do \