diff options
| author | edwin <edwin@FreeBSD.org> | 2007-09-23 19:32:37 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2007-09-23 19:32:37 +0800 |
| commit | 5e43cf9bfcbd5c3c49e91e6972fa5a7365e7e422 (patch) | |
| tree | 6f1e4a2cdb917bb314dac4e1675fa9f0febd5374 | |
| parent | e0a5c3a48ef6006a14a9944cd5e9fba9eb640ee0 (diff) | |
| download | freebsd-ports-gnome-5e43cf9bfcbd5c3c49e91e6972fa5a7365e7e422.tar.gz freebsd-ports-gnome-5e43cf9bfcbd5c3c49e91e6972fa5a7365e7e422.tar.zst freebsd-ports-gnome-5e43cf9bfcbd5c3c49e91e6972fa5a7365e7e422.zip | |
sysutils/screen: install error if world compiled with NO_INFO
The program /usr/bin/install-info doesn't exist in case
the base system has been compiled with NO_INFO. This causes
an error during installation of sysutils/screen because one
of screen's make files rely on this program.
I added handling of NO_INFO (and NO_MAN by the way). I suggest
to let screen depend on print/texinfo if the user doesn't define
NO_INFO and /usr/bin/install-info doesn't exist.
PR: ports/115048
Submitted by: Björn König <bkoenig@cs.tu-berlin.de>
Approved by: maintainer timeout
| -rw-r--r-- | sysutils/screen/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-Makefile.in | 20 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-doc_Makefile.in | 34 |
3 files changed, 65 insertions, 0 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 0c59801e72a4..d6a3acb88007 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -18,8 +18,19 @@ MAINTAINER= cy@FreeBSD.org COMMENT= A multi-screen window manager GNU_CONFIGURE= yes +.if defined(NO_MAN) +MAKE_ARGS+= -DNO_MAN +.else MAN1= screen.1 +.endif +.if defined(NO_INFO) +MAKE_ARGS+= -DNO_INFO +.else +.if !exists(/usr/bin/install-info) +RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo +.endif INFO= screen +.endif NO_PACKAGE= Tends to loop using 100% CPU when used from package - perhaps it hard-codes information about the build host diff --git a/sysutils/screen/files/patch-Makefile.in b/sysutils/screen/files/patch-Makefile.in new file mode 100644 index 000000000000..d5966dc1d1ab --- /dev/null +++ b/sysutils/screen/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2007-07-30 12:38:38.000000000 +0200 ++++ Makefile.in 2007-07-30 12:39:34.000000000 +0200 +@@ -77,7 +77,7 @@ + + ############################################################################### + install: installdirs install_bin +- cd doc ; $(MAKE) install ++ cd doc ; $(MAKE) $(MAKE_ARGS) install + -if [ -d /usr/lib/terminfo ]; then \ + PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ + chmod 644 /usr/lib/terminfo/s/screen*; \ +@@ -90,7 +90,7 @@ + installdirs: + # Path leading to ETCSCREENRC and Socketdirectory not checked. + $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) +- cd doc ; $(MAKE) installdirs ++ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs + + uninstall: .version + rm -f $(DESTDIR)$(bindir)/$(SCREEN) diff --git a/sysutils/screen/files/patch-doc_Makefile.in b/sysutils/screen/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..8ed59df576d2 --- /dev/null +++ b/sysutils/screen/files/patch-doc_Makefile.in @@ -0,0 +1,34 @@ +--- doc/Makefile.in.orig 2007-07-30 17:16:19.000000000 +0200 ++++ doc/Makefile.in 2007-07-30 17:18:14.000000000 +0200 +@@ -30,7 +30,10 @@ + $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info + + install: installdirs ++.if !defined(NO_MAN) + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 ++.endif ++.if !defined(NO_INFO) + -$(MAKE) screen.info + -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ + if test -f $$d/screen.info; then \ +@@ -39,13 +42,19 @@ + install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ + else true; fi; \ + fi ++.endif + + uninstall: + rm -f $(DESTDIR)$(mandir)/man1/screen.1 + rm -f $(DESTDIR)$(infodir)/screen.info* + + installdirs: +- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) ++.if !defined(NO_MAN) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 ++.endif ++.if !defined(NO_INFO) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) ++.endif + + mostlyclean: + -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr |