[37351] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Wed Jun 4 03:01:31 PDT 2008 

Revision: 37351
          http://trac.macosforge.org/projects/macports/changeset/37351
Author:   ryandesign at macports.org
Date:     2008-06-04 03:01:30 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
libssh01:

 * new port for libssh 0.11 copied from libssh r21477
 * include some changes from libssh r27501
   * update homepage
   * declare dependencies
   * add net category
 
hydra:

 * don't auto-detect anything; fixes erroneous autodetection of libssh, postgresql, etc.
 * use libssh01 since libssh (0.2) is too new. Build with libssh by default, not in a variant, because that's what the last maintainer did in r23321 and I see no reason to second-guess that now.
 * don't build xhydra unless new xhydra variant is selected
 * set CC properly all the time, not just on darwin 8
 * use a versioned documentation directory
 * install more documentation files

Closes #12765.

Modified Paths:
--------------
    trunk/dports/devel/libssh01/Portfile
    trunk/dports/devel/libssh01/files/patch-Makefile.in.diff
    trunk/dports/devel/libssh01/files/patch-libssh-Makefile.in.diff
    trunk/dports/security/hydra/Portfile

Added Paths:
-----------
    trunk/dports/devel/libssh01/
    trunk/dports/security/hydra/files/
    trunk/dports/security/hydra/files/patch-configure.diff

Copied: trunk/dports/devel/libssh01 (from rev 21477, trunk/dports/devel/libssh)

Modified: trunk/dports/devel/libssh01/Portfile
===================================================================
--- trunk/dports/devel/libssh/Portfile	2007-01-26 02:39:47 UTC (rev 21477)
+++ trunk/dports/devel/libssh01/Portfile	2008-06-04 10:01:30 UTC (rev 37351)
@@ -2,22 +2,27 @@
 
 PortSystem 1.0
 
-name		libssh
+name		libssh01
 version		0.11
-categories	devel security
-maintainers	ron at oneinsane.net
+categories	devel security net
+maintainers	ryandesign openmaintainer
 description	an SSH library
 long_description	The ssh library was designed to be used by \
 			programmers needing a working SSH implementation \
 			by the mean of a library.
 
-homepage	http://0xbadc0de.be/?part=libssh
+homepage	http://0xbadc0de.be/wiki/libssh:libssh
 master_sites	http://www.0xbadc0de.be/libssh
 extract.suffix	.tgz
+distname	libssh-${version}
 checksums	md5 ad703c4702646c83ca4fcace92c220d3 \
 		sha1 307430249ded90332c4ec77a264913b3bc93a648 \
 		rmd160 69c2cc00becb84a62555fe884345398f155815a4
 
+depends_lib	port:openssl port:zlib
+
 patchfiles	patch-Makefile.in.diff \
 		patch-libssh-Makefile.in.diff \
 		patch-sample.c.diff
+
+configure.args	--libdir=${prefix}/lib/${name}

Modified: trunk/dports/devel/libssh01/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/libssh/files/patch-Makefile.in.diff	2007-01-26 02:39:47 UTC (rev 21477)
+++ trunk/dports/devel/libssh01/files/patch-Makefile.in.diff	2008-06-04 10:01:30 UTC (rev 37351)
@@ -1,5 +1,14 @@
 --- Makefile.in	2005-03-04 14:54:59.000000000 -0500
 +++ Makefile.in.new	2005-08-18 15:02:05.000000000 -0400
+@@ -7,7 +7,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+-incldir= $(prefix)/include
++incldir= $(prefix)/include/libssh01
+ infodir = $(prefix)/info
+ libdir = $(prefix)/lib/
+ mandir = $(prefix)/man/man1
 @@ -55,12 +55,12 @@
  	  (cd $$dir && $(MAKE) install) \
  	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \

Modified: trunk/dports/devel/libssh01/files/patch-libssh-Makefile.in.diff
===================================================================
--- trunk/dports/devel/libssh/files/patch-libssh-Makefile.in.diff	2007-01-26 02:39:47 UTC (rev 21477)
+++ trunk/dports/devel/libssh01/files/patch-libssh-Makefile.in.diff	2008-06-04 10:01:30 UTC (rev 37351)
@@ -1,5 +1,14 @@
 --- libssh/Makefile.in	2005-03-04 14:54:59.000000000 -0500
 +++ libssh/Makefile.in.new	2005-08-18 15:02:21.000000000 -0400
