Index: head/security/pam_fprint/Makefile
===================================================================
--- head/security/pam_fprint/Makefile	(revision 457092)
+++ head/security/pam_fprint/Makefile	(revision 457093)
@@ -1,34 +1,26 @@
 # Created by: barner
 # $FreeBSD$
 
 PORTNAME=	pam_fprint
 PORTVERSION=	20080330
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	DEBIAN/pool/main/p/${PORTNAME:C/_/-/}
 DISTNAME=	${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	PAM module offering finger print authentication using libfprint
 
 LIB_DEPENDS=	libfprint.so:security/libfprint
 
-USE_AUTOTOOLS=	autoconf automake
-AUTOMAKE_ARGS=	-a
-CONFIGURE_ENV+=	FPRINT_CFLAGS=-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
+NO_WRKSUBDIR=	yes
+USES=		autoreconf pkgconfig
 
-USES=		pkgconfig
-
-WRKSRC=	${WRKDIR}
-
 PLIST_FILES+=	bin/pam_fprint_enroll \
 		lib/pam_fprint.so
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-pre-configure:
-	cd ${WRKDIR} && ${ACLOCAL}
 
 .include <bsd.port.mk>
Index: head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c
===================================================================
--- head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c	(revision 457092)
+++ head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c	(revision 457093)
@@ -1,11 +1,20 @@
---- src/pam_fprint_enroll.c~	2009-01-08 15:31:21.000000000 -0600
-+++ src/pam_fprint_enroll.c	2011-11-13 02:15:43.976691333 -0600
-@@ -47,7 +47,7 @@ static struct fp_dscv_dev *discover_devi
+--- src/pam_fprint_enroll.c.orig	2009-01-08 21:31:21 UTC
++++ src/pam_fprint_enroll.c
+@@ -26,7 +26,7 @@
+ #include <unistd.h>
+ #include <getopt.h>
+ 
+-#include <libfprint/fprint.h>
++#include <fprint.h>
+ 
+ static const char *finger_names[] = {
+ 	[LEFT_THUMB] = "Left Thumb",
+@@ -47,7 +47,7 @@ static struct fp_dscv_dev *discover_device(struct fp_d
  	struct fp_dscv_dev *ddev = NULL;
  	int i;
  
 -	for (i = 0; ddev = discovered_devs[i]; i++) {
 +	for (i = 0; (ddev = discovered_devs[i]); i++) {
  		struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
  		printf("Found device claimed by %s driver\n",
  			fp_driver_get_full_name(drv));
Index: head/security/pam_fprint/files/patch-src_pam_fprint.c
===================================================================
--- head/security/pam_fprint/files/patch-src_pam_fprint.c	(revision 457092)
+++ head/security/pam_fprint/files/patch-src_pam_fprint.c	(revision 457093)
@@ -1,65 +1,62 @@
---- src/pam_fprint.c.orig	2009-01-08 15:31:21.000000000 -0600
-+++ src/pam_fprint.c	2011-11-13 02:14:44.221692989 -0600
-@@ -18,15 +18,17 @@
+--- src/pam_fprint.c.orig	2009-01-08 21:31:21 UTC
++++ src/pam_fprint.c
+@@ -18,6 +18,7 @@
   */
  
  #include <stdio.h>
 +#include <stdlib.h>
  #include <unistd.h>
  #include <sys/types.h>
  #include <pwd.h>
- #include <string.h>
+@@ -27,6 +28,7 @@
  
--#include <fprint.h>
-+#include "libfprint/fprint.h"
- 
  #define PAM_SM_AUTH
  #include <security/pam_modules.h>
 +#include <security/pam_appl.h>
  
  static int send_info_msg(pam_handle_t *pamh, char *msg)
  {
-@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t *p
+@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t *pamh, char *msg
  
      r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
  	if (r != PAM_SUCCESS)
 -		return;
 +		return r;
  
  	if (!pc || !pc->conv)
 -		return;
 +		return PAM_BUF_ERR;
  
  	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
  }
-@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t *pa
+@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t *pamh, char *msg)
  
      r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
  	if (r != PAM_SUCCESS)
 -		return;
 +		return r;
  
  	if (!pc || !pc->conv)
 -		return;
 +		return PAM_BUF_ERR;
  
  	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
  }
-@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_a
+@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_and_prints(stru
  	struct fp_print_data **gallery;
  
  	/* TODO: add device selection */
 -	while (print = prints[i++]) {
 +	while ((print = prints[i++])) {
  		if (!ddev) {
  			ddev = fp_dscv_dev_for_dscv_print(ddevs, print);
  			driver_id = fp_dscv_print_get_driver_id(print);
-@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_a
+@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_and_prints(stru
  	}
  	
  	i = 0, j = 0;
 -	while (print = prints[i++]) {
 +	while ((print = prints[i++])) {
  		driver_id_cur = fp_dscv_print_get_driver_id(print);
  		if (driver_id_cur == driver_id) {
  			err = fp_print_data_from_dscv_print(print, & (gallery[j]));