CVS commit: pkgsrc/devel/gdb7

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Aug 28 11:02:23 UTC 2020

Modified Files:
        pkgsrc/devel/gdb7: Makefile PLIST.common options.mk

Log Message:
devel/gdb7: Fix package with disabled python option

The common PLIST must be reduced in this case.

No bump of PKGREVISION because the package with enabled python option
is unchanged.

While here, fix some pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gdb7/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gdb7/PLIST.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/gdb7/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gdb7/Makefile
diff -u pkgsrc/devel/gdb7/Makefile:1.8 pkgsrc/devel/gdb7/Makefile:1.9
--- pkgsrc/devel/gdb7/Makefile:1.8      Sun May 17 15:52:18 2020
+++ pkgsrc/devel/gdb7/Makefile  Fri Aug 28 11:02:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/05/17 15:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/28 11:02:23 micha Exp $
 
 DISTNAME=      gdb-7.11
 PKGREVISION=   6
@@ -24,8 +24,8 @@ CONFIGURE_ENV+=                       CONFIG_LDFLAGS=${LDFLA
 
 # In gdb/configure, depcomp is parsed with sed.
 SUBST_CLASSES+=                        fix-depcomp
-SUBST_STAGE.fix-depcomp+=      pre-configure
-SUBST_MESSAGE.fix-depcomp+=    Read depcomp directly
+SUBST_STAGE.fix-depcomp=       pre-configure
+SUBST_MESSAGE.fix-depcomp=     Read depcomp directly
 SUBST_FILES.fix-depcomp+=      gdb/configure
 SUBST_SED.fix-depcomp+=                -e 's,< ./depcomp,${_OVERRIDE_PATH.depcomp},'
 

Index: pkgsrc/devel/gdb7/PLIST.common
diff -u pkgsrc/devel/gdb7/PLIST.common:1.1 pkgsrc/devel/gdb7/PLIST.common:1.2
--- pkgsrc/devel/gdb7/PLIST.common:1.1  Mon Jun  5 10:41:28 2017
+++ pkgsrc/devel/gdb7/PLIST.common      Fri Aug 28 11:02:23 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2017/06/05 10:41:28 maya Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2020/08/28 11:02:23 micha Exp $
 bin/gdb
 include/gdb/jit-reader.h
 info/annotate.info
@@ -7,28 +7,28 @@ info/stabs.info
 man/man1/gdb.1
 man/man1/gdbserver.1
 man/man5/gdbinit.5
-share/gdb/python/gdb/FrameDecorator.py
-share/gdb/python/gdb/FrameIterator.py
-share/gdb/python/gdb/__init__.py
-share/gdb/python/gdb/command/__init__.py
-share/gdb/python/gdb/command/explore.py
-share/gdb/python/gdb/command/frame_filters.py
-share/gdb/python/gdb/command/pretty_printers.py
-share/gdb/python/gdb/command/prompt.py
-share/gdb/python/gdb/command/type_printers.py
-share/gdb/python/gdb/command/unwinders.py
-share/gdb/python/gdb/command/xmethods.py
-share/gdb/python/gdb/frames.py
-share/gdb/python/gdb/function/__init__.py
-share/gdb/python/gdb/function/caller_is.py
-share/gdb/python/gdb/function/strfns.py
-share/gdb/python/gdb/printer/__init__.py
-share/gdb/python/gdb/printer/bound_registers.py
-share/gdb/python/gdb/printing.py
-share/gdb/python/gdb/prompt.py
-share/gdb/python/gdb/types.py
-share/gdb/python/gdb/unwinder.py
-share/gdb/python/gdb/xmethod.py
+${PLIST.python}share/gdb/python/gdb/FrameDecorator.py
+${PLIST.python}share/gdb/python/gdb/FrameIterator.py
+${PLIST.python}share/gdb/python/gdb/__init__.py
+${PLIST.python}share/gdb/python/gdb/command/__init__.py
+${PLIST.python}share/gdb/python/gdb/command/explore.py
+${PLIST.python}share/gdb/python/gdb/command/frame_filters.py
+${PLIST.python}share/gdb/python/gdb/command/pretty_printers.py
+${PLIST.python}share/gdb/python/gdb/command/prompt.py
+${PLIST.python}share/gdb/python/gdb/command/type_printers.py
+${PLIST.python}share/gdb/python/gdb/command/unwinders.py
+${PLIST.python}share/gdb/python/gdb/command/xmethods.py
+${PLIST.python}share/gdb/python/gdb/frames.py
+${PLIST.python}share/gdb/python/gdb/function/__init__.py
+${PLIST.python}share/gdb/python/gdb/function/caller_is.py
+${PLIST.python}share/gdb/python/gdb/function/strfns.py
+${PLIST.python}share/gdb/python/gdb/printer/__init__.py
+${PLIST.python}share/gdb/python/gdb/printer/bound_registers.py
+${PLIST.python}share/gdb/python/gdb/printing.py
+${PLIST.python}share/gdb/python/gdb/prompt.py
+${PLIST.python}share/gdb/python/gdb/types.py
+${PLIST.python}share/gdb/python/gdb/unwinder.py
+${PLIST.python}share/gdb/python/gdb/xmethod.py
 share/gdb/syscalls/aarch64-linux.xml
 share/gdb/syscalls/amd64-linux.xml
 share/gdb/syscalls/arm-linux.xml

Index: pkgsrc/devel/gdb7/options.mk
diff -u pkgsrc/devel/gdb7/options.mk:1.4 pkgsrc/devel/gdb7/options.mk:1.5
--- pkgsrc/devel/gdb7/options.mk:1.4    Mon Sep  2 13:19:41 2019
+++ pkgsrc/devel/gdb7/options.mk        Fri Aug 28 11:02:23 2020
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2019/09/02 13:19:41 adam Exp $
+# $NetBSD: options.mk,v 1.5 2020/08/28 11:02:23 micha Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdb
 PKG_SUPPORTED_OPTIONS= python
 PKG_SUGGESTED_OPTIONS= python
+PLIST_VARS+=           python
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,4 +11,5 @@ PKG_SUGGESTED_OPTIONS=        python
 CONFIGURE_ARGS+=       --with-python=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED=       27
 .include "../../lang/python/application.mk"
+PLIST.python=  yes
 .endif