Revert "Add py-firehose version 0.5."

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Revert "Add py-firehose version 0.5."
From: coypu <coypu%sdf.org@localhost>
Date: Fri, 13 Oct 2017 15:29:27 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Fri Oct 13 18:29:27 2017 +0300
Changeset:	c3b00e05a4029392bd4b79cea41b6dd0da97b6b6

Modified Files:
	firefox-hg/Makefile.common
Removed Files:
	py-firehose/DESCR
	py-firehose/Makefile
	py-firehose/PLIST
	py-firehose/distinfo

Log Message:
Revert "Add py-firehose version 0.5."

Changes unrelated file.

This reverts commit d8017a225885709b7ef3184795ab1f9a414bf9b5.

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

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

diffstat:
 firefox-hg/Makefile.common | 58 ++++++++++++++++++++++------------------------
 py-firehose/DESCR          |  9 -------
 py-firehose/Makefile       | 28 ----------------------
 py-firehose/PLIST          | 32 -------------------------
 py-firehose/distinfo       |  6 -----
 5 files changed, 28 insertions(+), 105 deletions(-)

diffs:
diff --git a/firefox-hg/Makefile.common b/firefox-hg/Makefile.common
index 48ca9bd9c7..21ea8c9786 100644
--- a/firefox-hg/Makefile.common
+++ b/firefox-hg/Makefile.common
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.307 2017/09/30 05:34:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
+#
+# used by wip/firefox-hg/Makefile
+# used by wip/firefox45-hg/Makefile
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH_MINOR=
@@ -6,45 +9,45 @@ MOZ_BRANCH_MINOR=
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 CATEGORIES=	www
-MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
 HG_REPOSITORIES=	mozilla
 HG_REPO.mozilla=	https://hg.mozilla.org/mozilla-central
 
-MAINTAINER=	ryoon%NetBSD.org@localhost
+MAINTAINER=	wiz%NetBSD.org@localhost
 HOMEPAGE=	http://www.mozilla.com/en-US/firefox/
 COMMENT=	Web browser with support for extensions (hg version)
 LICENSE=	mpl-1.1
 
+WRKSRC=		${WRKDIR}/mozilla
 MOZILLA_DIR=	# empty
 
-# Note: when updating remember to conditionalise about-background.png in PLIST
-CONFIGURE_ARGS+=	--enable-application=browser
+BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
 
-CFLAGS+=	-I${PREFIX}/include/nspr
+CONFIGURE_ARGS+=	--enable-application=browser
 
 # workround for link of libxul.so etc.
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox-${MOZ_BRANCH} ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=		-lm
 
-NOT_PAX_MPROTECT_SAFE+=	lib/firefox/firefox
-NOT_PAX_MPROTECT_SAFE+=	lib/firefox/firefox-bin
-NOT_PAX_MPROTECT_SAFE+=	lib/firefox/plugin-container
+PLIST_SUBST+=	VERSION=${MOZ_BRANCH}
+PRINT_PLIST_AWK+=	{ gsub(/${MOZ_BRANCH}/, "$${VERSION}") }
 
 ALL_ENV+=		MOZILLA_PKG_NAME=firefox
 
-# Avoid ld "invalid section index" errors.
-BUILDLINK_TRANSFORM.SunOS+=	rm:-fdata-sections
-BUILDLINK_TRANSFORM.SunOS+=	rm:-ffunction-sections
+FILESDIR=		${.CURDIR}/../../wip/firefox-hg/files
 
-SUBST_CLASSES+=			dfly_malloc_h
-SUBST_STAGE.dfly_malloc_h=	pre-configure
-SUBST_MESSAGE.dfly_malloc_h=	Dont include malloc.h on dragonflybsd
-SUBST_SED.dfly_malloc_h=	-e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
-SUBST_FILES.dfly_malloc_h=	media/libav/libavutil/mem.c
-SUBST_FILES.dfly_malloc_h+=	media/ffvpx/libavutil/mem.c
+.include "../../mk/bsd.prefs.mk"
+
+# Avoid ld "invalid section index" errors.
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+=	rm:-fdata-sections
+BUILDLINK_TRANSFORM+=	rm:-ffunction-sections
+.endif
+BUILDLINK_TRANSFORM+=	rm:-Werror
+BUILDLINK_TRANSFORM+=	rm:-Werror=[A-z0-9_-]*
 
 LDFLAGS.DragonFly=	-lplc4 -lnspr4
 LDFLAGS.FreeBSD=	-lplc4 -lnspr4
@@ -58,7 +61,7 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=	lib/firefox-${MOZ_BRANCH}/chrome/toolkit/content/global/buildconfig.html
 
 MOZILLA=firefox
 MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
@@ -68,20 +71,15 @@ MOZILLA_NAME=	Firefox
 MOZILLA_NAME=	Browser
 .endif
 
-SUBST_CLASSES+=		sys-dic
-SUBST_STAGE.sys-dic=	pre-configure
-SUBST_MESSAGE.sys-dic=	Reference to system hunspell dictionaries.
-SUBST_FILES.sys-dic=	extensions/spellcheck/hunspell/glue/mozHunspell.cpp
-SUBST_VARS.sys-dic=	PREFIX
-
-post-extract:
-	mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
+USE_TOOLS+=	autoconf213
 
 pre-configure:
+	cd ${WRKSRC} && mkdir ${OBJDIR}
 	cd ${WRKSRC} && autoconf
 	cd ${WRKSRC}/js/src && autoconf
-	cd ${WRKSRC} && mkdir ${OBJDIR}
-	cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
+# XXX Makefile is broken? When libxul is provided from devel/xulrunner,
+# XXX please remove this.
+	mkdir ${WRKSRC}/js/src/.deps
 
 post-build:
 	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
diff --git a/py-firehose/DESCR b/py-firehose/DESCR
deleted file mode 100644
index bb016aef30..0000000000
--- a/py-firehose/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-firehose is a Python package intended for managing the results
-from code analysis tools (e.g. compiler warnings, static analysis,
-linters, etc).
-
-It currently provides parsers for the output of gcc, clang-analyzer,
-cppcheck, and findbugs. These parsers convert the results into a
-common data model of Python objects, with methods for lossless
-roundtrips through a provided XML format. There is also a JSON
-equivalent.
diff --git a/py-firehose/Makefile b/py-firehose/Makefile
deleted file mode 100644
index 3873072eb2..0000000000
--- a/py-firehose/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2012/10/07 11:54:31 asau Exp $
-#
-
-DISTNAME=	firehose-0.5
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_PYPI:=f/firehose/}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/fedora-static-analysis/firehose
-COMMENT=	Library for managing code analysis tool output
-LICENSE=	gnu-lgpl-v2.1
-
-USE_LANGUAGES=		# none
-
-TEST_TARGET=	unittests
-
-DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-
-SUBST_CLASSES+=			python
-SUBST_STAGE.python=		pre-test
-SUBST_MESSAGE.python=		Fixing python binary for test
-SUBST_FILES.python=		Makefile
-SUBST_SED.python=		-e 's,python ,${PYTHONBIN} ,g'
-
-
-.include "../../lang/python/distutils.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-firehose/PLIST b/py-firehose/PLIST
deleted file mode 100644
index 305a87ea19..0000000000
--- a/py-firehose/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/firehose/__init__.py
-${PYSITELIB}/firehose/__init__.pyc
-${PYSITELIB}/firehose/__init__.pyo
-${PYSITELIB}/firehose/model.py
-${PYSITELIB}/firehose/model.pyc
-${PYSITELIB}/firehose/model.pyo
-${PYSITELIB}/firehose/parsers/__init__.py
-${PYSITELIB}/firehose/parsers/__init__.pyc
-${PYSITELIB}/firehose/parsers/__init__.pyo
-${PYSITELIB}/firehose/parsers/clanganalyzer.py
-${PYSITELIB}/firehose/parsers/clanganalyzer.pyc
-${PYSITELIB}/firehose/parsers/clanganalyzer.pyo
-${PYSITELIB}/firehose/parsers/cppcheck.py
-${PYSITELIB}/firehose/parsers/cppcheck.pyc
-${PYSITELIB}/firehose/parsers/cppcheck.pyo
-${PYSITELIB}/firehose/parsers/findbugs.py
-${PYSITELIB}/firehose/parsers/findbugs.pyc
-${PYSITELIB}/firehose/parsers/findbugs.pyo
-${PYSITELIB}/firehose/parsers/flawfinder.py
-${PYSITELIB}/firehose/parsers/flawfinder.pyc
-${PYSITELIB}/firehose/parsers/flawfinder.pyo
-${PYSITELIB}/firehose/parsers/frama_c.py
-${PYSITELIB}/firehose/parsers/frama_c.pyc
-${PYSITELIB}/firehose/parsers/frama_c.pyo
-${PYSITELIB}/firehose/parsers/gcc.py
-${PYSITELIB}/firehose/parsers/gcc.pyc
-${PYSITELIB}/firehose/parsers/gcc.pyo
-${PYSITELIB}/firehose/parsers/splint.py
-${PYSITELIB}/firehose/parsers/splint.pyc
-${PYSITELIB}/firehose/parsers/splint.pyo
diff --git a/py-firehose/distinfo b/py-firehose/distinfo
deleted file mode 100644
index e554ec7a82..0000000000
--- a/py-firehose/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/08/25 16:04:49 jihbed Exp $
-
-SHA1 (firehose-0.5.tar.gz) = 3d7110466a5e48d7ab0f32cff3c0eaf5d75eee63
-RMD160 (firehose-0.5.tar.gz) = 71bf4fc59af4c937219165f647743a6a275ce1e7
-SHA512 (firehose-0.5.tar.gz) = f19d0df1a607575edbc9a7e583b472a2217f7e9508853d8c2cf7a5d369e5da8bb1a2a6bf8fa301ac42312357e6542df453e9afa58f12ac07a38ffdc0dfdde9b8
-Size (firehose-0.5.tar.gz) = 57903 bytes
Prev by Date: Add py-firehose version 0.5.
Next by Date: Re-commit: Add py-firehose version 0.5.
Previous by Thread: Add py-firehose version 0.5.
Next by Thread: Re-commit: Add py-firehose version 0.5.
Indexes:
Home | Main Index | Thread Index | Old Index