Commit graph

9 commits

Author SHA1 Message Date
Mark Linimon
c9064d88e1 Reset inactive maintainer who has not responded to email.
Hat:		portmgr
2006-09-04 08:18:17 +00:00
Norikatsu Shigemura
baa8f97b15 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)
2006-04-15 12:10:50 +00:00
Trevor Johnson
a049dd78cc Use PLIST_FILES (bento-tested, marcus-reviewed). 2004-02-06 13:12:53 +00:00
Eivind Eklund
cf5450acfb 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>
2004-01-21 15:10:35 +00:00
Eivind Eklund
1440f537fa Update to 0.3: Fix bug in command line processing.
Submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
2004-01-04 13:11:06 +00:00
Eivind Eklund
b99387e9b7 Add refererence to archived etc tarballs, making etcmerge
easier to initialize
2003-12-05 19:28:24 +00:00
Eivind Eklund
f2fbc2ba1c I had been testing the wrong version.
Fix a couple of typos that made etc not work at all. :-(
2003-08-20 15:11:43 +00:00
Eivind Eklund
e2f5a0ddf3 Update to 0.2:
Take care of regenerating .db files
2003-08-14 12:46:57 +00:00
Eivind Eklund
91a486bcf4 3-way merge for /etc (mergemaster replacement) 2003-07-30 16:55:35 +00:00