diff options
| author | tnn <tnn> | 2015-02-20 07:09:19 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-02-20 07:09:19 +0000 |
| commit | 5c81420ab4a3e4417f48beac03bc7b9efe8343d4 (patch) | |
| tree | a3b6d80f24864309ca593342b661d0d4f5c600e4 /devel/patch | |
| parent | 8a4112942a19576999b2112ab3ecf0ecd4ad6e29 (diff) | |
| download | pkgsrc-5c81420ab4a3e4417f48beac03bc7b9efe8343d4.tar.gz | |
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.
Diffstat (limited to 'devel/patch')
| -rw-r--r-- | devel/patch/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/devel/patch/Makefile b/devel/patch/Makefile index f643a059a2e..1b1c7190e93 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/02/08 09:29:43 mef Exp $ +# $NetBSD: Makefile,v 1.42 2015/02/20 07:09:19 tnn Exp $ DISTNAME= patch-2.7.4 CATEGORIES= devel @@ -16,17 +16,16 @@ USE_TOOLS+= awk .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --program-prefix=g +CONFIGURE_ENV+= ac_cv_func_setmode_dos=no # Fix for Interix (and old bsd?) INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1 do-patch: - ${MV} ${WRKSRC}/src/pch.c ${WRKSRC}/src/pch.c.orig - ${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\ - /^#if HAVE_SETMODE_DOS/ \ - {gsub(/^#if HAVE_SETMODE_DOS/,"#if defined(HAVE_SETMODE_DOS) \\&\\& !(defined(BSD) \\&\\& BSD >= 199306) \\&\\& !defined(__INTERIX)");print $$0; next; } \ - {print $$0;}' \ - < ${WRKSRC}/src/pch.c.orig \ - > ${WRKSRC}/src/pch.c +.for stdhdr in sys/param.h sys/stat.h string.h + echo "#ifdef HAVE_${stdhdr:tu:C,[/.],_,g}" >> ${WRKSRC}/config.hin + echo "#include <${stdhdr}>" >> ${WRKSRC}/config.hin + echo "#endif" >> ${WRKSRC}/config.hin +.endfor SYMLINKS = bin/gpatch ${PKGGNUDIR}bin/patch \ man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1 |