Commit Graph

137 Commits

Author SHA1 Message Date
Stefan Eßer
819f25b36d */*: Remove redundant '-[0-9]*' from CONFLICTS
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".

Approved by:	portmgr (blanket)
2021-10-29 11:50:18 +02:00
Guido Falsi
bf677a321b sysutils/conky: update to 1.12.2 2021-04-25 18:15:14 +02:00
Guido Falsi
9b1daa854f sysutils/conky: Force linking against correct LUA
When multiple LUA versions are present conky could link against
version 5.3 but register dependency against version 5.2.

Try to force conky build system to actually link against the desired
version of the library.

Reported by:	Joachim Moskalewski <moskalewski@jmos.net>
2021-04-25 10:51:18 +02:00
Guido Falsi
140903310e sysutils/conky: Allow lua 5.3 too, it's supported.
Reported by:	Joachim Moskalewski <moskalewski@jmos.net>
2021-04-24 18:05:43 +02:00
Mathieu Arnold
305f148f48 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
Guido Falsi
cf2ffe1587 Update conky to 1.12.1 2021-03-02 21:51:47 +00:00
Guido Falsi
48193806f8 Fix conky build on head after commit a21def4d568f which removed the
wi driver.

The code actually depending on this include is already disabled by
#if 0, so there is no functional change.
2021-01-09 16:43:48 +00:00
Tobias C. Berner
9e0e8d17a4 Prefer graphics/ligvrsvg2-rust over graphics/librsvg2
- switch to the more modern version of librsvg2 on architectures
  supporting rust
- this will fix some graphical issues on these architectures

PR:		250276
Exp-run by:	antoine
Submitted by:	tobik
Differential Revision:	https://reviews.freebsd.org/D18878
2020-11-09 17:08:12 +00:00
Guido Falsi
e3f5ccd379 - Update conky to 1.11.6
- Remove patch now included upstream
2020-07-27 21:59:58 +00:00
Kyle Evans
5fb9edd6bd Multiple ports: improve regex compliance
These changes largely fall into just two categories:

1. Need textproc/gsed for GNU extensions
2. Extraneous escapes that can go away

For #1, there's a further subdivision into those that require autoconf magic
and those that can get away with BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed.
-CURRENT will soon gain GNU extensions, but these will take longer to get to
all supported releases; we must switch them to gsed to ensure we're actually
properly building them as intended.

For #2, I've fixed these as I can and we should upstream these fixes.

PORTREVISION is bumped for all of the above, because we will almost
certainly build these differently when the replacements actually start
working.

These were all detected by the below-referenced exp-run [1]. The patch
included forbids many ordinary characters from being escaped, since we'll
later imbue those with special meanings. This has had the nice side effect
of picking up various things that we didn't handle properly, e.g. \t and \r
for tab and carriage return.

PR:		229925 [1]
Approved by:	koobs (mentor)
Approved by:	portmgr (blanket: trivial build fixes)
MFH:		no (invasive risk)
Differential Revision:	https://reviews.freebsd.org/D25185
2020-06-08 04:41:31 +00:00
Guido Falsi
582887828f Fix if_mounted and if_running variables
PR:		243088
Submitted by:	Helge Oldach <freebsd@oldach.net>
Obtained from:	https://github.com/brndnmtthws/conky/pull/924
2020-01-09 14:16:30 +00:00
Niclas Zeising
ef5d45aaa6 Sprinkle more USES=xorg 2019-11-07 20:19:59 +00:00
Niclas Zeising
cc36f3229d Add USES=xorg and USES=gl
Add USES=xorg and USES=gl to a few remaining ports.
2019-11-07 18:41:56 +00:00
Guido Falsi
c8c7b9e2d2 Fix document generation.
PR:		240244
Submitted by:	James Stark <james.e.stark@gmail.com>
MFH:		2019Q3
2019-09-01 19:23:53 +00:00
Guido Falsi
f162cb237e Update conky to 1.11.5 2019-08-14 20:42:01 +00:00
Gerald Pfeifer
ea8c8ec7da Bump PORTREVISION for ports depending on the canonical version of GCC
as defined in Mk/bsd.default-versions.mk which has moved from GCC 8.3
to GCC 9.1 under most circumstances now after revision 507371.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, everything INDEX-11 shows with a dependency on lang/gcc9 now.

PR:		238330
2019-07-26 20:46:53 +00:00
Guido Falsi
3c6f0f20aa Update conky to 1.11.4 2019-06-25 07:59:08 +00:00
Guido Falsi
4e42a5c321 - Allow building with lua 5.2
- Make LUA_CAIRO option default to on

Suggested by: lme
2019-04-21 22:46:35 +00:00
Mark Linimon
96b29de686 Fix build on non-x86 archs by disabling apm.
Approved by:	portmgr (tier-2 blanket)
2019-03-08 02:15:50 +00:00
Guido Falsi
9c6511d652 - Upgrade conky to 1.11.3
- Remove patches included upstream
2019-02-24 11:33:32 +00:00
Guido Falsi
018b32447e Import upstream patch in conky.
Obtained from:	298eb76434
		1fc2b17eb5
2019-01-14 13:51:48 +00:00
Guido Falsi
61fcfeb1fe Update conky to 1.11.2
New version uses an embedded version of toloa++ and drops support
for lua 5.1
2019-01-11 19:46:22 +00:00
Guido Falsi
9ddf0e55f6 - Update conky to 1.11.1
- Silence some portlint warnings
2019-01-07 23:27:11 +00:00
Gerald Pfeifer
a9f015d155 Bump PORTREVISION for ports depending on the canonical version of GCC
defined via Mk/bsd.default-versions.mk which has moved from GCC 7.4 t
GCC 8.2 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, as a double check, everything INDEX-11 showed depending on lang/gcc7.

PR:		231590
2018-12-12 01:35:33 +00:00
Guido Falsi
f12326e43d Fix build with GCC-based architectures.
Fix changes the name of a variable to avoid clash with a function
name defined in an include file used by GCC.

PR:		233616
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
2018-11-29 10:33:29 +00:00
Gerald Pfeifer
09f9633cb6 Bump PORTREVISION for ports depending on the canonical version of GCC
in the ports tree (via Mk/bsd.default-versions.mk and lang/gcc) which
has now moved from GCC 6 to GCC 7 by default.

This includes ports
 - featuring USE_GCC=yes or USE_GCC=any,
 - featuring USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and those
 - with USES=compiler specifying one of openmp, nestedfct, c11, c++0x,
   c++11-lib, c++11-lang, c++14-lang, c++17-lang, or gcc-c++11-lib.

PR:		222542
2018-07-29 22:18:44 +00:00
Guido Falsi
803c148097 Import upstream patch to fix OSS (sound mixer) support.
While here, fix malformed line in patch causing build time warning.

Reported by:	pong (via IRC)
Obtained from:	6b386589c0
2018-03-24 09:15:14 +00:00
Guido Falsi
b587ce3502 - Update conky to 1.10.8
- Remove local patch included upstream
2018-02-09 20:25:35 +00:00
Guido Falsi
d65f901d22 Import upstream patch to fix runtime crash.
PR:		225523
Submitted by:	Hatronmorus <ebirth@b0ss.net>
Obtained from:	562c737588
2018-01-31 12:46:44 +00:00
Guido Falsi
a6ea9f53bd Update conky to 1.10.7 2018-01-22 19:19:58 +00:00
Jimmy Olgeni
e929aea23c Fix whitespace issues (mixed tab/spaces, alignment) in a few ports.
This round is @FreeBSD.org residents except teams.
2017-11-02 21:41:47 +00:00
Gerald Pfeifer
e59c88cece Bump PORTREVISION for ports depending on the canonical version of GCC
(via Mk/bsd.default-versions.mk and lang/gcc) which has moved from
GCC 5.4 to GCC 6.4 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++11-lang,
   c++14-lang, c++0x, c11, or gcc-c++11-lib.

PR:		219275
2017-09-10 20:55:38 +00:00
Tobias C. Berner
5e373eaa92 Make ninja opt-out in cmake.mk
Using ninja instead of make (1) can lead to significant speed ups while building.
Therefore switch from having the ninja generator opt-in to having it opt-out.

Previously cmake-ports that wanted to use ninja could set
    CMAKE_NINJA=yes
now, ports that do not work with ninja can set
    cmake:<existing args>,noninja
Note, that needing this should be an exception and most often points to a broken
cmake of the port.

The ports using cmake were modified
* removed USES=gmake, if ninja is used
* removed MAKE_ARGS, if ninja is used
* added the cmake-argument noninja if necessary

PR:		219629
PR:		213331
Exp-run by:	antoine
Reviewed by:	rakuco
Differential Revision:	https://reviews.freebsd.org/D10748
2017-06-25 21:07:58 +00:00
Matthew Rezny
b760897dde Revision bump of all ports with USE_GL after consolidation of mesa-libs
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D10845
2017-05-23 05:03:14 +00:00
Gerald Pfeifer
04d6f52202 Bump PORTREVISIONs for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.9.4 to GCC 5.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using using Mk/bsd.octave.mk which in turn has USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++14-lang,
   c++11-lang, c++0x, c11, or gcc-c++11-lib.

PR:		216707
2017-04-01 15:23:30 +00:00
Mark Linimon
bda391284d Attempt to fix build on tier-2 archs.
Tested on:	armv6
Submitted by:	madpilot (maintainer)
2017-01-04 20:51:46 +00:00
Guido Falsi
1760f8c459 - Update conky to 1.10.6
- Remove patch submitted upstream
2016-12-12 09:58:04 +00:00
Guido Falsi
c936cbeb05 Make conky try to get CPU temperature from more than just one sysctl.
PR:		210235
Submitted by:	walter@pelissero.de
2016-10-04 20:07:15 +00:00
Guido Falsi
0062c5be04 - Update to 1.10.5
- Remove patches which have been accepted upstream
2016-10-04 12:44:05 +00:00
Guido Falsi
9068a4d4e9 Fix build by enforcing METAR option when XOAP option is enabled.
Reported by:	pilot513 at gmail.com (via email)
MFH:		2016Q4
2016-10-04 12:42:26 +00:00
Guido Falsi
06f384f7c3 Fix ${top name} configuration variable output.
Reported by:	Szabolcs Grof <grof.szabolcs at gmail.com>
		(via email, with patch)
2016-09-29 15:57:40 +00:00
Guido Falsi
3959554568 Add dependency on libinotify and fix build when it is present.
Reported by:    Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
		(via email)
2016-09-29 14:31:29 +00:00
Guido Falsi
6758118b3d - Update conky and conky-awesome to 1.10.4
- Take maintainership [1]
- Options adapted to new version
- Removed LUA option since it's a mandatoory requirement now
- Use project own install target
- Fix installation of lua helper libraries
- Project moved to github
- in conky-awesome, properly use OPTIONS_EXCLUDE

PR:		212629
Submitted by:	me
Approved by:	ntarmos@ceid.upatras.gr (former maintainer) [1]
2016-09-28 16:55:38 +00:00
Pawel Pekala
a085713ccb Fix typo 2016-07-26 18:57:23 +00:00
Pawel Pekala
5d669867ea - Add explicit IMPLIES between dependencies and simplify option handling [1]
- Convert to USES=localbase
- Switch some options helpers from LIB_DEPENDS to USE=xorg and USE=gnome

PR:		210414 [1] (based on)
Submitted by:	elferdo@gmail.com
Approved by:	maintainer timeout
2016-07-26 18:40:20 +00:00
Mathieu Arnold
f899c758a6 When there is a do-install target, do not use a post-install target, do
everything at once.  Sometime, rename post-install into a options helper
target.

I did not fix ports that were such a mess that I could not figure out
what they really wanted to do.  I also did not change ports that had
some version of an auto-plist code in post-install, for the same reason.

With hat:	portmgr
Sponsored by:	Absolight
2016-07-19 11:04:13 +00:00
Lars Engels
dd9a35fb2d - Fix battery percentage calculation and add support for ${battery_short} and ${battery_bar} [1]
- Remove a bogus __FreeBSD_kernel__ check in freebsd.c
- Re-gen patches with "make makepatch"
- Bump PORTREVISION

PR:		208651 [1]
Submitted by:	Helge Oldach <freebsd@oldach.net>
Approved by:	maintainer timeout (17 days)
MFH:		2016Q2
2016-04-26 11:32:20 +00:00
Mathieu Arnold
597afc47ba Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:25:16 +00:00
Dmitry Marakasov
c05b88bf46 - Fix build with LUA_CAIRO or LUA_IMLIB2 enabled
PR:		204778
Submitted by:	walkerd@pamandduncan.co.uk
Approved by:	portmgr blanket
MFH:		2015Q4 (blanket)
2015-12-02 15:45:19 +00:00
Dmitry Marakasov
ca9de59c1c - Add CPE info
Approved by:	portmgr blanket
2015-04-24 22:02:31 +00:00