aboutsummaryrefslogtreecommitdiff
path: root/sysutils/etcmerge
Commit message (Collapse)AuthorAgeFilesLines
* Reset inactive maintainer who has not responded to email.Mark Linimon2006-09-041-2/+2
| | | | | | | Hat: portmgr Notes: svn path=/head/; revision=172143
* Fix make index error on 7-current(No more NO_MAN).Norikatsu Shigemura2006-04-151-1/+0
| | | | | | | | | | | 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) Notes: svn path=/head/; revision=159579
* Use PLIST_FILES (bento-tested, marcus-reviewed).Trevor Johnson2004-02-062-1/+1
| | | | Notes: svn path=/head/; revision=100139
* Update to version 0.4:Eivind Eklund2004-01-213-7/+24
| | | | | | | | | | | * 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> Notes: svn path=/head/; revision=98700
* Update to 0.3: Fix bug in command line processing.Eivind Eklund2004-01-042-1/+2
| | | | | | | Submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp> Notes: svn path=/head/; revision=97269
* Add refererence to archived etc tarballs, making etcmergeEivind Eklund2003-12-052-2/+7
| | | | | | | easier to initialize Notes: svn path=/head/; revision=95152
* I had been testing the wrong version.Eivind Eklund2003-08-202-2/+3
| | | | | | | Fix a couple of typos that made etc not work at all. :-( Notes: svn path=/head/; revision=87386
* Update to 0.2:Eivind Eklund2003-08-142-1/+12
| | | | | | | Take care of regenerating .db files Notes: svn path=/head/; revision=86935
* 3-way merge for /etc (mergemaster replacement)Eivind Eklund2003-07-305-0/+709
Notes: svn path=/head/; revision=85919