From owner-svn-ports-head@freebsd.org Sat Dec 23 17:45:59 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D068E8C495; Sat, 23 Dec 2017 17:45:59 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2762F6DA69; Sat, 23 Dec 2017 17:45:59 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBNHjwZg091999; Sat, 23 Dec 2017 17:45:58 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBNHjwfQ091995; Sat, 23 Dec 2017 17:45:58 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201712231745.vBNHjwfQ091995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 23 Dec 2017 17:45:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457093 - in head/security/pam_fprint: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/security/pam_fprint: . files X-SVN-Commit-Revision: 457093 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Dec 2017 17:45:59 -0000 Author: tijl Date: Sat Dec 23 17:45:57 2017 New Revision: 457093 URL: https://svnweb.freebsd.org/changeset/ports/457093 Log: - Convert to USES=autoreconf. - Replace WRKSRC=WRKDIR with NO_WRKSUBDIR=yes. - Fix includes of fprint.h so CONFIGURE_ENV can be removed. Modified: head/security/pam_fprint/Makefile head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c head/security/pam_fprint/files/patch-src_pam_fprint.c Modified: head/security/pam_fprint/Makefile ============================================================================== --- head/security/pam_fprint/Makefile Sat Dec 23 17:38:34 2017 (r457092) +++ head/security/pam_fprint/Makefile Sat Dec 23 17:45:57 2017 (r457093) @@ -13,22 +13,14 @@ COMMENT= PAM module offering finger print authenticati 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 Modified: head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c ============================================================================== --- head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c Sat Dec 23 17:38:34 2017 (r457092) +++ head/security/pam_fprint/files/patch-src_pam__fprint__enroll.c Sat Dec 23 17:45:57 2017 (r457093) @@ -1,6 +1,15 @@ ---- 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 + #include + +-#include ++#include + + 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; Modified: head/security/pam_fprint/files/patch-src_pam_fprint.c ============================================================================== --- head/security/pam_fprint/files/patch-src_pam_fprint.c Sat Dec 23 17:38:34 2017 (r457092) +++ head/security/pam_fprint/files/patch-src_pam_fprint.c Sat Dec 23 17:45:57 2017 (r457093) @@ -1,6 +1,6 @@ ---- 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 @@ -8,18 +8,15 @@ #include #include #include - #include +@@ -27,6 +28,7 @@ --#include -+#include "libfprint/fprint.h" - #define PAM_SM_AUTH #include +#include 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) @@ -32,7 +29,7 @@ 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) @@ -45,7 +42,7 @@ 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 */ @@ -54,7 +51,7 @@ 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;