pkgsrc-WIP-changes archive

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

gmake: remove, used for updating devel/gmake



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sun May 2 21:06:44 2021 +0200
Changeset:	6651eac85c175fbe5dd2486a41faee8774362bb5

Modified Files:
	Makefile
Removed Files:
	gmake/DESCR
	gmake/Makefile
	gmake/PLIST
	gmake/distinfo
	gmake/options.mk
	gmake/patches/patch-af
	gmake/patches/patch-src_hash.c

Log Message:
gmake: remove, used for updating devel/gmake

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6651eac85c175fbe5dd2486a41faee8774362bb5

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

diffstat:
 Makefile                       |  2 +-
 gmake/DESCR                    | 10 ---------
 gmake/Makefile                 | 47 ------------------------------------------
 gmake/PLIST                    | 36 --------------------------------
 gmake/distinfo                 |  8 -------
 gmake/options.mk               | 25 ----------------------
 gmake/patches/patch-af         | 17 ---------------
 gmake/patches/patch-src_hash.c | 15 --------------
 8 files changed, 1 insertion(+), 159 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 0c525e98c7..366ea14c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1130,7 +1130,6 @@ SUBDIR+=	glm
 SUBDIR+=	glulxe
 SUBDIR+=	glusterfs
 SUBDIR+=	gm2calc
-SUBDIR+=	gmake
 SUBDIR+=	gmap
 SUBDIR+=	gmetadom
 SUBDIR+=	gmic
@@ -4450,6 +4449,7 @@ SUBDIR+=	py-scikits_timeseries
 SUBDIR+=	py-scikits_vectorplot
 SUBDIR+=	py-scimath
 SUBDIR+=	py-sciproc
+SUBDIR+=	py-scipy
 SUBDIR+=	py-scipy-data_fitting
 SUBDIR+=	py-scitools
 SUBDIR+=	py-scour
