etcmerge is a tool for keeping /etc up to date when updating,
or for management after installworld (instead of mergemester).
The primary difference from mergemaster, is that etcmerge
requires much less manual work than mergemaster, due to the
use of a three way merge.
Remove WWW entries moved into port Makefiles
Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner)
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
(Only the first 15 lines of the commit message are shown above )
sysutils: remove 'Created by' lines
A big Thank You to the original contributors of these ports:
* <jsmith@resonatingmedia.com>
* Aaron Dalton <aaron@FreeBSD.org>
* Aaron Landwehr <aaron@snaphat.com>
* Adam Weinberger <adamw@FreeBSD.org>
* Adrian Chadd
* Adrian Chadd <adrian@FreeBSD.org>
* Akinori MUSHA aka knu <knu@idaemons.org>
* Alan Eldridge <alane@FreeBSD.org>
* Alan Eldridge <alane@geeksrus.net>
* Aldis Berjoza <aldis@bsdroot.lv>
* Alex Deiter <alex.deiter@gmail.com>
(Only the first 15 lines of the commit message are shown above )
- pass port to submitter, update pkg-descr and WWW [1]
- while here drop PORTREVISION, and move SRC calls to ${FILESDIR}
PR: 198266 [1]
Submitted by: portmaster@bsdforge.com
Fix make index error on 7-current(No more NO_MAN).
Updating the ports index ... Generating INDEX.tmp - please
wait.."/usr/share/mk/bsd.own.mk", line 353: WITH_MAN and WITHOUT_MAN can't both
be set.
===> sysutils/etcmerge failed
"/usr/share/mk/bsd.own.mk", line 353: WITH_MAN and WITHOUT_MAN can't both be
set.
Approved by: maintainer timeout (1 week)
Update to version 0.4:
* Update docs with a better mergemaster procedure and better markup.
Partially submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
* Make etcmerge show usage information when run with no arguments.
Noticed by: Daniel O'Connor <doconnor@gsoft.com.au>
