Subject: /pkgsrc/net/Makefile
To: None <tech-pkg@netbsd.org>
From: Jun Ebihara <jun@soum.co.jp>
List: tech-pkg
Date: 08/30/2000 12:02:49 
/pkgsrc/net/Makefile seems broken?

# $NetBSD: Makefile,v 1.150 2000/08/27 20:43:26 hubertf Exp $
# FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp 
#

.include "../mk/bsd.prefs.mk"

    SUBDIR += archie
    SUBDIR += arla
      :
    SUBDIR += coda_intro
    SUBDIR += coda_server
<<<<<<< Makefile
    SUBDIR += delegate
    SUBDIR += ddclient
=======
    SUBDIR += ddclient
    SUBDIR += delegate
>>>>>>> 1.142
    SUBDIR += dhid
    SUBDIR += dip
    SUBDIR += dlint

--
jun ebihara