Wed Nov 25 21:11:33 2009 UTC ()
Fix permissions of include files. Fix linkage for systems with openssh
in base. Add destdir support.


(joerg)
diff -r1.7 -r1.8 pkgsrc/security/libssh/Makefile
diff -r1.4 -r1.5 pkgsrc/security/libssh/distinfo
diff -r0 -r1.1 pkgsrc/security/libssh/patches/patch-ab
cvs diff -r1.7 -r1.8 pkgsrc/security/libssh/Makefile (expand / switch to unified diff)

--- pkgsrc/security/libssh/Makefile 2009/07/17 18:00:22 1.7
+++ pkgsrc/security/libssh/Makefile 2009/11/25 21:11:33 1.8
@@ -1,26 +1,31 @@ @@ -1,26 +1,31 @@
1# $NetBSD: Makefile,v 1.7 2009/07/17 18:00:22 adrianp Exp $ 1# $NetBSD: Makefile,v 1.8 2009/11/25 21:11:33 joerg Exp $
2# 2#
3# This package currently exists as a dependency for the hydra package but 3# This package currently exists as a dependency for the hydra package but
4# the later versions of it are not supported by hydra. 4# the later versions of it are not supported by hydra.
5# This package should not be updated to the latest version available. 5# This package should not be updated to the latest version available.
6# 6#
7 7
8DISTNAME= libssh-0.11 8DISTNAME= libssh-0.11
9PKGREVISION= 1 9PKGREVISION= 1
10CATEGORIES= security 10CATEGORIES= security
11MASTER_SITES= http://www.0xbadc0de.be/libssh/ 11MASTER_SITES= http://www.0xbadc0de.be/libssh/
12EXTRACT_SUFX= .tgz 12EXTRACT_SUFX= .tgz
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://0xbadc0de.be/ 15HOMEPAGE= http://0xbadc0de.be/
16COMMENT= Library providing working SSH implementation 16COMMENT= Library providing working SSH implementation
17 17
 18PKG_DESTDIR_SUPPORT= user-destdir
 19
18GNU_CONFIGURE= YES 20GNU_CONFIGURE= YES
19 21
 22INSTALLATION_DIRS= share/doc/libssh
 23INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
 24 prefix=${DESTDIR}${PREFIX}
 25
20post-install: 26post-install:
21 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libssh 27 ${INSTALL_DATA} ${WRKSRC}/doc/API.html ${DESTDIR}${PREFIX}/share/doc/libssh
22 ${INSTALL_DATA} ${WRKSRC}/doc/API.html ${PREFIX}/share/doc/libssh 28 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/libssh
23 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libssh 
24 29
25.include "../../security/openssl/buildlink3.mk" 30.include "../../security/openssl/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/security/libssh/distinfo (expand / switch to unified diff)

--- pkgsrc/security/libssh/distinfo 2007/02/25 00:57:54 1.4
+++ pkgsrc/security/libssh/distinfo 2009/11/25 21:11:33 1.5
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.4 2007/02/25 00:57:54 yyamano Exp $ 1$NetBSD: distinfo,v 1.5 2009/11/25 21:11:33 joerg Exp $
2 2
3SHA1 (libssh-0.11.tgz) = 307430249ded90332c4ec77a264913b3bc93a648 3SHA1 (libssh-0.11.tgz) = 307430249ded90332c4ec77a264913b3bc93a648
4RMD160 (libssh-0.11.tgz) = 69c2cc00becb84a62555fe884345398f155815a4 4RMD160 (libssh-0.11.tgz) = 69c2cc00becb84a62555fe884345398f155815a4
5Size (libssh-0.11.tgz) = 303761 bytes 5Size (libssh-0.11.tgz) = 303761 bytes
6SHA1 (patch-aa) = d2e082d87643c80add1b4ff0f0f467ea09be851b 6SHA1 (patch-aa) = d2e082d87643c80add1b4ff0f0f467ea09be851b
 7SHA1 (patch-ab) = 820c7da4e4019c4a168972855dc7a10fa0c10b57
File Added: pkgsrc/security/libssh/patches/Attic/patch-ab
$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 \