diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2017-06-29 10:55:30 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2017-06-29 10:55:30 +0000 |
| commit | 20bbff0aea87cd1a15105a20404d1d9bb4e86daa (patch) | |
| tree | ce46ecbaa5723c720aec6861a0a01b7ea62235c6 /irc/bitlbee | |
| parent | e3357f24cbf0689b0e6ea8c8a05b300a6df357cf (diff) | |
| download | ports-20bbff0aea87cd1a15105a20404d1d9bb4e86daa.tar.gz ports-20bbff0aea87cd1a15105a20404d1d9bb4e86daa.zip | |
Add patches missed on last commit and fix build without python
Notes
Notes:
svn path=/head/; revision=444642
Diffstat (limited to 'irc/bitlbee')
| -rw-r--r-- | irc/bitlbee/Makefile | 2 | ||||
| -rw-r--r-- | irc/bitlbee/files/patch-configure | 18 | ||||
| -rw-r--r-- | irc/bitlbee/files/patch-doc_Makefile | 10 |
3 files changed, 29 insertions, 1 deletions
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index c5a4d19bfd00..2f43a5f143ef 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -2,7 +2,7 @@ PORTNAME= bitlbee PORTVERSION= 3.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ LOCAL/brix diff --git a/irc/bitlbee/files/patch-configure b/irc/bitlbee/files/patch-configure new file mode 100644 index 000000000000..adc8931b7321 --- /dev/null +++ b/irc/bitlbee/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig 2017-01-30 20:45:59 UTC ++++ configure +@@ -743,15 +743,7 @@ if [ -z "$PYTHON" ]; then + fi + + if [ "$doc" = "1" ]; then +- # check this here just in case someone tries to install it in python2.4... +- if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then +- echo +- echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs' +- echo "(Use the PYTHON environment variable if it's in a weird location)" +- exit 1 +- fi + echo "DOC=1" >> Makefile.settings +- echo "PYTHON=$PYTHON" >> Makefile.settings + fi + + get_version diff --git a/irc/bitlbee/files/patch-doc_Makefile b/irc/bitlbee/files/patch-doc_Makefile new file mode 100644 index 000000000000..f41a7cd49b59 --- /dev/null +++ b/irc/bitlbee/files/patch-doc_Makefile @@ -0,0 +1,10 @@ +--- doc/Makefile.orig 2017-01-30 20:45:59 UTC ++++ doc/Makefile +@@ -4,7 +4,6 @@ _SRCDIR_ := $(_SRCDIR_)doc/ + endif + + all: +- $(MAKE) -C user-guide + + install: + mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ |