Commit graph

98 commits

Author SHA1 Message Date
Stefan Eßer
bcaf25a8c8 Fix CONFLICTS entries of multiple ports
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)
2022-01-10 16:15:39 +01:00
Mathieu Arnold
305f148f48
Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
Nuno Teixeira
fb1d3219bf benchmarks/iozone: Adopt port
Approved by:	dbaio (mentor)
Differential Revision:	https://reviews.freebsd.org/D29229
2021-03-12 15:45:03 +00:00
Alexander Nedotsukov
a3d941d14c Hook distro cleanup on pre-build to ensure gmake availabilty
Reported by:	Giacomo Olgeni
2021-03-11 20:10:10 +00:00
Alexander Nedotsukov
600cccd14f Update to 3_491 2021-03-11 16:53:34 +00:00
Josh Paetzel
b1473087d5 deorbit jpaetzel 2021-03-02 00:51:54 +00:00
Josh Paetzel
bc79d9a6f9 Fix build in a -fno-common world 2020-08-23 23:49:36 +00:00
Josh Paetzel
b0357cb0a4 Update to vesion 3.487
This catches up to the current released version.
3.485 introduced a build break on FreeBSD which
was fixed in 3.486.  3.487 was released a few days
after 3.486.

The changes in these new releases are all related
to bulding on Android.  FreeBSD is just chasing them
to avoid a large chasm.
2019-01-21 21:22:56 +00:00
Josh Paetzel
daef5d7244 Update to 3.484
Bugfix using the -H option. (POSIX async I/O)
2018-10-17 16:35:30 +00:00
Josh Paetzel
f31b20d7fd Update to 3.482 2018-10-08 02:49:46 +00:00
Josh Paetzel
5372e5eb82 Update to latest version
Incorporates port patches
Fixes type warnings on 32 bit and 64 bit with clang
Should fix iozone on some of the more "esoteric" arches

PR:	211289
Sponsored by:	iXsystems
2016-07-28 14:40:45 +00:00
Josh Paetzel
eb38a46453 Unbreak on 32bit FreeBSD
PR:	211289
Sponsored by:	iXsystems
Pointyhat:	jpaetzel
Cluebat:	jhb
2016-07-23 17:06:53 +00:00
Josh Paetzel
f0c5c928bf Update iozone to build on HEAD and take maintainership
Sponsored by:	iXsystems
2016-07-20 15:36:05 +00:00
Mikhail Teterin
6d1c754742 Fix a problem with the new patch. It is a no-op on FreeBSD,
but it prevented compillation on 32-bit Linux. This is the
version the author has just incorporated into his source.
2016-06-22 21:54:12 +00:00
Mikhail Teterin
ed2121c67d Ensure clean build with clang on both amd64 and i386. Respect the
SSH-option turned off (rsh was replaced with ssh unconditionally).

PR:		210449
2016-06-22 17:30:57 +00:00
Baptiste Daroussin
9437eb8fc4 Use DISTVERSION instead of crafting the version to get the distname
Prefer USES to set the extract suffix
2016-06-17 13:17:48 +00:00
Baptiste Daroussin
20db30b16a Update to 3.434
Sponsored by:	Gandi.net
2016-06-17 13:13:21 +00:00
Mathieu Arnold
bb271f0bf7 Convert ports to use the options helpers in categories [abc]*, and minor fixes.
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3412?
2015-08-19 13:29:59 +00:00
John Marino
28ca5b96a2 5 ports categories: Remove $PTHREAD_LIBS
Categories: irc, x11-clocks, benchmarks, misc, textproc

approved by:	PTHREAD blanket
2015-03-24 17:09:58 +00:00
Wen Heping
4275d15ea4 - Reset maintainer to ports@
Submitted by:	chifeng@gmail.com(previous maintainer, via email)
2014-08-10 13:04:34 +00:00
Emanuel Haupt
2cbbf70e4b Support staging 2014-02-09 09:13:02 +00:00
Baptiste Daroussin
5ed86f75a6 Fix pkg name collision 2014-01-04 00:48:30 +00:00
Baptiste Daroussin
0f0eb50c1e Add NO_STAGE all over the place in preparation for the staging support (cat: benchmarks) 2013-09-20 15:52:44 +00:00
Jason Helfman
c184a462da - update to 3.420
PR:		182111
Submitted by:	cmt@burggraben.net
Approved by:	chifeng@gmail.com ( maintainer )
2013-09-20 06:23:33 +00:00
Jason E. Hale
735f2f97ad - Convert to new options framework
- Trim Makefile header

While here:
- Whitespace alignment
- Respect MANPREFIX
- Remove STRIP_CMD as this is done by INSTALL_PROGRAM
- Merge duplicate post-patch targets into one

PR:		ports/173548
Submitted by:	Edward <is.a.relay@gmail.com>
Approved by:	maintainer
Feature safe:	yes
2012-11-13 23:17:48 +00:00
Ruslan Makhmatkhanov
83bc131ec1 - add couple of patches to fix build warnings
- do not bumping PORTREVISION, because it's non-functional change

PR:     167943
Submitted by:	Garrett Cooper <yanegomi at gmail dot com>
Approved by:	chifeng <chifeng at gmail dot com> (maintainer)
2012-06-19 17:43:25 +00:00
Martin Wilke
85a323461c - Respect CC & ALL_TARGET
PR:		163086
Submitted by:	Jan Beich <jbeich@tormail.net>
Approved by:	maintainer
2012-01-14 19:11:38 +00:00
Martin Wilke
3892b42f86 - Update to 3.397
PR:		162636
Submitted by:	Chifeng Qu <chifeng@gmail.com> (maintainer)
Feature safe:	yes
2011-11-19 15:15:10 +00:00
Dmitry Marakasov
6f6fbe4bdf - Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:		157936
Submitted by:	myself
Exp-runs by:	pav
Approved by:	pav
2011-09-23 22:26:39 +00:00
Frederic Culot
185bcb3fb6 - Update to 3.370
PR:		ports/153330
Submitted by:	Hsin-Han You <hhyou at cs.nctu.edu.tw>
Approved by:	sahil@/wen@ (mentors, implicit), Chifeng Qu <chifeng at gmail.com> (maintainer)
2010-12-22 18:10:11 +00:00
Sylvio Cesar Teixeira
e9a34523de - Update to 3.347
PR:		ports/145418
Submitted by:	Chifeng Qu <chifeng@gmail.com> (maintainer)
Approved by:	itetcu (mentor, implicit)
2010-04-08 00:12:29 +00:00
Wen Heping
1044a58743 - Update to 3.327
PR:		ports/142372
Submitted by:	Chifeng Qu <chifeng@gmail.com> (maintainer)
2010-01-06 12:39:18 +00:00
Pav Lucistnik
2d68f126de - Mark MAKE_JOBS_UNSAFE
Reported by:	pointyhat
2009-11-19 23:41:55 +00:00
Philippe Audeoud
f1f00a26d4 - Update to 3.326
PR:		ports/136240
Submitted by:	Chifeng Qu <chifeng gmail.com> (maintainer)
2009-07-02 07:37:09 +00:00
Philippe Audeoud
fcdcef9846 - Update to 3.319
PR:		ports/131772
Submitted by:	Chifeng Qu <chifeng at gmail.com>
2009-02-17 10:08:13 +00:00
Thomas Abthorpe
777bf0b92e - Pass maintainership to submitter
Submitted by:	chifeng via freebsd-ports@
2009-02-17 02:56:31 +00:00
Mark Linimon
a34ad4f459 Reset jmz@FreeBSD.org due to no response to email about maintainer-timeout,
and no commit activity for 3 months.

Hat:	portmgr
2008-11-29 00:11:56 +00:00
Xin LI
aa91c1e543 Actually make WITH_SSH conditional.
Pointed out by:	sat
Pointy hat to:	delphij
2007-06-15 09:14:26 +00:00
Xin LI
c84165d51d Add an option to use ssh instead of rsh in distributed measurement.
PR:		ports/113048
Submitted by:	CHAO Shin <quakelee cn.FreeBSD.org>
Approved by:	maintainer timeout
2007-06-15 08:11:40 +00:00
Xin LI
9441422186 Update to 3.283.
PR:		ports/111937
Submitted by:	CHAO Shin <quakelee cn freebsd org>
Approved by:	maintainer timeout (1 month)
2007-05-26 03:16:04 +00:00
Erwin Lansing
0fa7ab17b8 Update to 3.267
PR:		105413
Submitted by:	"Marcelo Araujo" <araujo@bsdmail.org>
Approved by:	maintainer timeout
2007-01-11 21:37:26 +00:00
Jean-Marc Zucconi
2349ad06f4 Upgrade to version 3.263
PR:		ports/95786
Submitted by:	Jeffrey H. Johnson <CPE1704TKS@bellsouth.net>
2006-04-15 17:07:30 +00:00
Jean-Marc Zucconi
eb8e70347a Use the right fix (PTHREAD_LIBS) to build on all OS versions.
Eagle eyes: 	kris
2006-02-10 10:12:29 +00:00
Jean-Marc Zucconi
7fb1f0eb81 Build fix for 4.x: don't use pthreads 2006-02-09 21:58:12 +00:00
Jean-Marc Zucconi
0a32fe2c07 - Update to 3.259
- Honor build environment CC and CFLAGS
- OPTIONS to support threading using pthreads

PR:		ports/92714
Submitted by:	Jeffrey H. Johnson <CPE1704TKS@bellsouth.net>
2006-02-02 10:02:57 +00:00
Edwin Groothuis
acd87b4ad8 SHA256ify
Approved by:    krion@
2006-01-22 08:34:46 +00:00
Jean-Marc Zucconi
75e6932cd9 Upgrade to version 3.248
PR:		/ports/87580
Submitted by:	Jean Milanez Melo <jmelo@freebsdbrasil.com.br>
2005-10-24 11:22:13 +00:00
Trevor Johnson
e1177f5c54 Add size data.
Approved by:	maintainers
2004-03-18 02:27:55 +00:00
Trevor Johnson
a049dd78cc Use PLIST_FILES (bento-tested, marcus-reviewed). 2004-02-06 13:12:53 +00:00
Kirill Ponomarev
a40aa1591b - Add CONFLICTS, because of the same item in pkg-plist
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>
2003-10-11 14:47:27 +00:00