summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/p4/Makefile4
-rw-r--r--devel/p4/Makefile.common50
-rw-r--r--devel/p5-perl-headers/Makefile10
3 files changed, 32 insertions, 32 deletions
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 018a77f9eee..a6607ad30c4 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/17 20:44:03 rillig Exp $
#
DISTNAME= p4
HOMEPAGE= http://www.perforce.com/perforce/products/p4.html
COMMENT= Perforce SCM command-line client
-P4BINONLY= # defined
+P4BINONLY= yes
.include "../../devel/p4/Makefile.common"
diff --git a/devel/p4/Makefile.common b/devel/p4/Makefile.common
index f76a885f5a4..a55a97e1222 100644
--- a/devel/p4/Makefile.common
+++ b/devel/p4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/22 22:29:50 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/06/17 20:44:03 rillig Exp $
#
P4_VERS= 2002.1
@@ -23,44 +23,44 @@ _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)
+. if !defined(P4ARCH)
NOT_FOR_PLATFORM= ${MACHINE_PLATFORM}
-.endif
+. endif
.endif # P4BINONLY
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index d7bb19b98eb..0524b8b4cd1 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/06/07 15:44:52 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/17 20:52:07 rillig Exp $
DISTNAME= p5-perl-headers
PKGNAME= ${DISTNAME}-${OS_VERSION}
@@ -20,7 +20,7 @@ PERL5_PACKLIST= .packlist.h2ph
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-OSVERSION_SPECIFIC= yes
+OSVERSION_SPECIFIC= yes
# Since this package will be named, for instance, p5-perl-headers-1.5.1,
# binary packages on a FTP server (where only "1.5" is used as the directory
@@ -32,13 +32,13 @@ NO_BIN_ON_FTP= FTP servers do not distinguish A.B.X revisions of versions
do-build:
${MKDIR} ${WRKSRC}/h2ph
${RM} -f ${WRKSRC}/h2ph_log ${WRKSRC}/packlist
- ( cd /usr/include; \
+ ( cd "/usr/include" && \
${BUILDLINK_PREFIX.perl}/bin/h2ph -d ${WRKSRC}/h2ph -r -l . ) \
> ${WRKSRC}/h2ph_log
- ( ${ECHO} "${PERL5_INSTALLVENDORARCH}/_h2ph_pre.ph"; \
+ ( ${ECHO} "${PERL5_INSTALLVENDORARCH}/_h2ph_pre.ph" && \
${CAT} ${WRKSRC}/h2ph_log \
| ${GREP} -- "->" \
- | ${SED} -e "s,.*\./,${PERL5_INSTALLVENDORARCH}/,g" ) \
+ | ${SED} -e 's,.*\./,${PERL5_INSTALLVENDORARCH}/,g' ) \
| ${SORT} -u \
> ${WRKSRC}/packlist