summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/krb5-16/Makefile8
-rw-r--r--security/krb5-16/pkg-plist16
-rw-r--r--security/krb5-17/Makefile8
-rw-r--r--security/krb5-17/pkg-plist16
-rw-r--r--security/krb5-appl/Makefile8
-rw-r--r--security/krb5-appl/pkg-plist16
-rw-r--r--security/krb5/Makefile8
-rw-r--r--security/krb5/pkg-plist16
8 files changed, 60 insertions, 36 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index d8cd5394cd41..dbef65d1d20f 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -32,6 +32,9 @@ KRB5_KRB4_COMPAT?= YES
.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
CONFIGURE_ARGS+= --without-krb4
+PLIST_SUB+= KRB4="@comment "
+.else
+PLIST_SUB+= KRB4=""
.endif
.if defined(KRB5_HOME)
@@ -47,7 +50,10 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \
MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \
- v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
+ ftp.1 telnet.1 kerberos.1 kvno.1
+.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
+MAN1+= v4rcp.1
+.endif
MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
index 26ecbc13fb72..f6494e183d94 100644
--- a/security/krb5-16/pkg-plist
+++ b/security/krb5-16/pkg-plist
@@ -9,7 +9,7 @@ bin/kinit
bin/klist
bin/kpasswd
bin/krb5-config
-bin/krb524init
+%%KRB4%%bin/krb524init
bin/ksu
bin/kvno
bin/rcp
@@ -19,7 +19,7 @@ bin/sclient
bin/sim_client
bin/telnet
bin/uuclient
-bin/v4rcp
+%%KRB4%%bin/v4rcp
bin/v5passwd
include/com_err.h
include/gssapi/gssapi.h
@@ -71,13 +71,13 @@ lib/libkadm5srv.so.5
lib/libkdb5.a
lib/libkdb5.so
lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
+%%KRB4%%lib/libkrb4.a
+%%KRB4%%lib/libkrb4.so
+%%KRB4%%lib/libkrb4.so.2
lib/libkrb5.a
lib/libkrb5.so
lib/libkrb5.so.3
-lib/libkrb524.a
+%%KRB4%%lib/libkrb524.a
lib/libpty.a
lib/libpty.so
lib/libpty.so.1
@@ -87,13 +87,13 @@ sbin/gss-server
sbin/kadmin
sbin/kadmin.local
sbin/kadmind
-sbin/kadmind4
+%%KRB4%%sbin/kadmind4
sbin/kdb5_util
sbin/klogind
sbin/kprop
sbin/kpropd
sbin/krb5-send-pr
-sbin/krb524d
+%%KRB4%%sbin/krb524d
sbin/krb5kdc
sbin/kshd
sbin/ktutil
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index d8cd5394cd41..dbef65d1d20f 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -32,6 +32,9 @@ KRB5_KRB4_COMPAT?= YES
.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
CONFIGURE_ARGS+= --without-krb4
+PLIST_SUB+= KRB4="@comment "
+.else
+PLIST_SUB+= KRB4=""
.endif
.if defined(KRB5_HOME)
@@ -47,7 +50,10 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \
MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \
- v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
+ ftp.1 telnet.1 kerberos.1 kvno.1
+.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
+MAN1+= v4rcp.1
+.endif
MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
index 26ecbc13fb72..f6494e183d94 100644
--- a/security/krb5-17/pkg-plist
+++ b/security/krb5-17/pkg-plist
@@ -9,7 +9,7 @@ bin/kinit
bin/klist
bin/kpasswd
bin/krb5-config
-bin/krb524init
+%%KRB4%%bin/krb524init
bin/ksu
bin/kvno
bin/rcp
@@ -19,7 +19,7 @@ bin/sclient
bin/sim_client
bin/telnet
bin/uuclient
-bin/v4rcp
+%%KRB4%%bin/v4rcp
bin/v5passwd
include/com_err.h
include/gssapi/gssapi.h
@@ -71,13 +71,13 @@ lib/libkadm5srv.so.5
lib/libkdb5.a
lib/libkdb5.so
lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
+%%KRB4%%lib/libkrb4.a
+%%KRB4%%lib/libkrb4.so
+%%KRB4%%lib/libkrb4.so.2
lib/libkrb5.a
lib/libkrb5.so
lib/libkrb5.so.3
-lib/libkrb524.a
+%%KRB4%%lib/libkrb524.a
lib/libpty.a
lib/libpty.so
lib/libpty.so.1
@@ -87,13 +87,13 @@ sbin/gss-server
sbin/kadmin
sbin/kadmin.local
sbin/kadmind
-sbin/kadmind4
+%%KRB4%%sbin/kadmind4
sbin/kdb5_util
sbin/klogind
sbin/kprop
sbin/kpropd
sbin/krb5-send-pr
-sbin/krb524d
+%%KRB4%%sbin/krb524d
sbin/krb5kdc
sbin/kshd
sbin/ktutil
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index d8cd5394cd41..dbef65d1d20f 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -32,6 +32,9 @@ KRB5_KRB4_COMPAT?= YES
.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
CONFIGURE_ARGS+= --without-krb4
+PLIST_SUB+= KRB4="@comment "
+.else
+PLIST_SUB+= KRB4=""
.endif
.if defined(KRB5_HOME)
@@ -47,7 +50,10 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \
MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \
- v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
+ ftp.1 telnet.1 kerberos.1 kvno.1
+.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
+MAN1+= v4rcp.1
+.endif
MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
index 26ecbc13fb72..f6494e183d94 100644
--- a/security/krb5-appl/pkg-plist
+++ b/security/krb5-appl/pkg-plist
@@ -9,7 +9,7 @@ bin/kinit
bin/klist
bin/kpasswd
bin/krb5-config
-bin/krb524init
+%%KRB4%%bin/krb524init
bin/ksu
bin/kvno
bin/rcp
@@ -19,7 +19,7 @@ bin/sclient
bin/sim_client
bin/telnet
bin/uuclient
-bin/v4rcp
+%%KRB4%%bin/v4rcp
bin/v5passwd
include/com_err.h
include/gssapi/gssapi.h
@@ -71,13 +71,13 @@ lib/libkadm5srv.so.5
lib/libkdb5.a
lib/libkdb5.so
lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
+%%KRB4%%lib/libkrb4.a
+%%KRB4%%lib/libkrb4.so
+%%KRB4%%lib/libkrb4.so.2
lib/libkrb5.a
lib/libkrb5.so
lib/libkrb5.so.3
-lib/libkrb524.a
+%%KRB4%%lib/libkrb524.a
lib/libpty.a
lib/libpty.so
lib/libpty.so.1
@@ -87,13 +87,13 @@ sbin/gss-server
sbin/kadmin
sbin/kadmin.local
sbin/kadmind
-sbin/kadmind4
+%%KRB4%%sbin/kadmind4
sbin/kdb5_util
sbin/klogind
sbin/kprop
sbin/kpropd
sbin/krb5-send-pr
-sbin/krb524d
+%%KRB4%%sbin/krb524d
sbin/krb5kdc
sbin/kshd
sbin/ktutil
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index d8cd5394cd41..dbef65d1d20f 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -32,6 +32,9 @@ KRB5_KRB4_COMPAT?= YES
.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
CONFIGURE_ARGS+= --without-krb4
+PLIST_SUB+= KRB4="@comment "
+.else
+PLIST_SUB+= KRB4=""
.endif
.if defined(KRB5_HOME)
@@ -47,7 +50,10 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \
MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \
kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \
- v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1
+ ftp.1 telnet.1 kerberos.1 kvno.1
+.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
+MAN1+= v4rcp.1
+.endif
MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 26ecbc13fb72..f6494e183d94 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -9,7 +9,7 @@ bin/kinit
bin/klist
bin/kpasswd
bin/krb5-config
-bin/krb524init
+%%KRB4%%bin/krb524init
bin/ksu
bin/kvno
bin/rcp
@@ -19,7 +19,7 @@ bin/sclient
bin/sim_client
bin/telnet
bin/uuclient
-bin/v4rcp
+%%KRB4%%bin/v4rcp
bin/v5passwd
include/com_err.h
include/gssapi/gssapi.h
@@ -71,13 +71,13 @@ lib/libkadm5srv.so.5
lib/libkdb5.a
lib/libkdb5.so
lib/libkdb5.so.3
-lib/libkrb4.a
-lib/libkrb4.so
-lib/libkrb4.so.2
+%%KRB4%%lib/libkrb4.a
+%%KRB4%%lib/libkrb4.so
+%%KRB4%%lib/libkrb4.so.2
lib/libkrb5.a
lib/libkrb5.so
lib/libkrb5.so.3
-lib/libkrb524.a
+%%KRB4%%lib/libkrb524.a
lib/libpty.a
lib/libpty.so
lib/libpty.so.1
@@ -87,13 +87,13 @@ sbin/gss-server
sbin/kadmin
sbin/kadmin.local
sbin/kadmind
-sbin/kadmind4
+%%KRB4%%sbin/kadmind4
sbin/kdb5_util
sbin/klogind
sbin/kprop
sbin/kpropd
sbin/krb5-send-pr
-sbin/krb524d
+%%KRB4%%sbin/krb524d
sbin/krb5kdc
sbin/kshd
sbin/ktutil