pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 80 to the pkgsrc-2004Q2 branch, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/24c82c1cd090
branches: pkgsrc-2004Q2
changeset: 476750:24c82c1cd090
user: agc <agc%pkgsrc.org@localhost>
date: Thu Jul 29 21:54:34 2004 +0000
description:
Pullup ticket 80 to the pkgsrc-2004Q2 branch, requested by Grant Beattie
Solaris fixes for cfs
Module Name: pkgsrc
Committed By: grant
Date: Sun Jul 25 04:45:41 UTC 2004
Modified Files:
pkgsrc/security/cfs: Makefile
Log Message:
only pass -traditional if using gcc.
and
Module Name: pkgsrc
Committed By: grant
Date: Sun Jul 25 04:46:10 UTC 2004
Modified Files:
pkgsrc/security/cfs: Makefile
Log Message:
be quieter in post-patch and pre-build targets.
and
Module Name: pkgsrc
Committed By: grant
Date: Sun Jul 25 04:47:15 UTC 2004
Modified Files:
pkgsrc/security/cfs: Makefile
Log Message:
be quiet in post-extract, too.
and
Module Name: pkgsrc
Committed By: grant
Date: Sun Jul 25 04:51:26 UTC 2004
Modified Files:
pkgsrc/security/cfs: distinfo
pkgsrc/security/cfs/patches: patch-aa
Log Message:
call ${BSD_INSTALL} instead of "install". fixes install on Solaris.
diffstat:
doc/CHANGES-pkgsrc-2004Q2 | 4 +++-
security/cfs/Makefile | 19 ++++++++++++-------
security/cfs/distinfo | 4 ++--
security/cfs/patches/patch-aa | 26 ++++++++++++++++++++------
4 files changed, 37 insertions(+), 16 deletions(-)
diffs (158 lines):
diff -r fe6262a7fd4e -r 24c82c1cd090 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Thu Jul 29 21:48:56 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Thu Jul 29 21:54:34 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.43 2004/07/29 21:48:56 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.44 2004/07/29 21:54:34 agc Exp $
Changes to the packages collection and infrastructure on the
pkgsrc-2004Q2 branch:
@@ -82,4 +82,6 @@
follow pkgsrc conventions for including bsd.pkg.mk
Pullup ticket 79, requested by Grant Beattie [agc 2004-07-29]
Solaris fixes for fspanel
+Pullup ticket 80, requested by Grant Beattie [agc 2004-07-29]
+ Solaris fixes for cfs
diff -r fe6262a7fd4e -r 24c82c1cd090 security/cfs/Makefile
--- a/security/cfs/Makefile Thu Jul 29 21:48:56 2004 +0000
+++ b/security/cfs/Makefile Thu Jul 29 21:54:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/25 04:48:00 snj Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2004/07/29 21:54:34 agc Exp $
DISTNAME= cfs-1.4.1
PKGREVISION= 1
@@ -29,6 +29,7 @@
CFS_SUBST+= cname->cfs_name CNAME->CFS_NAME
CFS_SUBST+= cpasswd->cfs_passwd CPASSWD->CFS_PASSWD
+.include "../../mk/compiler.mk"
.include "../../mk/bsd.prefs.mk"
MAKE_ENV+= OPSYS="${OPSYS}"
@@ -50,7 +51,9 @@
CFLAGS+= -DHAVE_GETPASS
CFS_BUILD_SCRIPT= ${WRKSRC}/netbsd_make_with_bad_rpcgen
.elif ${OPSYS} == "SunOS"
+. if !empty(CC_VERSION:Mgcc)
CFLAGS+= -traditional
+. endif
CFLAGS+= -DPROTOTYPES=1
CFLAGS+= -DSOLARIS2X -DPORTMAP -DPTMX
MAKE_ENV+= MAKE=${MAKE_PROGRAM}
@@ -59,7 +62,9 @@
MAKE_ENV+= RPCOPTS=
CFS_BUILD_SCRIPT= ${WRKSRC}/make_with_bad_rpcgen
.elif ${OPSYS} == "Linux"
+. if !empty(CC_VERSION:Mgcc)
CFLAGS+= -traditional
+. endif
CFLAGS+= -DPROTOTYPES=1
CFLAGS+= -U__OPTIMIZE__ -U__STDC__ -Dd_fileno=d_ino
MAKE_ENV+= MAKE=${MAKE_PROGRAM}
@@ -76,25 +81,25 @@
RCD_SCRIPTS= cfsd
post-extract:
- ${RM} -f ${WRKSRC}/esm.1
+ @${RM} -f ${WRKSRC}/esm.1
post-patch:
- cd ${WRKSRC}; for file in *; do \
+ @cd ${WRKSRC}; for file in *; do \
${MV} -f $${file} $${file}.presubst; \
dest=`${ECHO} $${file} | ${SED} ${CFS_SUBST_SED}`; \
${SED} ${CFS_SUBST_SED} $${file}.presubst > $${dest}; \
${RM} -f $${file}.presubst; \
done
- ${CHMOD} +x ${CFS_BUILD_SCRIPT}
+ @${CHMOD} +x ${CFS_BUILD_SCRIPT}
pre-build:
- ${SED} -e "s|@AWK@|${AWK}|g" \
+ @${SED} -e "s|@AWK@|${AWK}|g" \
-e "s|@MV@|${MV}|g" \
${FILESDIR}/unansi.sh > ${WRKSRC}/unansi
- ${CHMOD} +x ${WRKSRC}/unansi
+ @${CHMOD} +x ${WRKSRC}/unansi
do-build:
- cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
${SH} ${CFS_BUILD_SCRIPT} ${ALL_TARGET}
post-install:
diff -r fe6262a7fd4e -r 24c82c1cd090 security/cfs/distinfo
--- a/security/cfs/distinfo Thu Jul 29 21:48:56 2004 +0000
+++ b/security/cfs/distinfo Thu Jul 29 21:54:34 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/09 04:32:14 jlam Exp $
+$NetBSD: distinfo,v 1.4.14.1 2004/07/29 21:54:34 agc Exp $
SHA1 (cfs-1.4.1.tar.gz) = be3f73b233149477b739456498c71b120d5f2fb5
Size (cfs-1.4.1.tar.gz) = 98943 bytes
-SHA1 (patch-aa) = 7cb790ac11d0626728db113ad8cccb11bd72d75d
+SHA1 (patch-aa) = c22350cfbcec8ad23bcafd6d9bc5017fb098d259
SHA1 (patch-ab) = 1ff2d2e32b87332ec66cc8f01299fa4b1ddac81a
SHA1 (patch-ac) = 354290ff606fab97b73980e6e512f10ef1397f01
SHA1 (patch-ad) = 2ed5967d59d8f91948b2dd9ed4b18c5073d63615
diff -r fe6262a7fd4e -r 24c82c1cd090 security/cfs/patches/patch-aa
--- a/security/cfs/patches/patch-aa Thu Jul 29 21:48:56 2004 +0000
+++ b/security/cfs/patches/patch-aa Thu Jul 29 21:54:34 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/06/09 04:32:14 jlam Exp $
+$NetBSD: patch-aa,v 1.4.14.1 2004/07/29 21:54:34 agc Exp $
---- Makefile.orig Thu May 3 11:29:21 2001
-+++ Makefile Fri Jun 8 21:15:13 2001
+--- Makefile.orig 2001-05-04 04:29:21.000000000 +1000
++++ Makefile
@@ -74,18 +74,19 @@
#CC=cc
#COPT=-O -DNOT_ANSI_C -DPROTOTYPES=0
@@ -28,7 +28,7 @@
# if you're a paranoid fascist, you might want to configure
# default timeouts on the attach command. If you do,
-@@ -229,7 +230,7 @@
+@@ -229,7 +230,7 @@ RINCLUDES=/usr/mab/rsaref/source
# (3/3) CONFIGURE: one last thing
#==========================================================================
# finally, comment out the next line:
@@ -37,7 +37,7 @@
# now you're done with local configuration.
-@@ -322,6 +323,7 @@
+@@ -322,6 +323,7 @@ nfsproto_svr.c: nfsproto.x
nfsproto.h: nfsproto.x
rpcgen $(RPCOPTS) -h -o nfsproto.h nfsproto.x
@@ -45,7 +45,7 @@
admproto_xdr.c: admproto.x
rpcgen $(RPCOPTS) -c -o admproto_xdr.c admproto.x
-@@ -331,6 +333,7 @@
+@@ -331,6 +333,7 @@ admproto_svr.c: admproto.x
admproto.h: admproto.x
rpcgen $(RPCOPTS) -h -o admproto.h admproto.x
@@ -53,3 +53,17 @@
admproto_clnt.c: admproto.x
rpcgen $(RPCOPTS) -l -o admproto_clnt.c admproto.x
+@@ -359,10 +362,10 @@ printout: $(SRCS) cfs.h mcg.h safer.h ad
+ $(PRINTCMD) $(SRCS) cfs.h mcg.h safer.h admproto.h nfsproto.h
+
+ install_cfs: cfsd cattach cdetach cmkdir
+- install -m 0755 -c -o root cfsd $(ETCDIR)
+- install -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
++ ${BSD_INSTALL} -m 0755 -c -o root cfsd $(ETCDIR)
++ ${BSD_INSTALL} -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
+ cname ccat cmkkey $(BINDIR)
+-# install -m 0755 i o $(BINDIR)
++# ${BSD_INSTALL} -m 0755 i o $(BINDIR)
+ @echo "Kill any running cfsd prior to restarting."
+ @echo "See the README file for more information."
+ @echo "Don't forget to install the man pages (*.[18])."
Home |
Main Index |
Thread Index |
Old Index