Date: Fri, 31 Oct 2003 05:30:32 -0800 From: Cy Schubert <Cy.Schubert@komquats.com> To: Sergey Matveychuk <sem@ciam.ru> Cc: freebsd-ports@freebsd.org Subject: Re: ports/57128: security/krb5: fix build on -stable, fix plist Message-ID: <200310311330.h9VDUWjg096192@cwsys.cwsent.com> In-Reply-To: Your message of "Fri, 31 Oct 2003 14:47:02 %2B0300." <3FA24BB6.9020403@ciam.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <3FA24BB6.9020403@ciam.ru>, Sergey Matveychuk writes:
> Cy Schubert wrote:
>
> > I have a fix that works on -CURRENT and will be testing on -STABLE as
> > tonight after I get home from the office. If you want to give this a try on
>
> > -STABLE before I can, please be my guest.
>
> Sorry, nothing thange. There is no /usr/local/bin/perl in -stable by
> default.
> We spoke about that. But in -current perl must be in /usr/bin/perl as
> symlink.
>
>
> gmake[1]: Leaving directory
> `/usr/build/orion/usr/ports/security/krb5/work/krb5-1.3.1/src/gen-manpages'
> `krb425.info' is up to date.
> `krb5-admin.info' is up to date.
> `krb5-admin.info-1' is up to date.
> `krb5-admin.info-2' is up to date.
> `krb5-admin.info-3' is up to date.
> `krb5-install.info' is up to date.
> `krb5-install.info-1' is up to date.
> `krb5-install.info-2' is up to date.
> `krb5-user.info' is up to date.
> makeinfo --html admin.texinfo
> nroff -man ../src/appl/gssftp/ftp/ftp.M | ./man2html > ftp.html
> ./man2html: not found
> *** Error code 127
>
> Stop in /usr/build/orion/usr/ports/security/krb5/work/krb5-1.3.1/doc.
> *** Error code 1
>
> Stop in /orion/usr/ports/security/krb5.
Sorry, that was an oops on my part. I too discovered that last evening
after I had carved out a piece of my testbed (a P120) for -STABLE. Silly
me. A new patch follows. I've tried building on a pristine 4.9 system and
it appears that one of the Perl ports will be required. Why? Well, read
on...
man2html requires devel/p5-Getopt-Long, which in turn requires Config.pm,
which is only installed by a Perl (5.6 & 5.8) port, which BTW, the Perl
ports also install Getopt::Long, so what's the point of using the Perl that
is shipped with 4.x? If anyone knows of a version of the Config.pm that
p5-Getopt-Long requires that is installed by yet another p5-* port
somewhere in the ports tree, please let me know or I will have to make the
perl5 port a preqreq for installing krb5. A pristine 4.9 system also
requires MakeMaker, which BTW comes with either of the Perl ports but is
not delivered with the Perl that comes with 4.9. Hopefully I'm missing
something somewhere. (As I have to leave the house right now -- I'm late as
usual, I'll look at this later tonight.)
New patch follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/krb5/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile 28 Oct 2003 02:42:41 -0000 1.60
+++ Makefile 31 Oct 2003 13:03:20 -0000
@@ -7,6 +7,7 @@
PORTNAME= krb5
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= security
# USE_MIT_TARBALL tells the port that the user has fetched the source
# directly from MIT rather than the default crypto-publish.org.
@@ -23,11 +24,10 @@
MAINTAINER= cy@FreeBSD.org
COMMENT= An authentication system developed at MIT, successor to Kerberos
IV
-BROKEN= Broken pkg-plist
-
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html
+USE_REINPLACE= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
@@ -57,14 +57,15 @@
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 \
- ftp.1 telnet.1 kerberos.1 kvno.1
+ ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.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 \
- kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
+ kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
+ k5srvutil.8
WRKSRC= ${WRKDIR}/${DISTNAME}/src
@@ -73,6 +74,12 @@
HTML_DOCS= admin.html user-guide.html install.html
HTML_OUTDIRS= krb5-admin krb5-install
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BUILD_DEPENDS+= ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Lo
ng
+.endif
+
.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
do-fetch:
@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
@@ -102,6 +109,15 @@
.endif
.endif
+post-patch:
+.if ${OSVERSION} >= 500000
+ @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena,#!${LOCALBASE},' \
+ ${WRKSRC}/../doc/man2html
+.else
+ @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena,#!\/usr,' \
+ ${WRKSRC}/../doc/man2html
+.endif
+
pre-build:
.if !defined(KRB5_KRB4_COMPAT)
@${ECHO} "------------------------------------------------------"
@@ -117,8 +133,6 @@
@(cd ${WRKSRC}/../doc && \
${MAKE} ${HTML_DOCS})
.endif
-
-.include <bsd.port.pre.mk>
post-install:
# html documentation
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/krb5/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist 8 Aug 2003 01:20:18 -0000 1.12
+++ pkg-plist 31 Oct 2003 13:03:20 -0000
@@ -2,6 +2,7 @@
@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
@unexec install-info --delete %D/info/krb5-install.info %D/info/dir
@unexec install-info --delete %D/info/krb5-user.info %D/info/dir
+bin/compile_et
bin/ftp
bin/gss-client
bin/kdestroy
@@ -25,11 +26,11 @@
include/gssapi/gssapi.h
include/gssapi/gssapi_generic.h
include/gssapi/gssapi_krb5.h
-include/kerberosIV/des.h
-include/kerberosIV/kadm_err.h
-include/kerberosIV/krb.h
-include/kerberosIV/krb_err.h
-include/kerberosIV/mit-copyright.h
+%%KRB4%%include/kerberosIV/des.h
+%%KRB4%%include/kerberosIV/kadm_err.h
+%%KRB4%%include/kerberosIV/krb.h
+%%KRB4%%include/kerberosIV/krb_err.h
+%%KRB4%%include/kerberosIV/mit-copyright.h
include/krb5.h
include/profile.h
info/krb425.info
@@ -73,6 +74,7 @@
lib/libkrb5.so.3
sbin/ftpd
sbin/gss-server
+sbin/k5srvutil
sbin/kadmin
sbin/kadmin.local
sbin/kadmind
@@ -93,9 +95,14 @@
sbin/uuserver
sbin/v5passwdd
share/doc/krb5/README.FreeBSD
+share/et/et_c.awk
+share/et/et_h.awk
share/gnats/mit
@dirrm include/gssapi
@dirrm include/kerberosIV
+@dirrm share/doc
+@dirrm share/et
+@dirrm share/gnats
@exec install-info %D/info/krb425.info %D/info/dir
@exec install-info %D/info/krb5-admin.info %D/info/dir
@exec install-info %D/info/krb5-install.info %D/info/dir
Cheers,
--
Cy Schubert <Cy.Schubert@komquats.com> http://www.komquats.com/
BC Government . FreeBSD UNIX
Cy.Schubert@osg.gov.bc.ca . cy@FreeBSD.org
http://www.gov.bc.ca/ . http://www.FreeBSD.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310311330.h9VDUWjg096192>