Fix build on Interix; also move "special" GCC_REQD to hacks.mk.

2 files changed, 27 insertions, 10 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 7290575f448..7e601c0064b 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2005/01/18 14:16:20 adam Exp $
+# $NetBSD: Makefile,v 1.105 2005/01/24 20:48:05 tv Exp $
 
 DISTNAME=	netpbm-10.26.1
 CATEGORIES=	graphics
@@ -27,15 +27,6 @@ STAGEDIR=	${WRKDIR}/staging
 LIBS.SunOS=	-lsocket -lnsl
 MAKE_ENV+=	NETWORKLD="${LIBS}"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-GCC_REQD+=      3.0
-.endif
-
 pre-configure:
 	${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config
 
diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk
new file mode 100644
index 00000000000..90cd6498a43
--- /dev/null
+++ b/graphics/netpbm/hacks.mk
@@ -0,0 +1,26 @@
+# $NetBSD: hacks.mk,v 1.1 2005/01/24 20:48:05 tv Exp $
+
+.ifndef NETPBM_HACKS_MK
+NETPBM_HACKS_MK=	# defined
+
+### [historic : ???]
+### gcc optimization fixes
+###
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+PKG_HACKS+=		optimization
+GCC_REQD+=		2.95.3
+.endif
+.if ${MACHINE_ARCH} == "alpha"
+PKG_HACKS+=		optimization
+GCC_REQD+=		3.0
+.endif
+
+### [Mon Jan 24 20:47:14 UTC 2005 : tv]
+### substitute for <inttypes.h> on Interix
+###
+.if ${OPSYS} == "Interix"
+PKG_HACKS+=		standard-headers
+MAKE_FLAGS+=		INTTYPES_H='<sys/types.h>'
+.endif
+
+.endif