CVS commit: pkgsrc/security/opendoas

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Nov 30 16:57:34 UTC 2025

Modified Files:
        pkgsrc/security/opendoas: Makefile options.mk

Log Message:
opendoas: further Makefile revision


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/opendoas/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/opendoas/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/opendoas/Makefile
diff -u pkgsrc/security/opendoas/Makefile:1.7 pkgsrc/security/opendoas/Makefile:1.8
--- pkgsrc/security/opendoas/Makefile:1.7       Sun Nov 30 15:35:49 2025
+++ pkgsrc/security/opendoas/Makefile   Sun Nov 30 16:57:34 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2025/11/30 15:35:49 vins Exp $
+# $NetBSD: Makefile,v 1.8 2025/11/30 16:57:34 vins Exp $
 
 DISTNAME=      opendoas-6.8.2
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=duncaen/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,8 +15,9 @@ CONFLICTS=    doas-[0-9]*
 
 WRKSRC=                ${WRKDIR}/OpenDoas-${PKGVERSION_NOREV}
 
-CFLAGS.NetBSD+=                -D_OPENBSD_SOURCE
-LDFLAGS.NetBSD+=       -lutil
+USE_TOOLS=     gmake yacc
+
+HAS_CONFIGURE= yes
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing hardcoded paths.
@@ -27,20 +29,14 @@ EGDIR=      share/examples/${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
-HAS_CONFIGURE=         yes
+CONFIGURE_ENV+=                OS=${LOWER_OPSYS}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/${EGDIR}
 
-.if ${OPSYS} == "Linux"
 .include "options.mk"
-.  if !exists(/usr/include/security/pam_appl.h)
-CONFIGURE_ARGS+=       --without-pam
-.  endif
-.endif
 
-USE_TOOLS=     gmake yacc
 MAKE_FILE=     GNUmakefile
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
@@ -48,19 +44,6 @@ BUILDLINK_TRANSFORM+=        rm:-Werror
 SPECIAL_PERMS+=                bin/doas ${SETUID_ROOT_PERMS}
 NOT_FOR_UNPRIVILEGED=  yes
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR}
-
-PLIST_VARS+=   pam-conf
-
-.if ${OPSYS} == "Linux" && exists(/usr/include/security/pam_appl.h)
-PLIST.pam-conf=        yes
-REQD_FILES=    ${EGDIR}/doas /etc/pam.d/doas
-.endif
-
-.if ${OPSYS} == "Darwin"
-PLIST.pam-conf=        yes
-REQD_FILES=    ${EGDIR}/doas /etc/pam.d/doas
-.endif
+AUTO_MKDIRS=   yes
 
-.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/opendoas/options.mk
diff -u pkgsrc/security/opendoas/options.mk:1.2 pkgsrc/security/opendoas/options.mk:1.3
--- pkgsrc/security/opendoas/options.mk:1.2     Sun Feb  2 10:59:47 2025
+++ pkgsrc/security/opendoas/options.mk Sun Nov 30 16:57:34 2025
@@ -1,9 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2025/02/02 10:59:47 vins Exp $
+# $NetBSD: options.mk,v 1.3 2025/11/30 16:57:34 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opendoas
 
-PKG_SUPPORTED_OPTIONS+=        persist
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS+=        pam persist
+.if exists(/usr/include/security/pam_appl.h)
+PKG_SUGGESTED_OPTIONS+=        pam
+.endif
+
+PLIST_VARS+=   pam-conf
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,6 +15,18 @@ PKG_SUGGESTED_OPTIONS=
 ## Enable credential caching.
 ##
 .if !empty(PKG_OPTIONS:Mpersist)
-CONFIGURE_ENV+=                OS=linux
 CONFIGURE_ARGS+=       --with-timestamp
 .endif
+
+###
+### Enable PAM auth support.
+###
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+.  if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin"
+PLIST.pam-conf= yes
+REQD_FILES=     ${EGDIR}/doas /etc/pam.d/doas
+.  endif
+.else
+CONFIGURE_ARGS+=        --without-pam
+.endif