Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/archivers/unzip/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/archivers/unzip/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pkgsrc/archivers/unzip/Makefile	2010/11/26 16:06:03	1.75
+++ pkgsrc/archivers/unzip/Makefile	2010/11/29 13:57:20	1.76
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2010/11/26 16:06:03 hauke Exp $
+# $NetBSD: Makefile,v 1.76 2010/11/29 13:57:20 hauke Exp $
 
 DISTNAME=	unzip60
 PKGNAME=	unzip-6.0
@@ -22,13 +22,17 @@ CONFLICTS=	fcrackzip<1.0nb1
 
 MAKE_FILE=	unix/Makefile
 BUILD_TARGET=	generic_zlib unzipsfx
+
 .if ${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin"
-CFLAGS+=	-DBSD
+CPPFLAGS+=	-DBSD
+.endif
+.if (${OPSYS} == "SunOS" || \
+     ${OPSYS} == "OSF1"  || \
+    (${OPSYS} == "Darwin" && !empty(OS_VERSION:M[01234678].*))) 
+CPPFLAGS+=	-DNO_LCHMOD
 .endif
-CFLAGS+=	-I. -DUNIX -Dunix -DUSE_UNSHRINK
-CFLAGS.SunOS+=	-DNO_LCHMOD
-CFLAGS.Darwin+=	-DNO_LCHMOD
-CFLAGS.OSF1+=	-DNO_LCHMOD
+CPPFLAGS+=	-DUNIX -Dunix -DUSE_UNSHRINK -I.
+
 MAKE_FLAGS+=	CF=${CPPFLAGS:Q}\ ${CFLAGS:Q}
 MAKE_FLAGS+=	LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:Q}\ -lz