summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Araujo <araujo@FreeBSD.org>2017-03-26 08:54:10 +0000
committerMarcelo Araujo <araujo@FreeBSD.org>2017-03-26 08:54:10 +0000
commitc942102b2a7006d0aee652963ecb6b1588d94091 (patch)
treef443b7d012d9bd5bc06aefb761b73268e5f99056
parentRevert upgrade to 1.3.2 and require exp-run for future upgrades, this (diff)
- Restore PORTEPOCH mistakenly removed in my previous commit. [1]
- Add the right path to system headers. - We need PERL5 configure. Reported by: vanilla@ [1]
-rw-r--r--devel/bglibs/Makefile3
-rw-r--r--devel/bglibs/files/patch-Makefile9
2 files changed, 11 insertions, 1 deletions
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index 4f5bf1a7ab35..35c5b8f2d47a 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bglibs
PORTVERSION= 2.03
+PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ \
http://untroubled.org/${PORTNAME}/
@@ -14,7 +15,7 @@ LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool:build perl5
-USE_PERL5= run
+USE_PERL5= run configure
BGLIBS_INC= ${PREFIX}/include/${PORTNAME}
BGLIBS_LIB= ${PREFIX}/lib/${PORTNAME}
USE_LDCONFIG= ${BGLIBS_LIB}
diff --git a/devel/bglibs/files/patch-Makefile b/devel/bglibs/files/patch-Makefile
index 36cb6670a93d..900d23604c37 100644
--- a/devel/bglibs/files/patch-Makefile
+++ b/devel/bglibs/files/patch-Makefile
@@ -29,6 +29,15 @@
bg-installer.o: compile bg-installer.c sysdeps.h include/bglibs/cli.h include/bglibs/fmt.h include/bglibs/ibuf.h include/bglibs/iobuf_common.h include/bglibs/obuf.h sysdeps.h include/iobuf_common.h include/bglibs/iobuf.h include/ibuf.h include/obuf.h sysdeps.h include/bglibs/msg.h sysdeps.h include/bglibs/debug.h include/bglibs/wrap.h include/bglibs/path.h include/bglibs/str.h sysdeps.h include/str.h sysdeps.h include/bglibs/striter.h bg-installer-cli.h
./compile bg-installer.c
+@@ -152,7 +152,7 @@ compile: conf-cc
+ ( echo '#!/bin/sh'; \
+ echo 'source=$$1; shift'; \
+ echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+- echo exec `head -n 1 conf-cc` -I. "-I'include/bglibs'" "-I'include'" '-o $${base}.o -c $$source $${1+"$$@"}'; \
++ echo exec `head -n 1 conf-cc` -I. "-I'include/bglibs'" "-I'/usr/local/include'" '-o $${base}.o -c $$source $${1+"$$@"}'; \
+ ) >compile
+ chmod 755 compile
+
@@ -864,7 +864,7 @@ path/mktemp.lo path/mktemp.o: ltcompile
perl-head.pl: