Minor fixes

svn path=/head/; revision=60456

devel/p5-Class-Contract/Makefile

@@ -14,16 +14,15 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 
-BUILD_DEPENDS=	dos2unix:${PORTSDIR}/converters/unix2dos
-
 PERL_CONFIGURE=	yes
 PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Class::Contract.3 Class::Contract::Production.3
 
-post-extract:
-	@find ${WRKSRC} -type f -name "*.p[lm]" | xargs dos2unix -p
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name "*.p[lm]" | \
+		xargs ${PERL} -pi -e 's/\x0d//g;'
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/examples
@@ -32,9 +31,8 @@ pre-configure:
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/* \
-		${PREFIX}/share/examples/${PORTNAME}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>

devel/p5-Class-Contract/files/patch-demo.pl

@@ -1,8 +0,0 @@
---- demo.pl.orig	Mon Nov  5 17:24:22 2001
-+++ demo.pl	Mon Nov  5 17:24:29 2001
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- # NOTES:
- #	Invariants and pre- and post-conditions are expected