Page MenuHomeFreeBSD
Files F132631363

D5607.id14230.diff
No OneTemporary
Actions

D5607.id14230.diff
View Options

Index: Mk/Uses/dos2unix.mk
===================================================================
--- Mk/Uses/dos2unix.mk
+++ Mk/Uses/dos2unix.mk
@@ -15,22 +15,24 @@
_DOS2UNIX_ALL= yes
.endif
+DOS2UNIX_WRKSRC?= ${WRKSRC}
+
_USES_patch+= 200:dos2unix
dos2unix:
@${ECHO_MSG} "===> Converting DOS text files to UNIX text files"
.if defined(_DOS2UNIX_ALL)
- @${FIND} ${WRKSRC} -type f -print0 | \
+ @${FIND} ${DOS2UNIX_WRKSRC} -type f -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/ $$//'
.else
.if defined(DOS2UNIX_FILES)
- @(cd ${WRKSRC}; \
+ @(cd ${DOS2UNIX_WRKSRC}; \
${ECHO_CMD} ${DOS2UNIX_FILES} | ${XARGS} ${SED} -i '' -e 's/ $$//' )
.elif defined(DOS2UNIX_REGEX)
- @${FIND} -E ${WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
+ @${FIND} -E ${DOS2UNIX_WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/ $$//'
.else
.for f in ${DOS2UNIX_GLOB}
- @${FIND} ${WRKSRC} -type f -name '${f}' -print0 | \
+ @${FIND} ${DOS2UNIX_WRKSRC} -type f -name '${f}' -print0 | \
${XARGS} -0 ${SED} -i '' -e 's/ $$//'
.endfor
.endif
Index: sysutils/freefilesync/Makefile
===================================================================
--- sysutils/freefilesync/Makefile
+++ sysutils/freefilesync/Makefile
@@ -17,16 +17,12 @@
libnotify.so:${PORTSDIR}/devel/libnotify
WRKSRC= ${WRKDIR}/FreeFileSync/Source
+DOS2UNIX_WRKSRC=${WRKDIR}
USES= compiler:c++14-lang dos2unix gmake pkgconfig zip
USE_LDCONFIG= yes
USE_WX= 3.0+
-pre-patch:
-# XXX Pretend USES=dos2unix supports DOS2UNIX_WRKSRC=${WRKDIR}
- @${SED} 's/^+++ //; /^\.\./!d; s,^,${PATCH_WRKSRC}/,' \
- ${PATCHDIR}/patch-* | ${XARGS} ${REINPLACE_CMD} 's/ $$//'
-
post-patch:
@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \
-e 's,g++,$${CXX},' ${WRKSRC}/Makefile

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 19, 2:33 PM (9 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23928835
Default Alt Text
D5607.id14230.diff (1 KB)

Event Timeline