5 files changed, 38 insertions, 7 deletions

diff --git a/sysutils/pam_mount/Makefile b/sysutils/pam_mount/Makefile
index 54fea6834188..daebfae5253f 100644
--- a/sysutils/pam_mount/Makefile
+++ b/sysutils/pam_mount/Makefile
@@ -7,14 +7,14 @@
 #
 
 PORTNAME=	pam_mount
-PORTVERSION=	2.10
+PORTVERSION=	2.11
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME:S/_/-/}/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A PAM that can mount volumes for a user session
 
-LIB_DEPENDS=	HX.25:${PORTSDIR}/lang/libhx
+LIB_DEPENDS=	HX.27:${PORTSDIR}/lang/libhx
 
 USE_GNOME=	pkgconfig libxml2
 USE_PERL5=	yes
@@ -23,7 +23,9 @@ USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	libcrypto_LIBS="-L/usr/lib -lcrypto" \
 		libcrypto_CFLAGS="-I/usr/include"
-CONFIGURE_ARGS+=--localstatedir=/var --with-ssbindir=${PREFIX}/sbin
+CONFIGURE_ARGS+=--localstatedir=/var \
+		--without-cryptsetup \
+		--with-ssbindir=${PREFIX}/sbin
 
 post-patch:
 	${REINPLACE_CMD} -e '11172s|yes|no|' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/pam_mount/distinfo b/sysutils/pam_mount/distinfo
index 9319f3f3af43..6a9032b497fc 100644
--- a/sysutils/pam_mount/distinfo
+++ b/sysutils/pam_mount/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pam_mount-2.10.tar.xz) = e0241950ee4753e0110dba13a68b8f1dc3c059c45a253452cdb67584d60c361c
-SIZE (pam_mount-2.10.tar.xz) = 284152
+SHA256 (pam_mount-2.11.tar.xz) = 48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d
+SIZE (pam_mount-2.11.tar.xz) = 283960
diff --git a/sysutils/pam_mount/files/patch-src_Makefile.am b/sysutils/pam_mount/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..51ed96fbc072
--- /dev/null
+++ b/sysutils/pam_mount/files/patch-src_Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2011-08-08 10:00:38.000000000 +0200
++++ src/Makefile.am	2011-08-08 10:00:49.000000000 +0200
+@@ -8,7 +8,7 @@
+ moduledir		= @PAM_MODDIR@
+ module_LTLIBRARIES	= pam_mount.la
+ sbin_PROGRAMS		= pmvarrun
+-if HAVE_LIBCRYPTO
++if HAVE_LIBCRYPTSETUP
+ sbin_PROGRAMS		+= pmt-ehd
+ endif
+ ssbin_PROGRAMS		= mount.crypt
diff --git a/sysutils/pam_mount/files/patch-src_Makefile.in b/sysutils/pam_mount/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..20b364dec815
--- /dev/null
+++ b/sysutils/pam_mount/files/patch-src_Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	2011-08-07 01:59:50.000000000 +0200
++++ src/Makefile.in	2011-08-08 10:02:44.000000000 +0200
+@@ -39,7 +39,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ sbin_PROGRAMS = pmvarrun$(EXEEXT) $(am__EXEEXT_1)
+-@HAVE_LIBCRYPTO_TRUE@am__append_1 = pmt-ehd
++@HAVE_LIBCRYPTSETUP_TRUE@am__append_1 = pmt-ehd
+ ssbin_PROGRAMS = mount.crypt$(EXEEXT)
+ noinst_PROGRAMS = autoloop$(EXEEXT) ismnt$(EXEEXT)
+ @HAVE_LIBCRYPTSETUP_TRUE@am__append_2 = crypto-dmc.c
+@@ -120,7 +120,7 @@
+ pam_mount_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pam_mount_la_CFLAGS) \
+ 	$(CFLAGS) $(pam_mount_la_LDFLAGS) $(LDFLAGS) -o $@
+-@HAVE_LIBCRYPTO_TRUE@am__EXEEXT_1 = pmt-ehd$(EXEEXT)
++@HAVE_LIBCRYPTSETUP_TRUE@am__EXEEXT_1 = pmt-ehd$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) $(ssbin_PROGRAMS)
+ am_autoloop_OBJECTS = autoloop.$(OBJEXT)
+ autoloop_OBJECTS = $(am_autoloop_OBJECTS)
diff --git a/sysutils/pam_mount/pkg-plist b/sysutils/pam_mount/pkg-plist
index be00a027f540..3578ee6cfd2b 100644
--- a/sysutils/pam_mount/pkg-plist
+++ b/sysutils/pam_mount/pkg-plist
@@ -1,14 +1,12 @@
 sbin/mount.crypt
 sbin/mount.crypt_LUKS
 sbin/mount.crypto_LUKS
-sbin/mount.encfs13
 sbin/umount.crypt
 sbin/umount.crypt_LUKS
 sbin/umount.crypto_LUKS
 etc/security/pam_mount.conf.xml.sample
 lib/pam_mount.so
 sbin/pmvarrun
-sbin/pmt-ehd
 @dirrm share/xml/pam_mount/dtd
 @dirrm share/xml/pam_mount
 @dirrm etc/security