ports/167794: [patch] Mk/bsd.port.mk: fix .zip in PATCHFILES
Jan Beich
jbeich at tormail.org
Fri May 11 09:50:13 UTC 2012
>Number: 167794
>Category: ports
>Synopsis: [patch] Mk/bsd.port.mk: fix .zip in PATCHFILES
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri May 11 09:50:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
tested on emulators/mame
#v+
Index: Makefile
===================================================================
RCS file: /a/.csup/ports/emulators/mame/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile 11 Mar 2012 01:07:00 -0000 1.40
+++ Makefile 11 May 2012 09:40:36 -0000
@@ -14,8 +14,8 @@ MASTER_SITES= http://mame.mirrors.zippyk
http://mamedev.thiswebhost.com/releases/ \
http://mamedev.org/updates/:patchsets
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${UPDATE_PATCHES:C/$/.zip:patchsets/}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+PATCHFILES= ${UPDATE_PATCHES:C/$/.zip:patchsets/}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports at FreeBSD.org
@@ -43,7 +43,7 @@ MAKE_JOBS_SAFE= yes
SUB_FILES= pkg-message
-PATCHLEVEL= # none
+PATCHLEVEL= 3
.if defined(PATCHLEVEL) && ${PATCHLEVEL}
PATCHSUFFIX= .p${PATCHLEVEL}
@@ -75,14 +75,6 @@ MAKE_ENV+= PTR64=1
post-extract:
@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
@${RM} -f ${WRKDIR}/mame.zip
-# Use post-extract target to get in before dos2unix-isation
-.if defined(UPDATE_PATCHES)
-. for patch in ${UPDATE_PATCHES:S/_/./}
- @${ECHO_MSG} -n "===> Applying upstream development patch ${patch}... "
- @${PATCH} ${PATCH_ARGS} < ${WRKSRC}/${patch}
- @${ECHO_MSG} "[DONE]"
-. endfor
-.endif
post-patch:
@${REINPLACE_CMD} -e \
#v-
>Description:
Properly support .zip PATCHFILES introduced in r1.441.
>How-To-Repeat:
>Fix:
--- zip.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
RCS file: /a/.csup/ports/Mk/bsd.port.mk,v
retrieving revision 1.708
diff -u -p -r1.708 bsd.port.mk
--- Mk/bsd.port.mk 13 Mar 2012 08:14:45 -0000 1.708
+++ Mk/bsd.port.mk 11 May 2012 09:24:03 -0000
@@ -3622,6 +3629,9 @@ do-patch:
*.bz2) \
${BZCAT} $$i | ${PATCH} ${PATCH_DIST_ARGS}; \
;; \
+ *.zip) \
+ ${UNZIP_CMD} -p $$i | ${PATCH} ${PATCH_DIST_ARGS}; \
+ ;; \
*) \
${PATCH} ${PATCH_DIST_ARGS} < $$i; \
;; \
--- zip.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list