14 files changed, 52 insertions, 31 deletions

diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index 56831b3bacee..6ca1dfdcb709 100644
--- a/lib/libncp/ipx.c
+++ b/lib/libncp/ipx.c
@@ -28,9 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
diff --git a/lib/libncp/ncpl_bind.c b/lib/libncp/ncpl_bind.c
index 53c4c31ec741..e7bbb1cd8c49 100644
--- a/lib/libncp/ncpl_bind.c
+++ b/lib/libncp/ncpl_bind.c
@@ -28,9 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c
index b688186aed6f..c60d62890850 100644
--- a/lib/libncp/ncpl_conn.c
+++ b/lib/libncp/ncpl_conn.c
@@ -28,10 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *  $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  *
  * Current scheme to create/open connection:
diff --git a/lib/libncp/ncpl_crypt.c b/lib/libncp/ncpl_crypt.c
index 00ce9bfd9a11..bc304c0cb2e2 100644
--- a/lib/libncp/ncpl_crypt.c
+++ b/lib/libncp/ncpl_crypt.c
@@ -2,9 +2,11 @@
  *  Routines in this file based on the work of Volker Lendecke,
  *  Adapted for ncplib by Boris Popov
  *  Please note that ncpl_crypt.c file should be indentical to this one
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
diff --git a/lib/libncp/ncpl_file.c b/lib/libncp/ncpl_file.c
index dedd533df189..4f611c5c9010 100644
--- a/lib/libncp/ncpl_file.c
+++ b/lib/libncp/ncpl_file.c
@@ -28,9 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_misc.c b/lib/libncp/ncpl_misc.c
index 737dd9fdf5ae..c145fda71437 100644
--- a/lib/libncp/ncpl_misc.c
+++ b/lib/libncp/ncpl_misc.c
@@ -29,11 +29,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
- *
  * calls that don't fit to any other category
- *
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_msg.c b/lib/libncp/ncpl_msg.c
index a65131bd14fb..5af2d7287185 100644
--- a/lib/libncp/ncpl_msg.c
+++ b/lib/libncp/ncpl_msg.c
@@ -28,9 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libncp/ncpl_net.c b/lib/libncp/ncpl_net.c
index da21b663de51..9190cb853af3 100644
--- a/lib/libncp/ncpl_net.c
+++ b/lib/libncp/ncpl_net.c
@@ -28,10 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libncp/ncpl_nls.c b/lib/libncp/ncpl_nls.c
index f9e14f5c5c72..f5c252cd9a18 100644
--- a/lib/libncp/ncpl_nls.c
+++ b/lib/libncp/ncpl_nls.c
@@ -28,10 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Languages support. Currently is very primitive.
  */
diff --git a/lib/libncp/ncpl_queue.c b/lib/libncp/ncpl_queue.c
index f4b42f51de0a..1f003a151993 100644
--- a/lib/libncp/ncpl_queue.c
+++ b/lib/libncp/ncpl_queue.c
@@ -29,11 +29,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
- *
  * NetWare queue interface
- *
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libncp/ncpl_rcfile.c b/lib/libncp/ncpl_rcfile.c
index 7a69071be752..72395f32b2e2 100644
--- a/lib/libncp/ncpl_rcfile.c
+++ b/lib/libncp/ncpl_rcfile.c
@@ -28,9 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <ctype.h>
diff --git a/lib/libncp/ncpl_rpc.c b/lib/libncp/ncpl_rpc.c
index f2f9e54425e4..1299ac9ad356 100644
--- a/lib/libncp/ncpl_rpc.c
+++ b/lib/libncp/ncpl_rpc.c
@@ -29,9 +29,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * NetWare RPCs
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_subr.c b/lib/libncp/ncpl_subr.c
index 768c183ff56a..f516eceabd6b 100644
--- a/lib/libncp/ncpl_subr.c
+++ b/lib/libncp/ncpl_subr.c
@@ -28,10 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/lib/libncp/sap.c b/lib/libncp/sap.c
index 78531ab05ce1..b9f95a9606bf 100644
--- a/lib/libncp/sap.c
+++ b/lib/libncp/sap.c
@@ -28,10 +28,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>