From bkoenig@alpha-tierchen.de  Mon Jul 30 16:16:27 2007
Return-Path: <bkoenig@alpha-tierchen.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25BB916A4C7
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jul 2007 16:16:27 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203])
	by mx1.freebsd.org (Postfix) with ESMTP id AB38413C45D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jul 2007 16:16:26 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from mail.liberty-hosting.de ([195.225.132.203])
 by localhost (liberty-mail [195.225.132.203]) (amavisd-new, port 10024)
 with ESMTP id 79557-09; Mon, 30 Jul 2007 18:19:00 +0200 (CEST)
Received: from home.alpha-tierchen.de (port-212-202-42-202.dynamic.qsc.de [212.202.42.202])
	by mail.liberty-hosting.de (Postfix) with ESMTP id AFF593E94CB;
	Mon, 30 Jul 2007 18:19:00 +0200 (CEST)
Received: by home.alpha-tierchen.de (Postfix, from userid 2000)
	id DFA2E45068; Mon, 30 Jul 2007 18:16:20 +0200 (CEST)
Message-Id: <20070730161620.DFA2E45068@home.alpha-tierchen.de>
Date: Mon, 30 Jul 2007 18:16:20 +0200 (CEST)
From: Bjrn Knig <bkoenig@cs.tu-berlin.de>
Reply-To: Bjrn Knig <bkoenig@cs.tu-berlin.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: cy@FreeBSD.org
Subject: sysutils/screen: install error if world compiled with NO_INFO
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         115048
>Category:       ports
>Synopsis:       sysutils/screen: install error if world compiled with NO_INFO
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    cy
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 30 16:20:01 GMT 2007
>Closed-Date:    Sun Sep 23 11:32:45 GMT 2007
>Last-Modified:  Sun Sep 23 11:40:12 GMT 2007
>Originator:     Bjrn Knig
>Release:        
>Organization:
>Environment:
>Description:
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.                                                                                                                      
>How-To-Repeat:
>Fix:

	

--- patch-ports_sysutils_screen.diff begins here ---
diff -ruN ports/sysutils/screen.orig/Makefile ports/sysutils/screen/Makefile
--- ports/sysutils/screen.orig/Makefile	2006-12-27 17:51:21.000000000 +0100
+++ ports/sysutils/screen/Makefile	2007-07-30 17:52:25.000000000 +0200
@@ -18,8 +18,19 @@
 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 -ruN ports/sysutils/screen.orig/files/patch-Makefile.in ports/sysutils/screen/files/patch-Makefile.in
--- ports/sysutils/screen.orig/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ ports/sysutils/screen/files/patch-Makefile.in	2007-07-30 17:52:25.000000000 +0200
@@ -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 -ruN ports/sysutils/screen.orig/files/patch-doc_Makefile.in ports/sysutils/screen/files/patch-doc_Makefile.in
--- ports/sysutils/screen.orig/files/patch-doc_Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ ports/sysutils/screen/files/patch-doc_Makefile.in	2007-07-30 17:52:25.000000000 +0200
@@ -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
--- patch-ports_sysutils_screen.diff ends here ---


>Release-Note:
>Audit-Trail:
Adding to audit trail from misfiled PR ports/115058:

Date: Mon, 30 Jul 2007 20:25:59 +0200 (CEST)
From: =?iso-8859-1?Q?Bj=F6rn_K=F6nig?= <bkoenig@alpha-tierchen.de>

 ------=_20070730202559_62491
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 This patch fixes 168 warnings.
 ------=_20070730202559_62491
 Content-Type: application/octet-stream; name="patch-screen.h"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="patch-screen.h"
 
 LS0tIHNjcmVlbi5oLm9yaWcJMjAwMy0wOC0yMiAxNDoyODo0My4wMDAwMDAwMDAgKzAyMDAKKysr
 IHNjcmVlbi5oCTIwMDctMDctMzAgMTA6MjU6NDUuMDAwMDAwMDAwICswMjAwCkBAIC0yMiw2ICsy
 Miw4IEBACiAgKiAkSWQ6IHNjcmVlbi5oLHYgMS4xMiAxOTk0LzA1LzMxIDEyOjMyOjU0IG1sc2No
 cm9lIEV4cCAkIEZBVQogICovCiAKKyNpbmNsdWRlIDxzdHJpbmcuaD4KKwogI2luY2x1ZGUgIm9z
 LmgiCiAKICNpZiBkZWZpbmVkKF9fU1REQ19fKQo=
 ------=_20070730202559_62491--
Responsible-Changed-From-To: freebsd-ports-bugs->cy 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Thu Aug 2 10:17:31 UTC 2007 
Responsible-Changed-Why:  
Assigne it to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115048 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Sep 23 11:32:42 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115048 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115048: commit references a PR
Date: Sun, 23 Sep 2007 11:32:43 +0000 (UTC)

 edwin       2007-09-23 11:32:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/screen      Makefile 
   Added files:
     sysutils/screen/files patch-Makefile.in patch-doc_Makefile.in 
   Log:
   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:   Bjrn Knig <bkoenig@cs.tu-berlin.de>
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.66      +11 -0     ports/sysutils/screen/Makefile
   1.1       +20 -0     ports/sysutils/screen/files/patch-Makefile.in (new)
   1.1       +34 -0     ports/sysutils/screen/files/patch-doc_Makefile.in (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115048: commit references a PR
Date: Sun, 23 Sep 2007 11:33:17 +0000 (UTC)

 edwin       2007-09-23 11:33:12 UTC
 
   FreeBSD ports repository
 
   Added files:
     sysutils/screen/files patch-screen.h 
   Log:
   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\xf6rn K\xf6nig <bkoenig@cs.tu-berlin.de>
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.1       +11 -0     ports/sysutils/screen/files/patch-screen.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