diff --git a/gmake/DESCR b/gmake/DESCR
deleted file mode 100644
index e94afa8ecc..0000000000
--- a/gmake/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Make is a tool which controls the generation of executables and
-other non-source files of a program from the program's source files.
-
-Make gets its knowledge of how to build your program from a file
-called the makefile, which lists each of the non-source files and
-how to compute it from other files. When you write a program, you
-should write a makefile for it, so that it is possible to use Make
-to build and install the program.
-
-This is the GNU version of make.
diff --git a/gmake/Makefile b/gmake/Makefile
deleted file mode 100644
index f2920a1a1f..0000000000
--- a/gmake/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.110 2020/06/12 14:48:38 sevan Exp $
-
-DISTNAME=	make-4.3
-PKGNAME=	g${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU:=make/}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.gnu.org/software/make/make.html
-COMMENT=	GNU version of 'make' utility
-LICENSE=	gnu-gpl-v3
-
-USE_FEATURES=		snprintf
-
-GNU_CONFIGURE=		yes
-TEXINFO_REQD+=		4.0
-INFO_FILES=		yes
-
-TEST_TARGET=		check
-USE_TOOLS+=		perl:test
-
-CONFIGURE_ARGS+=	--program-prefix=g
-
-# workaround for broken strndup
-CONFIGURE_ARGS.MirBSD+=	ac_cv_func_strndup=no
-
-# XXX: Do not install gmake setgid and do not override the owner group
-# XXX: based on possible /dev/kmem permissions.
-CONFIGURE_ARGS+=	ac_cv_func_getloadavg_setgid=no
-
-.include "../../mk/bsd.prefs.mk"
-
-# kernel bug, fixed in NetBSD 9.99.82
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-9].*)
-CONFIGURE_ARGS.NetBSD+=	--disable-posix-spawn
-.endif
-
-AUTO_MKDIRS=		yes
-
-.include "options.mk"
-
-post-install:
-	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/make
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/gmake/PLIST b/gmake/PLIST
deleted file mode 100644
index 99c3cbfcb1..0000000000
--- a/gmake/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2020/06/12 15:22:17 sevan Exp $
-bin/gmake
-gnu/bin/make
-gnu/man/man1/make.1
-include/gnumake.h
-info/make.info
-man/man1/gmake.1
-${PLIST.nls}share/locale/be/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/bg/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/cs/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/da/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/de/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/es/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/fi/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/fr/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/ga/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/gl/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/he/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/hr/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/id/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/it/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/ja/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/ko/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/lt/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/pt/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/ru/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/sr/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/sv/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/tr/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/uk/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/vi/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/make.mo
-${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/make.mo
diff --git a/gmake/distinfo b/gmake/distinfo
deleted file mode 100644
index d1186b5890..0000000000
--- a/gmake/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.38 2020/06/12 15:22:17 sevan Exp $
-
-SHA1 (make-4.3.tar.gz) = 3c40e5b49b893dbb14f1e2e1f8fe89b7298cc51d
-RMD160 (make-4.3.tar.gz) = 2f2d49f85200433a7a5119bd9d56758a3033c2c0
-SHA512 (make-4.3.tar.gz) = 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
-Size (make-4.3.tar.gz) = 2317073 bytes
-SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe
-SHA1 (patch-src_hash.c) = 755de04a4f9a63f5bfc2520026344d6dc8654992
diff --git a/gmake/options.mk b/gmake/options.mk
deleted file mode 100644
index 835ce9fb2a..0000000000
--- a/gmake/options.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: options.mk,v 1.9 2020/03/14 13:28:57 tnn Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gmake
-PKG_SUPPORTED_OPTIONS=	nls
-PKG_SUGGESTED_OPTIONS=	nls
-
-PLIST_VARS+=		nls
-
-.include "../../mk/bsd.options.mk"
-
-# Build NLS support only if a native implementation of gettext is available
-# to avoid a circular dependency (gmake->gettext-tools->ncurses->gmake).
-.include "../../devel/gettext-lib/builtin.mk"
-.if !empty(PKG_OPTIONS:Mnls) && \
-    !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) && \
-    !empty(TOOLS_PLATFORM.msgfmt:U)
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt
-.  include "../../devel/gettext-lib/buildlink3.mk"
-PLIST.nls=		yes
-.else
-CONFIGURE_ARGS+=	--without-libintl-prefix
-CONFIGURE_ARGS+=	--without-libiconv-prefix
-CONFIGURE_ARGS+=	--disable-nls
-.endif
diff --git a/gmake/patches/patch-af b/gmake/patches/patch-af
deleted file mode 100644
index 103bf7bc35..0000000000
--- a/gmake/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.5 2014/10/12 14:58:27 wiz Exp $
-
-Make it clear that this is GNU make and not BSD make.
-
---- doc/make.info.orig	2014-10-05 16:25:47.000000000 +0000
-+++ doc/make.info
-@@ -24,8 +24,9 @@ Manual', for GNU 'make' version 4.1.
-      developing GNU and promoting software freedom."
- INFO-DIR-SECTION Software development
- START-INFO-DIR-ENTRY
--* Make: (make).            Remake files automatically.
-+* GNU Make: (make).            Remake files automatically.
- END-INFO-DIR-ENTRY
-+ 
- 
- 
- Indirect:
diff --git a/gmake/patches/patch-src_hash.c b/gmake/patches/patch-src_hash.c
deleted file mode 100644
index 600a3a6ac5..0000000000
--- a/gmake/patches/patch-src_hash.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_hash.c,v 1.2 2020/06/12 15:22:18 sevan Exp $
-
-PCC says: hash.c:326: error: Constant "4294967295" is out of range
-
---- src/hash.c.orig	2020-06-12 14:40:24.838680043 +0000
-+++ src/hash.c
-@@ -321,7 +321,7 @@ round_up_2 (unsigned long n)
-   n |= (n >> 8);
-   n |= (n >> 16);
- 
--#if !defined(HAVE_LIMITS_H) || ULONG_MAX > 4294967295
-+#if !defined(HAVE_LIMITS_H) || ULONG_MAX > 4294967295ul
-   /* We only need this on systems where unsigned long is >32 bits.  */
-   n |= (n >> 32);
- #endif


Home | Main Index | Thread Index | Old Index