Merge remote-tracking branch 'origin/master'
authorPeter Avalos <pavalos@dragonflybsd.org>
Tue, 10 Apr 2012 16:51:20 +0000 (09:51 -0700)
committerPeter Avalos <pavalos@dragonflybsd.org>
Tue, 10 Apr 2012 16:51:20 +0000 (09:51 -0700)
1  2 
Makefile_upgrade.inc

@@@ -1984,9 -1984,10 +1984,13 @@@ TO_REMOVE+=/usr/lib/profile/libtinfo.a
  TO_REMOVE+=/usr/bin/kzip
  TO_REMOVE+=/usr/share/man/cat8/kzip.8.gz
  TO_REMOVE+=/usr/share/man/man8/kzip.8.gz
+ TO_REMOVE+=/usr/share/man/cat4/i386/aic.4.gz
+ TO_REMOVE+=/usr/share/man/man4/i386/aic.4.gz
+ TO_REMOVE+=/usr/share/man/cat3/lintf.3.gz
+ TO_REMOVE+=/usr/share/man/man3/lintf.3.gz
 +TO_REMOVE+=/usr/include/openssl/e_os.h
 +TO_REMOVE+=/usr/include/openssl/eng_int.h
 +TO_REMOVE+=/usr/include/openssl/ui_locl.h
  
  .if ${MACHINE_ARCH} == "x86_64"
  TO_REMOVE+=/usr/libdata/stallion/2681.sys