Attachment 57835 Details for Bug 87234 – file.diff

[patch] file.diff

file.diff (text/plain), 2.85 KB, created by edwin on 2005-10-11 01:50:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edwin

Created: 2005-10-11 01:50:14 UTC

Size: 2.85 KB

patch

obsolete

>--- bsd.port.mk.orig	Sat Oct  8 09:58:14 2005
>+++ bsd.port.mk	Tue Oct 11 10:36:51 2005
>@@ -216,6 +216,9 @@
> #				  compression.
> # USE_ZIP		- If set, this port distfile uses zip, not tar w/[bg]zip
> #				  for compression.
>+# USE_DOS2UNIX  - If set to "YES", remove the ^M from all files
>+#				  under ${WRKSRC}. If set to a string, remove in all
>+#				  files under ${WRKSRC} with one of these names the ^Ms.
> # USE_GCC		- If set, this port requires this version of gcc, either in
> #				  the system or installed from a port.
> # USE_GMAKE		- If set, this port uses gmake.
>@@ -1465,6 +1468,10 @@
> CONFIGURE_ENV+=	MAKE=${GMAKE}
> .endif
> 
>+.if defined(USE_DOS2UNIX)
>+USE_REINPLACE=	yes
>+.endif
>+
> .if defined(USE_GCC)
> .include "${PORTSDIR}/Mk/bsd.gcc.mk"
> .endif
>@@ -3259,9 +3266,27 @@
> 
> # Patch
> 
>+.if !target(patch-dos2unix)
>+patch-dos2unix:
>+.if defined(USE_DOS2UNIX)
>+.if ${USE_DOS2UNIX:U}=="YES"
>+	@${ECHO_MSG} "===>   Converting DOS text files to UNIX text files"
>+	@${FIND} -E ${WRKSRC} -type f -print0 | \
>+			${XARGS} -0 ${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//'
>+.else
>+.for f in ${USE_DOS2UNIX}
>+	@${ECHO_MSG} "===>   Converting DOS text file to UNIX text file: ${f}"
>+	@${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/${f}
>+.endfor
>+.else
>+	${DO_NADA}
>+.endif
>+.endif
>+
> .if !target(do-patch)
> do-patch:
> .if defined(PATCHFILES)
>+.endif
> 	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
> 	@(cd ${_DISTDIR}; \
> 	  for i in ${_PATCHFILES}; do \
>@@ -3761,9 +3786,9 @@
> # Please note that the order of the following targets is important, and
> # should not be modified.
> 
>-_SANITY_SEQ=		pre-everything check-makefile check-categories \
>-			check-makevars check-depends check-deprecated \
>-			check-vulnerable buildanyway-message options-message
>+_SANITY_SEQ=	pre-everything check-makefile check-categories \
>+				check-makevars check-depends check-deprecated \
>+				check-vulnerable buildanyway-message options-message
> _FETCH_DEP=		check-sanity
> _FETCH_SEQ=		fetch-depends pre-fetch pre-fetch-script \
> 				do-fetch post-fetch post-fetch-script
>@@ -3772,12 +3797,12 @@
> 				pre-extract-script do-extract \
> 				post-extract post-extract-script
> _PATCH_DEP=		extract
>-_PATCH_SEQ=		patch-message patch-depends pre-patch pre-patch-script \
>-				do-patch post-patch post-patch-script
>+_PATCH_SEQ=		patch-message patch-depends patch-dos2unix pre-patch \
>+				pre-patch-script do-patch post-patch post-patch-script
> _CONFIGURE_DEP=	patch
> _CONFIGURE_SEQ=	build-depends lib-depends misc-depends configure-message \
>-		pre-configure pre-configure-script patch-autotools \
>-		run-autotools do-configure post-configure post-configure-script
>+				pre-configure pre-configure-script patch-autotools \
>+				run-autotools do-configure post-configure post-configure-script
> _BUILD_DEP=		configure
> _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
> 				post-build post-build-script

Actions: View | Diff

Attachments on bug 87234: 57835