[Bug 200428] [patch] allow custom PATCH_PATH_SEPARATOR defined in port

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200428

--- Comment #4 from Olli Hauer <ohauer at FreeBSD.org> ---
The issue I'm talking about is not for existing patches, it is for new ones.

In case the file or path contains '_' the resulting patch file name is
nonsense.

E.g. original file path is ${WRKSRC}modules/ssl/ssl_engine_init.c
> cd www/apache24
> make patch
> rm files/patch-modules__ssl__ssl_engine_init.c
> make makepatch

> svn stat files/ | grep init.c
!       files/patch-modules__ssl__ssl_engine_init.c
?       files/patch-modules_ssl_ssl__engine__init.c


The resulting patch name has nothing to do with the filename since the '_' in
the filename are replaced by '__'

Using 
Index: /usr/ports/Mk/bsd.port.mk
===================================================================
--- /usr/ports/Mk/bsd.port.mk   (revision 389625)
+++ /usr/ports/Mk/bsd.port.mk   (working copy)
@@ -1125,7 +1125,7 @@
 # common path separators ([-+_]) or legacy double underscore (__).

 .if !target(makepatch)
-PATCH_PATH_SEPARATOR=  _
+PATCH_PATH_SEPARATOR?= _
 makepatch:
        @${MKDIR} ${PATCHDIR}
        @(cd ${PATCH_WRKSRC}; \

together with PATCH_PATH_SEPARATOR= __ in the ports Makefile results in a clear
patch name as before the "PATCH_PATH_SEPARATOR" change.
This was also discussed before the "PATCH_PATH_SEPARATOR" changes where done.

-- 
You are receiving this mail because:
You are on the CC list for the bug.