aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2022-07-26 15:40:13 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2022-07-26 15:43:24 +0000
commit6a2a18f6deee89e0f232ca762b50dc94db438751 (patch)
tree75d11976d68aaf4eaf0c9f6bffafed604ab7290c
parent05716c88cac09dc35e155f56f2eb629f915830a7 (diff)
downloadports-6a2a18f6deee89e0f232ca762b50dc94db438751.tar.gz
ports-6a2a18f6deee89e0f232ca762b50dc94db438751.zip
security/fprintd: fix build
- Don't allow to run configure from autogen.sh, where no necessary configure args/env is passed - Fix manpage location in plist and treat optional files as such
-rw-r--r--security/fprintd/Makefile7
-rw-r--r--security/fprintd/pkg-plist6
2 files changed, 4 insertions, 9 deletions
diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index 2d6591b0ecc1..03812ec61231 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -31,17 +31,12 @@ OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
PAM_CONFIGURE_ENABLE= pam
-do-configure:
- (cd ${WRKSRC} ; ${SH} autogen.sh)
-
# Remove doc build ; Doesn't install with/without
# Also less deps needed
pre-configure:
${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_fprintd.so
+ (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)
.include <bsd.port.mk>
diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist
index be2cca9b31f7..4e3a01d8bd40 100644
--- a/security/fprintd/pkg-plist
+++ b/security/fprintd/pkg-plist
@@ -4,8 +4,8 @@ bin/fprintd-list
bin/fprintd-verify
%%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
%%ETCDIR%%/fprintd.conf
-lib/security/pam_fprintd.a
-lib/security/pam_fprintd.so
+%%PAM%%lib/security/pam_fprintd.a
+%%PAM%%lib/security/pam_fprintd.so
libexec/fprintd
share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
@@ -81,5 +81,5 @@ share/dbus-1/system-services/net.reactivated.Fprint.service
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
-share/man/man1/fprintd.1.gz
+man/man1/fprintd.1.gz
share/polkit-1/actions/net.reactivated.fprint.device.policy