1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00

Fix build on FreeBSD 9 (and earlier)

While here, merge another patch from files to makefile to avoid
patching the same file from multiple locations

PR:		 ports/191643
Submitted by:	 Dan Lukes
This commit is contained in:
Johan van Selst 2014-07-06 09:28:30 +00:00
parent fa7348cd08
commit bd1b08fbd2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=360866
2 changed files with 4 additions and 17 deletions

View File

@ -31,8 +31,10 @@ post-extract:
@cd ${WRKSRC} && ${RM} -f .depend
post-patch:
@${REINPLACE_CMD} '/^CC=/d; /^CFLAGS=/s/=/+=/' \
${WRKSRC}/Makefile ${WRKSRC}/bdb/Makefile
@${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \
-e '/^install/,$$s/\$$\((PREFIX|MANDIR)\)/$$(DESTDIR)&/' \
-e '/patch/s/-p 0/-p0/' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile
pre-build:
@cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep

View File

@ -1,15 +0,0 @@
--- Makefile.orig 2012-10-07 19:59:39.000000000 +0000
+++ Makefile
@@ -126,10 +126,8 @@ keyMerge.cmx: keyMerge.ml
# Special targets
install:
- mkdir -p $(PREFIX)/bin
- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
- mkdir -p $(MANDIR)/man8
- install sks.8.gz $(MANDIR)/man8
+ install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
+ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
install.bc:
mkdir -p $(PREFIX)/bin