--- Libc/Libc-498/Makefile.fbsd_end
+++ Libc/Libc-320/Makefile.fbsd_end
@@ -12,56 +12,48 @@
 
 FBSDSECTIONS= 1 2 3 4 5 6 7 8 9
 
+.if !target(_FBSDPATCH)
+_FBSDPATCH: .USE
+	@if [ -f ${.ALLSRC}.patch ]; then \
+	    echo cp ${.ALLSRC} ${.TARGET}; \
+	    cp ${.ALLSRC} ${.TARGET}; \
+	    echo patch ${.TARGET} ${.ALLSRC}.patch; \
+	    patch ${.TARGET} ${.ALLSRC}.patch; \
+	else \
+	    echo ln -s ${.ALLSRC} ${.TARGET}; \
+	    ln -s ${.ALLSRC} ${.TARGET}; \
+	fi
+.endif
+.if !target(_FBSDPATCH)
+_FBSDPATCH: .USE
+	cp ${.ALLSRC} ${.TARGET}; \
+	patch ${.TARGET} ${.ALLSRC}.patch
+.endif
+
 .for _src in ${FBSDSRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _FBSDPATCH
 SRCS+= ${_src}
-.endif # autopatch
 .endfor
 
 .for _src in ${FBSDMDSRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _FBSDPATCH
 MDSRCS+= ${_src}
-.endif # autopatch
 .endfor
 
 .for _src in ${FBSDMISRCS}
-.ifmake autopatch
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
-.else # !autopatch
+${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _FBSDPATCH
 MISRCS+= ${_src}
-.endif # autopatch
 .endfor
 
-# FBSDPATCHSRCS are for source that need patching, but don't build
-# in base variant (only in other variants)
-.ifmake autopatch
-.for _src in ${FBSDPATCHSRCS}
-${_src:R}-fbsd.${_src:E}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHSRCS+= ${_src:R}-fbsd.${_src:E}
+.for _src in ${FBSDORIGHDRS}
+${_src}: FreeBSD/${_src} _FBSDPATCH
+FBSDHDRS+= ${_src}
 .endfor
-.endif # autopatch
-
-.ifmake autopatch
-.for _src in ${FBSDHDRS}
-${_src}: FreeBSD/${_src} _AUTOPATCHCUR
-AUTOPATCHHDRS+= ${_src}
-.endfor
-.endif # autopatch
 
 .for _sect in ${FBSDSECTIONS}
 .for _src in ${FBSDMAN${_sect}}
-.ifmake autopatch
-${_src}: FreeBSD/${_src} _AUTOPATCH
-AUTOPATCHMAN+= ${_src}
-.else # !autopatch
+${_src}: FreeBSD/${_src} _FBSDPATCH
 MAN${_sect}+= ${_src}
-.endif # autopatch
+FBSDPATCHMAN+= ${_src}
 .endfor
 .endfor