--- Libc/Libc-763.13/string/Makefile.inc
+++ Libc/Libc-498/string/Makefile.inc
@@ -1,43 +1,32 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.32 2002/11/18 09:50:56 ru Exp $
 
+.ifnmake autopatch
 # machine-dependent string sources
-.sinclude "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
+.endif
+.endif # !autopatch
 
 .PATH: ${.CURDIR}/string
-CWD := ${.CURDIR}/string
 
 CFLAGS+= -I${.CURDIR}/locale
 
 .include "Makefile.fbsd_begin"
 # machine-independent string sources
-FBSDMISRCS+=bcmp.c index.c memccpy.c memchr.c memcmp.c memmem.c \
-	memset.c rindex.c stpcpy.c stpncpy.c strcasecmp.c strcat.c \
-	strchr.c strcoll.c strcpy.c strcspn.c strdup.c strndup.c strerror.c \
-	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c strnlen.c \
+FBSDMISRCS+=bcmp.c index.c memccpy.c memchr.c memcmp.c \
+	memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
+	strchr.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
+	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strcasestr.c strnstr.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
-	strxfrm.c swab.c \
-	wcpcpy.c wcpncpy.c wcscasecmp.c wcsncasecmp.c \
-	wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \
-	wcscspn.c wcsdup.c wcslcat.c wcslcpy.c \
-	wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcsnlen.c wcspbrk.c \
+	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \
+	wcscspn.c \
+	wcslcat.c wcslcpy.c wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c \
 	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \
 	wmemcmp.c \
 	wmemcpy.c wmemmove.c wmemset.c
 .include "Makefile.fbsd_end"
-
-DYLDSRCS += \
-	strcat.c  \
-	strchr.c  \
-	strcpy.c  \
-	strdup.c  \
-	strlcat.c \
-	strlcpy.c \
-	strncmp.c \
-	strncpy.c \
-	strrchr.c \
-	strstr.c
 
 LEGACYSRCS+= strerror.c
 
@@ -48,7 +37,7 @@
 .if ${LIB} == "c"
 .include "Makefile.fbsd_begin"
 FBSDMAN3= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
-	memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
+	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
 	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
@@ -70,12 +59,7 @@
 MLINKS+= strcoll.3 strcoll_l.3
 
 MLINKS+= strcpy.3 stpcpy.3			\
-         strcpy.3 stpncpy.3			\
          strcpy.3 strncpy.3
-
-MLINKS+= strdup.3 strndup.3
-
-MLINKS+= strlen.3 strnlen.3
 
 MLINKS+= strerror.3 perror.3			\
          strerror.3 strerror_r.3		\
@@ -102,11 +86,6 @@
          wmemchr.3 wmemcpy.3			\
          wmemchr.3 wmemmove.3			\
          wmemchr.3 wmemset.3			\
-         wmemchr.3 wcpcpy.3			\
-         wmemchr.3 wcpncpy.3			\
-         wmemchr.3 wcsdup.3			\
-         wmemchr.3 wcscasecmp.3			\
-         wmemchr.3 wcscasecmp_l.3		\
          wmemchr.3 wcscat.3			\
          wmemchr.3 wcschr.3			\
          wmemchr.3 wcscmp.3			\
@@ -115,12 +94,9 @@
          wmemchr.3 wcslcat.3			\
          wmemchr.3 wcslcpy.3			\
          wmemchr.3 wcslen.3			\
-         wmemchr.3 wcsncasecmp.3		\
-         wmemchr.3 wcsncasecmp_l.3		\
          wmemchr.3 wcsncat.3			\
          wmemchr.3 wcsncmp.3			\
          wmemchr.3 wcsncpy.3			\
-         wmemchr.3 wcsnlen.3			\
          wmemchr.3 wcspbrk.3			\
          wmemchr.3 wcsrchr.3			\
          wmemchr.3 wcsspn.3			\