--- Imakefile.orig	2010-04-07 14:37:45.000000000 +0900
+++ Imakefile	2010-05-29 14:06:49.000000000 +0900
@@ -94,7 +94,7 @@
 
 DEPLIBS = always xpaint.man XPaint.ad
 
-#if ! defined(__NetBSD__) && !defined(__FreeBSD__)
+#if ! defined(NetBSDArchitecture) && !defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = -Lrw -lrw -ldl -rdynamic \
   $(XPM_LIB) $(XFT_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) 
 #else
@@ -237,7 +237,7 @@
 		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
 		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
-	cp -p app-defaults/out/XPaint XPaint.ad
+	cp -f app-defaults/out/XPaint XPaint.ad
 
 XPaint.ad.h:	XPaint.ad
 	./substads -ad2c $? $@
