CVS commit: pkgsrc/net

[Adrian Portelli <adrianp%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adrianp
Date:           Thu Jan  3 12:25:02 UTC 2008

Modified Files:
        pkgsrc/net/isc-dhclient: Makefile
        pkgsrc/net/isc-dhcp: Makefile Makefile.common
        pkgsrc/net/isc-dhcp/files: isc_dhclient.sh isc_dhcrelay.sh site.h
        pkgsrc/net/isc-dhcpd: Makefile
        pkgsrc/net/isc-dhcrelay: Makefile

Log Message:
Add a CONFLICTS for the upcoming import of 4.x
Sync PID file location between versions
PKGREVISION++


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/net/isc-dhclient/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/net/isc-dhcp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp/Makefile.common
cvs rdiff -r1.2 -r1.3 pkgsrc/net/isc-dhcp/files/isc_dhclient.sh \
    pkgsrc/net/isc-dhcp/files/isc_dhcrelay.sh
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp/files/site.h
cvs rdiff -r1.3 -r1.4 pkgsrc/net/isc-dhcpd/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/net/isc-dhcrelay/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.