+@@ -9,7 +9,7 @@
+ bindir = $(exec_prefix)/bin
+ incldir= $(prefix)/include
+ infodir = $(prefix)/info
+-libdir = $(prefix)/lib/
++libdir = $(prefix)/lib/libssh01
+ mandir = $(prefix)/man/man1
+ 
+ CC = @CC@
 @@ -33,9 +33,9 @@
  	ar q libssh.a $(OBJECTS)
  	@RANLIB@ libssh.a

Modified: trunk/dports/security/hydra/Portfile
===================================================================
--- trunk/dports/security/hydra/Portfile	2008-06-04 09:53:09 UTC (rev 37350)
+++ trunk/dports/security/hydra/Portfile	2008-06-04 10:01:30 UTC (rev 37351)
@@ -4,7 +4,7 @@
 
 name               hydra
 version            5.4
-revision	   1
+revision           2
 distname           ${name}-${version}-src
 categories         security net
 platforms          darwin
@@ -20,34 +20,45 @@
 master_sites       http://freeworld.thc.org/releases
 checksums          md5 fa08b465d19321e77b1a0ef912eeecc1
 
-depends_lib        port:openssl
+depends_lib             port:openssl port:libssh01
 
 livecheck.check	   regex
 livecheck.url      ${homepage}
 livecheck.regex	   "${name}-(.*?)-src"
 
+patchfiles              patch-configure.diff
+
 post-patch {
-    reinplace "s|/usr/local/|${prefix}/|g" ${worksrcpath}/configure
-    # don't take any chance with auto-detection
     reinplace "s|SSL_PATH=\"\"|SSL_PATH=\"${prefix}/lib\"|" ${worksrcpath}/configure
     reinplace "s|SSL_IPATH=\"\"|SSL_IPATH=\"${prefix}/include\"|" ${worksrcpath}/configure
     reinplace "s|CRYPTO_PATH=\"\"|CRYPTO_PATH=\"${prefix}/lib\"|" ${worksrcpath}/configure
+    reinplace "s|SSH_PATH=\"\"|SSH_PATH=\"${prefix}/lib/libssh01\"|" ${worksrcpath}/configure
+    reinplace "s|SSH_IPATH=\"\"|SSH_IPATH=\"${prefix}/include/libssh01\"|" ${worksrcpath}/configure
 }
 
-build.args         XLIBPATHS="-L${prefix}/lib"
+configure.args          --disable-xhydra
 
+post-configure {
+    reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/Makefile
+}
+
+build.args              XIPATHS="-I${prefix}/include/libssh01 -I${prefix}/include" \
+                        XLIBPATHS="-L${prefix}/lib/libssh01 -L${prefix}/lib"
+
 pre-destroot {
     reinplace "s|PREFIX=${prefix}|PREFIX=${destroot}${prefix}|" ${worksrcpath}/Makefile
-    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
+    set docdir ${destroot}${prefix}/share/doc/${name}-${version}
+    xinstall -d ${docdir}
+    xinstall -m 644 -W ${worksrcpath} \
+        CHANGES \
+        LICENCE.HYDRA \
+        LICENSE.GNU \
+        README \
+        TODO \
+        ${docdir}
 }
 
-platform darwin 8 {
-    build.args-append CC=/usr/bin/gcc-4.0
+variant xhydra description {Add xhydra GUI} {
+    depends_lib-append      port:gtk2
+    configure.args-delete   --disable-xhydra
 }
-
-# FIXME this won't work with the current libssh version, we need to create a port for
-# libssh-0.11
-# variant ssh description "Enable SSH support" {
-#     depends_lib-append port:libssh
-# }

Added: trunk/dports/security/hydra/files/patch-configure.diff
===================================================================
--- trunk/dports/security/hydra/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/security/hydra/files/patch-configure.diff	2008-06-04 10:01:30 UTC (rev 37351)
@@ -0,0 +1,20 @@
+--- configure	2006-01-20 07:44:15.000000000 -0600
++++ configure	2008-06-04 03:27:13.000000000 -0500
+@@ -38,6 +38,8 @@
+ STRIP="strip"
+ echo
+ 
++if false; then
++
+ echo "Checking for openssl (libssl/ssl.h) ..."
+ for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
+ /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
+@@ -259,6 +261,8 @@
+     APR_IPATH=""
+ fi
+ 
++fi
++
+ SYS=`uname -s`
+ if [ "$SYS" = "SunOS" ]; then
+     echo "Checking for Solaris libraries ..."

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080604/50e5edcf/attachment.htm

More information about the macports-changes mailing list