diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2007-10-29 20:18:43 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2007-10-29 20:18:43 +0000 |
| commit | 4d0b7f10301e6837f305d89aeae3f6ce6f9c24b3 (patch) | |
| tree | 9d972bf9f017f91390c853b1b1021a5be922db8d /sysutils | |
| parent | Register avr-libc-devel as a conflicting port. (diff) | |
Avoid make.conf namespace collisions.
Submitted by: Pietro Cerutti <gahr@gahr.ch>
Notes
Notes:
svn path=/head/; revision=202349
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/screen/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-doc_Makefile.in | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 5b096ef37a87..42ffb9bd63a0 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -31,16 +31,14 @@ NO_PACKAGE= Tends to loop using 100% CPU when used from package - perhaps it har GNU_CONFIGURE= yes .if defined(WITH_MAN) MAN1= screen.1 -.else -MAKE_ARGS+= -DNO_MAN +MAKE_ARGS+= -DWITH_MAN .endif .if defined(WITH_INFO) .if !exists(/usr/bin/install-info) RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo .endif INFO= screen -.else -MAKE_ARGS+= -DNO_INFO +MAKE_ARGS+= -DWITH_INFO .endif .if ${ARCH} == "alpha" diff --git a/sysutils/screen/files/patch-doc_Makefile.in b/sysutils/screen/files/patch-doc_Makefile.in index 8ed59df576d2..a20134f212fc 100644 --- a/sysutils/screen/files/patch-doc_Makefile.in +++ b/sysutils/screen/files/patch-doc_Makefile.in @@ -1,18 +1,18 @@ ---- doc/Makefile.in.orig 2007-07-30 17:16:19.000000000 +0200 -+++ doc/Makefile.in 2007-07-30 17:18:14.000000000 +0200 +--- doc/Makefile.in.orig 2007-10-29 13:08:52.000000000 -0700 ++++ doc/Makefile.in 2007-10-29 13:11:09.000000000 -0700 @@ -30,7 +30,10 @@ - $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info + $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info install: installdirs -+.if !defined(NO_MAN) ++.if defined(WITH_MAN) $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 +.endif -+.if !defined(NO_INFO) ++.if defined(WITH_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; \ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ else true; fi; \ fi +.endif @@ -23,10 +23,10 @@ installdirs: - $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) -+.if !defined(NO_MAN) ++.if defined(WITH_MAN) + $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 +.endif -+.if !defined(NO_INFO) ++.if defined(WITH_INFO) + $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) +.endif |