Fri Feb 20 19:55:43 2015 UTC ()
Pullup ticket #4626 - requested by tnn
devel/patch: build fix

Revisions pulled up:
- devel/patch/Makefile                                          1.42

---
   Module Name:	pkgsrc
   Committed By:	tnn
   Date:		Fri Feb 20 07:09:19 UTC 2015

   Modified Files:
   	pkgsrc/devel/patch: Makefile

   Log Message:
   PR pkg/49672: OSX build fix (already reported and fixed upstream)
   While here simplify Interix fix by overriding autoconf test instead of
   manually patching the sources.


(tron)
diff -r1.40.2.1 -r1.40.2.2 pkgsrc/devel/patch/Makefile
cvs diff -r1.40.2.1 -r1.40.2.2 pkgsrc/devel/patch/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/patch/Makefile 2015/02/18 17:57:12 1.40.2.1
+++ pkgsrc/devel/patch/Makefile 2015/02/20 19:55:43 1.40.2.2
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.40.2.1 2015/02/18 17:57:12 tron Exp $ 1# $NetBSD: Makefile,v 1.40.2.2 2015/02/20 19:55:43 tron Exp $
2 2
3DISTNAME= patch-2.7.4 3DISTNAME= patch-2.7.4
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNU:=patch/} 5MASTER_SITES= ${MASTER_SITE_GNU:=patch/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/patch/patch.html 9HOMEPAGE= http://www.gnu.org/software/patch/patch.html
10COMMENT= Patch files using diff output 10COMMENT= Patch files using diff output
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= awk 14USE_TOOLS+= awk
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18CONFIGURE_ARGS+= --program-prefix=g 18CONFIGURE_ARGS+= --program-prefix=g
 19CONFIGURE_ENV+= ac_cv_func_setmode_dos=no # Fix for Interix (and old bsd?)
19 20
20INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1 21INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
21 22
22do-patch: 23do-patch:
23 ${MV} ${WRKSRC}/src/pch.c ${WRKSRC}/src/pch.c.orig 24.for stdhdr in sys/param.h sys/stat.h string.h
24 ${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\ 25 echo "#ifdef HAVE_${stdhdr:tu:C,[/.],_,g}" >> ${WRKSRC}/config.hin
25 /^#if HAVE_SETMODE_DOS/ \ 26 echo "#include <${stdhdr}>" >> ${WRKSRC}/config.hin
26 {gsub(/^#if HAVE_SETMODE_DOS/,"#if defined(HAVE_SETMODE_DOS) \\&\\& !(defined(BSD) \\&\\& BSD >= 199306) \\&\\& !defined(__INTERIX)");print $$0; next; } \ 27 echo "#endif" >> ${WRKSRC}/config.hin
27 {print $$0;}' \ 28.endfor
28 < ${WRKSRC}/src/pch.c.orig \ 
29 > ${WRKSRC}/src/pch.c 
30 29
31SYMLINKS = bin/gpatch ${PKGGNUDIR}bin/patch \ 30SYMLINKS = bin/gpatch ${PKGGNUDIR}bin/patch \
32 man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1 31 man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1
33post-install: 32post-install:
34.for o n in ${SYMLINKS} 33.for o n in ${SYMLINKS}
35 ${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n} 34 ${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n}
36.endfor 35.endfor
37 36
38.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"