diff options
-rw-r--r-- | chat/ircd-hybrid/Makefile | 14 | ||||
-rw-r--r-- | devel/libgtop/Makefile | 14 | ||||
-rw-r--r-- | devel/libgtop2/Makefile | 15 | ||||
-rw-r--r-- | devel/p4/Makefile.common | 46 |
4 files changed, 45 insertions, 44 deletions
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index d96597884c5..69c2aab50b0 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/09/01 10:13:09 cjep Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 08:47:32 grant Exp $ # DISTNAME= ircd-hybrid-6.2 @@ -42,15 +42,15 @@ IRCD_HYBRID_SDIR= ${IRCD_HYBRID_SPATH:C|/[^/]*$||} IRCD_HYBRID_USERS_PREALLOCATE IRCD_HYBRID_NICKNAMEHISTORYLENGTH \ IRCD_HYBRID_MAXSENDQLENGTH IRCD_HYBRID_INITIAL_DBUFS \ IRCD_HYBRID_HARD_FDLIMIT_ IRCD_HYBRID_INIT_MAXCLIENTS -. ifdef ${def} +. ifdef ${def} _DEFS+= -D${def:S|^IRCD_HYBRID_||}=${${def}} -. endif +. endif .endfor .for def in \ IRCD_HYBRID_NETWORK_NAME IRCD_HYBRID_NETWORK_DESC -. ifdef ${def} +. ifdef ${def} _DEFS+= -D${def:S|^IRCD_HYBRID_||}=\"${${def}:Q}\" -. endif +. endif .endfor .for def in \ IRCD_HYBRID_DPATH IRCD_HYBRID_SPATH \ @@ -84,9 +84,9 @@ MAKE_FLAGS+= PREFIX=${PREFIX} DESTDIR=${DESTDIR} IRCD_HYBRID_NETWORK_NAME IRCD_HYBRID_NETWORK_DESC \ IRCD_HYBRID_FNAME_OPERLOG IRCD_HYBRID_PPATH \ IRCD_HYBRID_IRC_USER IRCD_HYBRID_IRC_GROUP -. ifdef ${def} +. ifdef ${def} BUILD_DEFS+= ${def} -. endif +. endif .endfor .ifdef ${IRCD_HYBRID_USE_SYSLOG} == "YES" BUILD_DEFS+= IRCD_HYBRID_USE_SYSLOG diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 8883378d688..692c315acce 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.77 2004/01/22 08:48:49 grant Exp $ DISTNAME= libgtop-1.0.13 PKGREVISION= 4 @@ -18,16 +18,16 @@ OSVERSION_SPECIFIC= yes .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD -. if (${MACHINE_ARCH} != alpha) && \ - (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) +. if (${MACHINE_ARCH} != alpha) && \ + (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ + (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ + (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ + (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" PKG_FAIL_REASON+= "and update patches/patch-al appropriately." PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" -. endif +. endif .endif USE_PERL5= build diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 764d5338a52..12bb40e1fe5 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/01/22 08:49:26 grant Exp $ DISTNAME= libgtop-2.0.7 PKGNAME= ${DISTNAME:S/-/2-/} @@ -16,17 +16,18 @@ NOT_FOR_PLATFORM= SunOS-*-* OSVERSION_SPECIFIC= YES .include "../../mk/bsd.prefs.mk" + .if ${OPSYS} == NetBSD -. if (${MACHINE_ARCH} != alpha) && \ - (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ - (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ - (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ - (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) +. if (${MACHINE_ARCH} != alpha) && \ + (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ + (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ + (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ + (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" PKG_FAIL_REASON+= "and update patches/patch-al appropriately." PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" -. endif +. endif .endif USE_PERL5= build diff --git a/devel/p4/Makefile.common b/devel/p4/Makefile.common index bb57990db49..d12f98cd254 100644 --- a/devel/p4/Makefile.common +++ b/devel/p4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2004/01/20 12:13:29 agc Exp $ +# $NetBSD: Makefile.common,v 1.7 2004/01/22 08:51:15 grant Exp $ # P4_VERS= 2002.1 @@ -24,40 +24,40 @@ _STRIPFLAG_INSTALL= # none .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" -. if ${MACHINE_ARCH} == "powerpc" +.if ${OPSYS} == "Darwin" +. if ${MACHINE_ARCH} == "powerpc" P4ARCH?= darwinppc -. endif -.elif ${OPSYS} == "Linux" -. if ${MACHINE_ARCH} == "arm" +. endif +.elif ${OPSYS} == "Linux" +. if ${MACHINE_ARCH} == "arm" P4ARCH?= linuxarm -. elif ${MACHINE_ARCH} == "i386" +. elif ${MACHINE_ARCH} == "i386" P4ARCH?= linux24x86 -. elif ${MACHINE_ARCH} == "powerpc" +. elif ${MACHINE_ARCH} == "powerpc" P4ARCH?= linuxppc -. elif ${MACHINE_ARCH} == "sparc" +. elif ${MACHINE_ARCH} == "sparc" P4ARCH?= linux52sparc -. endif -.elif ${OPSYS} == "NetBSD" -. if ${MACHINE_ARCH} == "alpha" +. endif +.elif ${OPSYS} == "NetBSD" +. if ${MACHINE_ARCH} == "alpha" P4ARCH?= netbsdaxp -. elif ${MACHINE_ARCH} == "i386" -. if ${DISTNAME} == "p4web" +. elif ${MACHINE_ARCH} == "i386" +. if ${DISTNAME} == "p4web" P4ARCH?= freebsd22 # XXX COMPAT_FREEBSD -. else +. else P4ARCH?= netbsdx86 -. endif -. elif ${MACHINE_ARCH} == "powerpc" +. endif +. elif ${MACHINE_ARCH} == "powerpc" P4ARCH?= linuxppc # XXX COMPAT_LINUX -. elif ${MACHINE_ARCH} == "sparc" +. elif ${MACHINE_ARCH} == "sparc" P4ARCH?= sunos # XXX COMPAT_SUNOS -. endif -.elif ${OPSYS} == "SunOS" -. if ${MACHINE_ARCH} == "i386" +. endif +.elif ${OPSYS} == "SunOS" +. if ${MACHINE_ARCH} == "i386" P4ARCH?= solaris26x86 -. elif ${MACHINE_ARCH} == "sparc" +. elif ${MACHINE_ARCH} == "sparc" P4ARCH?= solaris26 -. endif +. endif .endif .if !defined(P4ARCH) |