pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators Partially revert previous, apparently there ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/557a417ef3f9
branches:  trunk
changeset: 648044:557a417ef3f9
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Mar 10 01:42:13 2015 +0000

description:
Partially revert previous, apparently there exists "make emul-distinfo"
Turn "make distinfo" into an error instead.
Thanks to anonymous for the hint.

diffstat:

 emulators/suse121_linux/Makefile.common |  11 ++---------
 emulators/suse131_linux/Makefile.common |  11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diffs (50 lines):

diff -r 9184e6759113 -r 557a417ef3f9 emulators/suse121_linux/Makefile.common
--- a/emulators/suse121_linux/Makefile.common   Tue Mar 10 01:10:47 2015 +0000
+++ b/emulators/suse121_linux/Makefile.common   Tue Mar 10 01:42:13 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2015/03/08 19:03:32 tnn Exp $
+# $NetBSD: Makefile.common,v 1.10 2015/03/10 01:42:13 tnn Exp $
 #
 # used by emulators/suse121_alsa/Makefile
 # used by emulators/suse121_alsa/Makefile
@@ -130,14 +130,7 @@
 .sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
 
 .if make(distinfo) || make(makedistinfo) || make(mdi) || make(makesum)
-.  if defined(RPMPKGS) && !empty(RPMPKGS)
-RPMPKGS:=      ${RPMPKGS:S/${EMUL_ARCH}/i586/}         \
-               ${RPMPKGS:S/${EMUL_ARCH}/x86_64/}
-.  endif
-.  if defined(RPMUPDPKGS) && !empty(RPMUPDPKGS)
-RPMUPDPKGS:=   ${RPMUPDPKGS:S/${EMUL_ARCH}/i586/}      \
-               ${RPMUPDPKGS:S/${EMUL_ARCH}/x86_64/}
-.  endif
+PKG_FAIL_REASON=       "please use make emul-fetch or make emul-distinfo"
 .endif
 
 .if defined(RPMPKGS) && !empty(RPMPKGS)
diff -r 9184e6759113 -r 557a417ef3f9 emulators/suse131_linux/Makefile.common
--- a/emulators/suse131_linux/Makefile.common   Tue Mar 10 01:10:47 2015 +0000
+++ b/emulators/suse131_linux/Makefile.common   Tue Mar 10 01:42:13 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2015/03/08 19:03:32 tnn Exp $
+# $NetBSD: Makefile.common,v 1.13 2015/03/10 01:42:13 tnn Exp $
 #
 # used by emulators/suse131_alsa/Makefile
 # used by emulators/suse131_aspell/Makefile
@@ -122,14 +122,7 @@
 .sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
 
 .if make(distinfo) || make(makedistinfo) || make(mdi) || make(makesum)
-.  if defined(RPMPKGS) && !empty(RPMPKGS)
-RPMPKGS:=      ${RPMPKGS:S/${EMUL_ARCH}/i586/}         \
-               ${RPMPKGS:S/${EMUL_ARCH}/x86_64/}
-.  endif
-.  if defined(RPMUPDPKGS) && !empty(RPMUPDPKGS)
-RPMUPDPKGS:=   ${RPMUPDPKGS:S/${EMUL_ARCH}/i586/}      \
-               ${RPMUPDPKGS:S/${EMUL_ARCH}/x86_64/}
-.  endif
+PKG_FAIL_REASON=       "please use make emul-fetch or make emul-distinfo"
 .endif
 
 .if defined(RPMPKGS) && !empty(RPMPKGS)



Home | Main Index | Thread Index | Old Index