pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix abusers of LOWER_OPSYS to check OPSYS or MACHINE_P...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b289a763606f
branches: trunk
changeset: 534333:b289a763606f
user: tnn <tnn%pkgsrc.org@localhost>
date: Tue Oct 16 23:48:58 2007 +0000
description:
Fix abusers of LOWER_OPSYS to check OPSYS or MACHINE_PLATFORM instead.
diffstat:
comms/pilot-link-libs/Makefile | 4 ++--
converters/libiconv/hacks.mk | 4 ++--
databases/db3/Makefile | 4 ++--
databases/mysql4-client/Makefile.common | 4 ++--
databases/mysql5-client/Makefile.common | 4 ++--
devel/doc++/hacks.mk | 4 ++--
devel/glib2/Makefile | 4 ++--
devel/gmp/Makefile | 4 ++--
graphics/MesaLib/hacks.mk | 4 ++--
graphics/libwmf/hacks.mk | 4 ++--
graphics/netpbm/hacks.mk | 4 ++--
graphics/xpm/Makefile | 6 +++---
graphics/xv/Makefile | 4 ++--
mail/deliver/Makefile | 4 ++--
mail/libesmtp/Makefile | 4 ++--
mail/mutt/Makefile | 4 ++--
mail/nmh/Makefile | 4 ++--
mail/sma/Makefile | 4 ++--
mk/features/features-vars.mk | 4 ++--
net/host/Makefile | 4 ++--
net/openslp/hacks.mk | 4 ++--
net/rsync/hacks.mk | 4 ++--
net/xtraceroute/Makefile | 4 ++--
print/teTeX3-bin/hacks.mk | 4 ++--
security/skey/hacks.mk | 6 +++---
security/tcp_wrappers/Makefile | 4 ++--
shells/bash/Makefile | 4 ++--
textproc/aspell/Makefile | 4 ++--
textproc/libxslt/Makefile | 4 ++--
textproc/opensp/hacks.mk | 4 ++--
www/libwww/Makefile | 4 ++--
31 files changed, 64 insertions(+), 64 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r 5270dc3e7ef1 -r b289a763606f comms/pilot-link-libs/Makefile
--- a/comms/pilot-link-libs/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/comms/pilot-link-libs/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 01:26:46 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/10/16 23:56:02 tnn Exp $
#
.include "../../comms/pilot-link/Makefile.common"
@@ -11,7 +11,7 @@
MAKE_ENV+= PILIB="libsock/libpisock.la"
MAKE_ENV+= PICCLIB="libcc/libpicc.a"
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
CONFIGURE_ENV+= ac_cv_header_inttypes_h="no"
.endif
diff -r 5270dc3e7ef1 -r b289a763606f converters/libiconv/hacks.mk
--- a/converters/libiconv/hacks.mk Tue Oct 16 22:51:30 2007 +0000
+++ b/converters/libiconv/hacks.mk Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/04/14 21:13:10 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:58 tnn Exp $
.if !defined(LIBEXIF_HACKS_MK)
LIBEXIF_HACKS_MK= # defined
@@ -7,7 +7,7 @@
### make sys/types.h not conflict with inttypes.h
### (issue is specific to IRIX 5.3)
###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
PKG_HACKS+= sys_types_h-inttypes_h-conflict
post-wrapper:
${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff -r 5270dc3e7ef1 -r b289a763606f databases/db3/Makefile
--- a/databases/db3/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/databases/db3/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2007/10/16 23:48:59 tnn Exp $
DISTNAME= db-3.3.11
PKGNAME= db3-3.11.2
@@ -34,7 +34,7 @@
.include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CONFIGURE_ENV+= ac_cv_header_inttypes_h=no
.endif
diff -r 5270dc3e7ef1 -r b289a763606f databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common Tue Oct 16 22:51:30 2007 +0000
+++ b/databases/mysql4-client/Makefile.common Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2007/07/09 22:27:36 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.60 2007/10/16 23:48:59 tnn Exp $
DISTNAME= mysql-4.1.22
CATEGORIES= databases
@@ -37,7 +37,7 @@
CONFIGURE_ARGS+= --without-libwrap
CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
# libgen is incorrectly detected
CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
diff -r 5270dc3e7ef1 -r b289a763606f databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common Tue Oct 16 22:51:30 2007 +0000
+++ b/databases/mysql5-client/Makefile.common Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2007/10/12 14:32:45 rillig Exp $
+# $NetBSD: Makefile.common,v 1.27 2007/10/16 23:49:00 tnn Exp $
DISTNAME= mysql-5.0.45
CATEGORIES= databases
@@ -37,7 +37,7 @@
CONFIGURE_ARGS+= --without-libwrap
CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
# libgen is incorrectly detected
CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
diff -r 5270dc3e7ef1 -r b289a763606f devel/doc++/hacks.mk
--- a/devel/doc++/hacks.mk Tue Oct 16 22:51:30 2007 +0000
+++ b/devel/doc++/hacks.mk Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/22 22:16:25 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:58 tnn Exp $
.if !defined(DOCXX_HACKS_MK)
DOCXX_HACKS_MK= # defined
@@ -7,7 +7,7 @@
### make sys/types.h not conflict with inttypes.h
### (issue is specific to IRIX 5.3)
###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
PKG_HACKS+= sys_types_h-inttypes_h-conflict
CONFIGURE_ENV+= ac_cv_header_inttypes_h="no"
CONFIGURE_ENV+= jm_ac_cv_header_inttypes_h="no"
diff -r 5270dc3e7ef1 -r b289a763606f devel/glib2/Makefile
--- a/devel/glib2/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/devel/glib2/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/09/22 17:07:29 tnn Exp $
+# $NetBSD: Makefile,v 1.123 2007/10/16 23:49:00 tnn Exp $
# When updating glib2, please apply patch-ak to configure.in
# Then run a matching version of autoconf to regen patch-aa.
@@ -85,7 +85,7 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CONFIGURE_ARGS+= --disable-threads
.else
.include "../../mk/pthread.buildlink3.mk"
diff -r 5270dc3e7ef1 -r b289a763606f devel/gmp/Makefile
--- a/devel/gmp/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/devel/gmp/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/06/18 02:45:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.45 2007/10/16 23:49:02 tnn Exp $
DISTNAME= gmp-4.2.1
CATEGORIES= devel math
@@ -21,7 +21,7 @@
TEST_TARGET= check
.include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*) && !empty(ABI)
+.if ${OPSYS} == "IRIX" && !empty(ABI)
ABI= o32
.endif
diff -r 5270dc3e7ef1 -r b289a763606f graphics/MesaLib/hacks.mk
--- a/graphics/MesaLib/hacks.mk Tue Oct 16 22:51:30 2007 +0000
+++ b/graphics/MesaLib/hacks.mk Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2007/08/13 11:18:43 seb Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/10/16 23:48:58 tnn Exp $
.if !defined(MESALIBS_HACKS_MK)
MESALIBS_HACKS_MK= # defined
@@ -7,7 +7,7 @@
### make sys/types.h not conflict with inttypes.h
### (issue is specific to IRIX 5.3)
###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
PKG_HACKS+= sys_types_h-inttypes_h-conflict
post-wrapper:
${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff -r 5270dc3e7ef1 -r b289a763606f graphics/libwmf/hacks.mk
--- a/graphics/libwmf/hacks.mk Tue Oct 16 22:51:30 2007 +0000
+++ b/graphics/libwmf/hacks.mk Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/01/29 21:58:31 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $
.if !defined(LIBEXIF_HACKS_MK)
LIBEXIF_HACKS_MK= # defined
@@ -7,7 +7,7 @@
### make sys/types.h not conflict with inttypes.h
### (issue is specific to IRIX 5.3)
###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
PKG_HACKS+= sys_types_h-inttypes_h-conflict
post-wrapper:
${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff -r 5270dc3e7ef1 -r b289a763606f graphics/netpbm/hacks.mk
--- a/graphics/netpbm/hacks.mk Tue Oct 16 22:51:30 2007 +0000
+++ b/graphics/netpbm/hacks.mk Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2006/04/03 16:39:04 tron Exp $
+# $NetBSD: hacks.mk,v 1.6 2007/10/16 23:48:59 tnn Exp $
.if !defined(NETPBM_HACKS_MK)
NETPBM_HACKS_MK= # defined
@@ -27,7 +27,7 @@
### make sys/types.h not conflict with inttypes.h
### (issue is specific to IRIX 5.3)
###
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
PKG_HACKS+= sys_types_h-inttypes_h-conflict
post-wrapper:
${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
diff -r 5270dc3e7ef1 -r b289a763606f graphics/xpm/Makefile
--- a/graphics/xpm/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/graphics/xpm/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2007/09/25 10:03:53 hira Exp $
+# $NetBSD: Makefile,v 1.59 2007/10/16 23:49:00 tnn Exp $
DISTNAME= xpm-3.4k
PKGREVISION= 7
@@ -19,14 +19,14 @@
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS" || !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
post-install:
cd ${PREFIX}/lib && \
rm -f libXpm.so.4 && \
ln -s libXpm.so.4.11 libXpm.so.4
.endif
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
SUBST_CLASSES+= sodots
SUBST_STAGE.sodots= post-configure
SUBST_FILES.sodots= lib/Makefile
diff -r 5270dc3e7ef1 -r b289a763606f graphics/xv/Makefile
--- a/graphics/xv/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/graphics/xv/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2007/07/27 23:42:17 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2007/10/16 23:49:00 tnn Exp $
DISTNAME= xv-3.10a
PKGREVISION= 13
@@ -51,7 +51,7 @@
SUBST_MESSAGE.ccflags= Fixing compiler flags for Solaris.
.endif
-.if !empty(LOWER_OPSYS:Mirix5*) || !empty(LOWER_OPSYS:Msolaris*)
+.if ${OPSYS} == "IRIX" || ${OPSYS} == "SunOS"
CPPFLAGS+= -DNEED_ALLOCA_H
.endif
diff -r 5270dc3e7ef1 -r b289a763606f mail/deliver/Makefile
--- a/mail/deliver/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/mail/deliver/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/10/16 23:49:01 tnn Exp $
DISTNAME= deliver-2.1.14
PKGREVISION= 1
@@ -18,7 +18,7 @@
.include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CPPFLAGS+= -DNO_SYS_TIMEB_H
.endif
diff -r 5270dc3e7ef1 -r b289a763606f mail/libesmtp/Makefile
--- a/mail/libesmtp/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/mail/libesmtp/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/08 18:29:17 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/16 23:49:01 tnn Exp $
DISTNAME= libesmtp-1.0.4
CATEGORIES= mail devel
@@ -21,7 +21,7 @@
.include "../../mk/bsd.prefs.mk"
-.if !empty(LOWER_OPSYS:Mirix5*)
+.if ${OPSYS} == "IRIX"
CONFIGURE_ARGS+= --enable-emulate-getaddrinfo
.endif
diff -r 5270dc3e7ef1 -r b289a763606f mail/mutt/Makefile
--- a/mail/mutt/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/mail/mutt/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2007/05/27 13:34:16 tron Exp $
+# $NetBSD: Makefile,v 1.150 2007/10/16 23:48:59 tnn Exp $
DISTNAME= mutt-1.4.2.3
CATEGORIES= mail
@@ -31,7 +31,7 @@
CONFIGURE_ARGS+= --without-wc-funcs
.endif
-.if ${LOWER_OPSYS} == "irix5.3"
+.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
CONFIGURE_ENV+= ac_cv_header_inttypes_h=no
.endif
diff -r 5270dc3e7ef1 -r b289a763606f mail/nmh/Makefile
--- a/mail/nmh/Makefile Tue Oct 16 22:51:30 2007 +0000
+++ b/mail/nmh/Makefile Tue Oct 16 23:48:58 2007 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index