pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xview-config Fix my last change (back in August) -...
details: https://anonhg.NetBSD.org/pkgsrc/rev/245c8ac73362
branches: trunk
changeset: 552611:245c8ac73362
user: dholland <dholland%pkgsrc.org@localhost>
date: Wed Jan 07 04:28:53 2009 +0000
description:
Fix my last change (back in August) -- apparently I forgot to escape the
shell variable $? as $$? so it wouldn't be treated as a make variable.
This is wrong but nonfatal with NetBSD's make, but fatal with some other
versions of make.
While here, unhide a chmod that pkglint was complaining about.
PKGREVISION++ (now at 5)
diffstat:
x11/xview-config/Makefile | 6 +++---
x11/xview-config/distinfo | 4 ++--
x11/xview-config/patches/patch-ad | 28 ++++++++++++++++------------
3 files changed, 21 insertions(+), 17 deletions(-)
diffs (150 lines):
diff -r 62a9e57ab3a0 -r 245c8ac73362 x11/xview-config/Makefile
--- a/x11/xview-config/Makefile Wed Jan 07 03:31:05 2009 +0000
+++ b/x11/xview-config/Makefile Wed Jan 07 04:28:53 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2008/08/30 19:52:50 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2009/01/07 04:28:53 dholland Exp $
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-config-3.2.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -19,6 +19,6 @@
USE_IMAKE= yes
post-extract:
- @${CHMOD} -R go+rX ${WRKDIR}
+ ${CHMOD} -R go+rX ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 62a9e57ab3a0 -r 245c8ac73362 x11/xview-config/distinfo
--- a/x11/xview-config/distinfo Wed Jan 07 03:31:05 2009 +0000
+++ b/x11/xview-config/distinfo Wed Jan 07 04:28:53 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/08/30 19:52:50 dholland Exp $
+$NetBSD: distinfo,v 1.6 2009/01/07 04:28:53 dholland Exp $
SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -6,5 +6,5 @@
SHA1 (patch-aa) = 631894d42809d81f091666892b42e1afe09001d4
SHA1 (patch-ab) = f69576916876bb87af8f17c2ba01a3e4ae43c594
SHA1 (patch-ac) = cf0359a8ed9873f3065e7af877e20d65b30ee6c9
-SHA1 (patch-ad) = 980ab1950e6bc67613e461b3b2ac0d20f18d92a7
+SHA1 (patch-ad) = 9d4d329a549b9b571fdae4bfdf76351be056ce8a
SHA1 (patch-ae) = a8b36ae8898bd236ed81b2ecec8a33c3e0ce5fda
diff -r 62a9e57ab3a0 -r 245c8ac73362 x11/xview-config/patches/patch-ad
--- a/x11/xview-config/patches/patch-ad Wed Jan 07 03:31:05 2009 +0000
+++ b/x11/xview-config/patches/patch-ad Wed Jan 07 04:28:53 2009 +0000
@@ -1,4 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2008/08/30 19:52:50 dholland Exp $
+$NetBSD: patch-ad,v 1.8 2009/01/07 04:28:53 dholland Exp $
+
+Patch the make rules to exit on error instead of charging ahead.
+Upstream: not sent upstream as upstream is long dead.
+
--- ./XView.rules.orig 1993-06-29 01:13:20.000000000 -0400
+++ ./XView.rules 2008-08-30 12:12:24.000000000 -0400
@@ -7,7 +11,7 @@
do \ @@\
(cd $$i ; echo "making name in $$i"; \ @@\
- $(MAKE) PassCDebugFlags $(MFLAGS) name); \ @@\
-+ $(MAKE) PassCDebugFlags $(MFLAGS) name) || exit $?; \ @@\
++ $(MAKE) PassCDebugFlags $(MFLAGS) name) || exit $$?; \ @@\
done
#endif /* MakeAnythingSubdirs */
@@ -16,7 +20,7 @@
-@if [ ! -d dir ]; then mkdir dir; else exit 0; fi @@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
- for i in solist; do (set -x; $(CP) sub/$$i dir; $(CP) sub/$$i .); done
-+ for i in solist; do (set -x; $(CP) sub/$$i dir; $(CP) sub/$$i .) || exit $?; done
++ for i in solist; do (set -x; $(CP) sub/$$i dir; $(CP) sub/$$i .) || exit $$?; done
#endif /* SubdirNormalSharedLibraryTarget */
@@ -25,7 +29,7 @@
@case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
for i in salist; do \ @@\
- (set -x; $(CP) sub/$$i dir; $(CP) shared/$$i $(SHARED_DIR)); done
-+ (set -x; $(CP) sub/$$i dir; $(CP) shared/$$i $(SHARED_DIR)) || exit $?; done
++ (set -x; $(CP) sub/$$i dir; $(CP) shared/$$i $(SHARED_DIR)) || exit $$?; done
#endif /* SubdirNormalSharedLibraryDataTarget */
@@ -42,7 +46,7 @@
@if [ -f xstrings ]; then \ @@\
$(RM) strings; $(CP) xstrings strings; fi @@\
- (cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) @@\
-+ (cd sodir; $(CC) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) || exit $? @@\
++ (cd sodir; $(CC) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) || exit $$? @@\
-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@@ -58,7 +62,7 @@
+ $(RM) $@~ sodir/lib/**/libname.so.xs.o @@\
+ @if [ -f xstrings ]; then \ @@\
+ $(RM) strings; $(CP) xstrings strings; fi @@\
-+ (cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) || exit $? @@\
++ (cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o) || exit $$? @@\
+ -@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@\
+ $(RM) $@ @@\
+ $(MV) $@~ $@ @@\
@@ -75,7 +79,7 @@
lib/**/libname.sa.rev:: @@\
$(RM) $@~ @@\
- (cd sadir; $(AR) ../$@~ ?*.o) @@\
-+ (cd sadir; $(AR) ../$@~ ?*.o) || exit $? @@\
++ (cd sadir; $(AR) ../$@~ ?*.o) || exit $$? @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
$(RANLIB) $@ @@\
@@ -84,7 +88,7 @@
lib/**/libname.sa.rev:: @@\
$(RM) $@~ @@\
- (cd sadir; $(AR) ../$@~ ?*.o) @@\
-+ (cd sadir; $(AR) ../$@~ ?*.o) || exit $? @@\
++ (cd sadir; $(AR) ../$@~ ?*.o) || exit $$? @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@@\
@@ -142,7 +146,7 @@
+ $(RM) /dest/lib/**/libname.so @@\
$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\
- (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-+ (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so) || exit $?
++ (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so) || exit $$?
#endif /* InstallSharedLibraryNoBuild */
@@ -151,7 +155,7 @@
echo "linking dir/linkname to filename..." \ @@\
echo " cd" dir; cd dir ; $(RM) linkname ; \ @@\
- (set -x; $(LN) filename linkname); \ @@\
-+ (set -x; $(LN) filename linkname) || exit $?; \ @@\
++ (set -x; $(LN) filename linkname) || exit $$?; \ @@\
else \ @@\
echo "dir/linkname exists, no link made." ; \ @@\
fi
@@ -160,7 +164,7 @@
#define StartNamedTarget(step,dir,flags) @@\
step:: @@\
- (cd dir ; $(MAKE) $(MFLAGS) flags step );
-+ (cd dir ; $(MAKE) $(MFLAGS) flags step ) || exit $?;
++ (cd dir ; $(MAKE) $(MFLAGS) flags step ) || exit $$?;
#endif /* StartNamedTarget */
/*
@@ -169,7 +173,7 @@
$(RM) dest/$$i dest/.$$i; \ @@\
$(INSTALL) -c $(INSTDATFLAGS) $$i dest ; \ @@\
- ( cd dest; $(MV) $$i .$$i; $(LN) .$$i $$i ); \ @@\
-+ ( cd dest; $(MV) $$i .$$i; $(LN) .$$i $$i ) || exit $?; \ @@\
++ ( cd dest; $(MV) $$i .$$i; $(LN) .$$i $$i ) || exit $$?; \ @@\
done
#endif /* InstallSupportList */
Home |
Main Index |
Thread Index |
Old Index