Commit graph

718 commits

Author SHA1 Message Date
Baptiste Daroussin
633eef1b21 Allow make config to run if description is empty 2012-05-31 07:35:44 +00:00
Baptiste Daroussin
b5ddd364f1 Stop spawning dialog inside its own sh process
This allow us to use normal make quoting when preparing the command line for the
make config dialog
2012-05-31 05:04:04 +00:00
Baptiste Daroussin
8fce177a10 Show nothing if no options are defined as it used to be before optionsng 2012-05-30 21:02:49 +00:00
Baptiste Daroussin
738eb15d73 No more need to use double for comments containing parenthesis or simple quotes
while here, fix make config dialog ui with parenthesis and simple quotes on
single or multi options [1]

Reported by:	Bryan Drewery (via #bsdports) [1]
2012-05-30 20:50:05 +00:00
Baptiste Daroussin
9ac596012f Do not leave orphan /tmp/portoptions.* files
PR:		ports/168475
Submitted by:	Bryan Drewery <bryan@shatow.net>
2012-05-30 19:04:55 +00:00
Baptiste Daroussin
62bf63ad3f Hide 'cd port && make config' command in 'config-conditional' target
PR:		ports/168453
Submitted by:	Bryan Drewery <bryan@shatow.net>
2012-05-30 09:55:54 +00:00
Baptiste Daroussin
45a1b5ac79 Fix make config when cancel is hit
Reported by:	ketas (via #bsdports)
2012-05-29 16:55:02 +00:00
Baptiste Daroussin
ef49eaca32 Do not spam stdout with dialog command line 2012-05-29 14:25:13 +00:00
Baptiste Daroussin
93428f6af3 Do not print an empty line after description for multi and single options in make showconfig 2012-05-29 14:05:35 +00:00
Baptiste Daroussin
4ab2fee309 Fix python's make config [1]
Better backward compatibility [2]

Reported by:	ketas (on #bsdports) [1], flo@ [2]
Tested by:	flo@ [2]
2012-05-29 13:30:56 +00:00
Baptiste Daroussin
793bb3f35b fix make config with no "basic options" but only single or multi 2012-05-29 10:50:11 +00:00
Baptiste Daroussin
c263127442 New options framework for the ports
for maintainers:
it introduces 3 different types of options: simple, multi and single:
- simple options are the same as the current options (i.e. on or off.)
- multi options are options where at least one must be set (1-N).
- single options are options where one and only one must be set (exclusive
  options).

for users:
- OPTIONS_SET: globally enable some options
- OPTIONS_UNSET: globally disable some options
- ${UNIQUENAME}_SET: enable per-port choice of options
- ${UNIQUENAME}_UNSET: disable per-port choice of options

For compatibility the old OPTIONS framework is now working on top of the new one
The options previously set with old OPTIONS are imported and converted
transparently.

A new knob NO_DIALOG if defined in the the config-conditional target is ignored
(prevent the dialog(1) ui to show up.

Thanks to all people involved:
beat@, crees@, Bryan Drewery, linimon@, novel@ and others, for testing, comments, patches
2012-05-29 09:54:27 +00:00
Martin Wilke
189a4c9099 - Add USE_QT4 to include bsd.qt.mk
PR:		165952
Submitted by:	avilla@
Tested by:	phw
2012-05-24 07:11:41 +00:00
Martin Wilke
61d8acdb49 - Remove emacs mode, -*- mode: ...; -*- [1]
- Comments for BUILD_ and RUN_DEPENDS fail to mention alternate means to specify dependencie [2]
- Fix make reinstall [3]
- Trivial comment change for PORTDATA [4]

PR:		151954 [1]
		161314 [2]
		167085 [3]
		167465 [4]
Submitted by:	Anonymous <swell.k@gmail.com> [1]
		dougb@ and Chris Rees <utisoft@gmail.com> [2]
		Garrett Cooper <yanegomi@gmail.com> [3]
		"Bryan Drewery" <bryan@shatow.net> [4]
Tested via:	phw
2012-05-23 08:17:49 +00:00
Baptiste Daroussin
ca211b18b4 No port installs catpages anymore, let's remove ugly code that tries to magically
figure out if any catpage is installed, now if a port want to install a catpage
it would need to cleanly track it.

With hat:	portmgr
2012-05-20 00:12:46 +00:00
Ryan Steinmetz
e3c28599f4 - Update language used in portaudit message. (cosmetic change)
Approved by:	portmgr (tabthorpe)
Feature safe:	yes
2012-03-13 08:14:45 +00:00
Simon L. B. Nielsen
4d22b6af09 Make bsd.port.mk not parse port audit's auditfile directly to
check for vulnerabilities, but call portaudit instead.

This fixes a remote command execution vulnerability for users who have
portaudit installed.

While changing the code anyway, remove the annoying and very verbose
"Vulnerability check disabled, database not found" warning.

Security:	Remote code execution
Security:	http://vuxml.FreeBSD.org/6d329b64-6bbb-11e1-9166-001e4f0fb9b1.html
Approved by:	portmgr
Feature safe:	yes (or at least approved)
With hat:	so
2012-03-11 21:30:49 +00:00
Baptiste Daroussin
7d51693e8c - only include bsd.pkgng.mk once [1]
- only read bsd.pkgng.mk in post.mk [1]
- move the command definition to bsd.command.mk [1]
- fix check-vulnerable [2]

Submitted by:	avilla [1], rene [2]
2012-02-22 17:34:47 +00:00
Baptiste Daroussin
7654d2a185 Fix a regression in the default target chain introduced when pushing the new pkg-depends target.
Now check-sanity and all depending targets are called again

With hat:	portmgr
2012-02-02 07:21:14 +00:00
Baptiste Daroussin
df0aa973b9 Please welcome pkgng beta1.
if you want to use it please define WITH_PKGNG=yes in your /etc/make.conf
For more information read the announcement on the mailing list

With hat:		portmgr
Non-Regression test:	linimon
2012-01-30 12:39:14 +00:00
Beat Gaetzi
688fdbc2d0 - Apply FreeBSD 10.x workaround on WRKDIR instead of WRKSRC as some ports
provide their configure script outside of WRKSRC.
- Print out all files on which the autotools fix was applied.

Exp-runs by:	miwi
2012-01-22 15:41:33 +00:00
Pav Lucistnik
5a084f8451 - Fix check-already-installed target: comm expects the input to be sorted
PR:		ports/161287
Submitted by:	mandree, nox (used nox's version)
2012-01-15 22:13:42 +00:00
Eitan Adler
984a7b16f9 R.I.P X11BASE
Approved by:	portmgr (pav)
2012-01-13 02:17:01 +00:00
Pav Lucistnik
7eca957720 - Remove unused definition of MD5
PR:		ports/163282
Submitted by:	rene
2012-01-12 22:20:32 +00:00
Martin Wilke
93a599d772 - Make WITH_FBSD10_FIX globally
- Add a new flag WITHOUT_FBSD10_FIX for maintainer testing

Some additional notes:
We are planing to make 10 exp-run after the 9.0 Release within 2 weeks to poke maintainers
and upstream as to ensure that for the 10.0 Release, everything is fixed and we can remove
the current workaround.

Submitted by:	bf@, rea@ (based on)
Thanks to:	beat, kwm, dough
Reviewed by:	erwin
Tested via PH:	2x exp-run
Approved by:	portmgr (myself)
2011-11-09 08:53:12 +00:00
Pav Lucistnik
c357454726 - Fix typo: PKG_NAME should have been PKGNAME
PR:		ports/161495
Submitted by:	lwhsu
2011-11-07 12:44:42 +00:00
Erwin Lansing
1beda15b17 Add a workaround for ports that don't recognize FreeBSD 10.x or newer.
Ports that need this can set WITH_FBSD10_FIX to apply the hack, but
only on FreeBSD 10.  This is only a temporary workaround as the real fix
lies upstream by fixing the included scripts, but this will take a
long time.

Submitted by:	ed, jilles, stas, beat (and more)
Tested on:	pointyhat i386-9-exp and i386-10
2011-10-27 09:46:25 +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
Baptiste Daroussin
7626bb39cb Simplify USERS/GROUPS management, use groupmod instead of usermod to append user to a group
This fix group management

PR:		ports/159577
Submitted by:	sahil
Reviewed by:	flz
Exp-run:	bapt
Approved by:	portmgr (flz)
2011-09-09 08:10:29 +00:00
Sunpoet Po-Chuan Hsieh
62896e4934 - Revert accidental commit 2011-09-04 17:35:07 +00:00
Sunpoet Po-Chuan Hsieh
65e103c48f - Remove ftp.net.ohio-state.edu
PR:		ports/160311
Submitted by:	Anton Shterenlikht <mexas@bristol.ac.uk>
2011-09-04 17:31:01 +00:00
Mark Linimon
dd83a86446 Refactor the perl parts of bsd.port.mk to live in bsd.perl.mk. This never
got finished correctly in the first place.

Note that this reverts two things in gabor's original bsd.perl.mk rewrite
that were never actually used/tested:

 - ability of USE_PERL5 and other variables to specify a version.

 - conditional inclusion of bsd.perl.mk based on USE_PERL5 or similar.

What this commit does is to make bsd.perl.mk be _exactly_ the current
code from bsd.port.mk (modulo a few comments).

Work to test the former would be welcome.  The problem with the latter
is that multiple attempts over the last N years to test it inevitably
showed INDEX breakage.  My own conclusion is that that simply makes the
tree too fragile (and is the reason I kept putting off working on it in
the first place).  Others will disagree.

Hopefully this change will make the perl-specific bits in bsd.*.mk easier
to maintain.

While here, fix a bogus comment (CCFLAGS).

Adding to pointy hat collection:	linimon
2011-08-12 16:39:23 +00:00
Mark Linimon
d423cdc650 - fix problem with metadata on tier-2 machines for Pascal ports. The
reason is that bsd.fpc.mk was only defining PPNAME for i386 and amd64.
   Provide a placeholder and proper IGNORE for tier-2 [1]

 - remove obsolete check for /usr/share/mk/bsd.port.options.mk [2]

 - add USE_DRUPAL for easy include of Mk/bsd.drupal.mk [3]

PR:		ports/155017 [2],
		ports/159288 [3]
Submitted by:	linimon (discussed with acm),
		eadler,
		crees
2011-08-12 16:10:02 +00:00
Baptiste Daroussin
a9a18a9577 removed unused __softMAKEFLAGS [0]
remove old security check code [1]

PR:		ports/156077 [1], ports/158956 [0]
Submitted by:	Eitan Adler <lists@eitanadler.com> [1], bapt@ (myself) [0]
Tested on:	pointyhat-west
With hat:	portmgr
2011-07-21 15:10:46 +00:00
Mark Linimon
2e12896268 Fix INDEXFILE for upcoming 10.0 branch.
PR:		ports/158750
Submitted by:	crees
Tested on:	pointyhat-west
2011-07-21 05:04:39 +00:00
Pav Lucistnik
49f1482237 - Unbreak fetch-urlall-list target when DIST_SUBDIR contains forward slashes
PR:		ports/158203
Submitted by:	Mamoru Sakaue <sakaue.mamoru-cmfho5lt@samurai.mwghennn.net>
2011-07-15 08:26:30 +00:00
Erwin Lansing
0f54071016 Update perl to 5.12.4
Changes:	http://search.cpan.org/~lbrocard/perl-5.12.4/pod/perl5124delta.pod

Submitted by:	skv
Tested on:	pointyhat
2011-07-03 15:51:18 +00:00
Baptiste Daroussin
3904f96634 Fix fetch-urlall-list
Reported by:	amdmi3@ (by mail)
Approved by:	portmgr@ (bapt@, self)
2011-06-09 08:22:45 +00:00
Hiroki Sato
cee3955026 - Add print/ghostscript9-nox11.
- Add "9" to USE_GHOSTSCRIPT_* variables and upgrade the default version to it.
2011-06-07 14:22:23 +00:00
Baptiste Daroussin
76eebf07a6 - remove some old code (unsused on supported OS) [1]
- prevent some useless external program call (based on [2])
- simplify (in)valid category detection

PR:		ports/155629 [1],  ports/65804 [2], ports/157273 [3]
Submitted by:	Eitan Adler <lists@eitanadler.com> [1], green@ [2], bapt@ (myself) [2]
Exp-runs by:	pav@
2011-06-06 05:53:51 +00:00
Sergey Skvortsov
b9716b9857 Introduce Perl 5.14.0
Changes:	http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod
2011-05-17 19:30:03 +00:00
Sergey Skvortsov
2879ba6109 Change default Perl version to 5.12. 2011-05-06 06:20:12 +00:00
Florent Thoumie
c406a95c53 Latest round of infrastructure changes.
- bsd.port.mk: add INDEX_PORTS, to support INDEX creation for a subset of the ports tree [1]
- bsd.port.mk: call target "install-rc-script" before "post-install" [2]
- [patch] ports/Mk bsd.port.mk order if groups/users are created by package [3]
- [bsd.port.mk] [patch] reaper of the dead: md5 has been in /sbin for a while [4]
- [bsd.port.mk] [patch] remove support for pre 7.x systems (b.*.m) [5]
- [patch] [bsd.port.mk] reaper of the dead: are three variable defintions needed [6]

PR:		ports/156575 [1],
		ports/139116 [2],
		ports/152498 [3],
		ports/155983 [4],
		ports/155510 [5],
		ports/156340 [6]
Submitted by:	Florent Thoumie <flz@xbsd.org> [1],
		Sergey Skvortsov <skv@freebsd.org> [2],
		Olli Hauer <ohauer@FreeBSD.org> [3],
		Eitan Adler <lists@eitanadler.com> [4],
		Eitan Adler <lists@eitanadler.com> [5],
		Eitan Adler <lists@eitanadler.com> [6]
2011-05-04 22:33:13 +00:00
Max Brazhnikov
314168b9be Update open-motif to 2.3.3
Remove needles patches (integrated upstream)
Pass maintainership to submitter

PR:		ports/154044
Submitted by:	Mikhail Tsatsenko <m.tsatsenko at gmail.com>
Exp-runs by:	pav
2011-05-02 12:40:24 +00:00
Olli Hauer
aaa59c1b11 Mk/bsd.apache.mk was rewritten with a new logic and some new parameters
to support future apache versions and the transition to apache22.

  Existing and new USE_APACHE* parameters:

  USE_APACHE         set apache and apxs as build and run dependency
  USE_APACHE_BUILD   set apache and apxs as build dependency
  USE_APACHE_RUN     set apache and apxs as run dependency

  The following example is representative of all three possible parameters to use:

  USE_APACHE= 22     specify exact version
  USE_APACHE= 1.3+   specify [min] version, no [max] version
  USE_APACHE= 13-22  specify [min]-[max] range
  USE_APACHE= -2.2   specify [max] version, no [min] version

  Values can be specified with and without "." (dot) between major and minor
  version numbers. For example 22 is equal to 2.2

  For documentation and full changelist please take a look into
  Mk/bsd.apache.mk or http://wiki.freebsd.org/bsd.apache.mk

  Commit with hat apache@

PR:		ports/156533
Submitted by:	ohauer
2011-04-24 15:37:53 +00:00
Baptiste Daroussin
8d27ddb9bd Add a new macro to deal with conflict between ncurses from base and ncurses from ports.
If a ports is linked against ncurses from base or from the ports, it should then add:
USE_NCURSES=yes

it is also possible to specify the hard dependency on the ports ncurses or one the base one adding the following macros:
WITH_NCURSES_PORT=yes or WITH_NCURSES_BASE=yes

PR:		ports/155269
Submitted by:	me
Reviwed by:	pav@
Approved by:	portmgr (pav@)
Exp-run by:	portmgr (pav@)
2011-04-11 08:34:17 +00:00
Thomas Abthorpe
87f78ba5a9 - Disable license checking with DISABLE_LICENSES [1]
- Remove temp files from /tmp when build is interrupted [2]

PR:		ports/149837 [1], ports/155890 [2]
2011-03-31 03:37:14 +00:00
Pav Lucistnik
a3c0bb0134 - Use ${UID} instead of calling ${ID} -u
PR:		ports/155543
Submitted by:	Eitan Adler <lists@eitanadler.com>
2011-03-19 21:30:34 +00:00
Martin Wilke
ab44c29293 - Fix spelling
PR:		ports/155195
Submitted by:	Warren Block <wblock@wonkity.com>

- Remove sanity check for X_WINDOW_SYSTEM
- Remove check for USE_XPM
PR:		ports/155502 ports/155504
Submitted by:	Eitan Adler <lists@eitanadler.com>
2011-03-18 01:43:49 +00:00
Erwin Lansing
d5c7de2d68 Pass CPPFLAGS to MAKE_ENV and CONFIGURE_ENV
PR:		153625
Submitted by:	gerald
2011-03-07 07:32:05 +00:00