Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Dec 2000 04:01:48 +0900 (JST)
From:      k5@cheerful.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/23444: fix: x11/tycoon X manpage error with XFree86-4 
Message-ID:  <20001210190148.2B61C5EC4@kyoto-tc012-p22.alpha-net.ne.jp>
Resent-Message-ID: <200012101910.eBAJA1b18751@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         23444
>Category:       ports
>Synopsis:       fix: x11/tycoon X manpage error with XFree86-4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 10 11:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     FUJISHIMA Satsuki
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
N/A
>Environment:
	ports-current with XFree86-4.
>Description:
	fixing "X manpage" error with XFree86-4 on bento.
	MAINTAINER does not have FreeBSD machine anymore, so pass this port
	to ports@FreeBSD.org.

>How-To-Repeat:
	w3m -dump http://bento.freebsd.org/errorlogs/errorlogs/e.4.20001204/ \|
	grep 'X manpage'
>Fix:

	pre-install -> build-install to make reinstall target working.

diff -urN -xCVS /usr/ports/x11/tycoon/Makefile x11/tycoon/Makefile
--- /usr/ports/x11/tycoon/Makefile	Thu Aug  3 18:28:44 2000
+++ x11/tycoon/Makefile	Wed Nov  1 08:33:11 2000
@@ -17,9 +17,10 @@
 
 USE_IMAKE=	yes
 USE_XPM=	yes
-NO_INSTALL_MANPAGES=	yes
 
-pre-install:
-	@cd ${WRKSRC}/xbackdrop/backdrops; ${MV} index index.orig; ${SED} -e 's,/usr/lib,${PREFIX}/lib,' index.orig > index; ${RM} index.orig index~
+post-build:
+	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ ;\
+	${PERL} -pi -e 's,/usr/lib,${PREFIX}/lib,' \
+		${WRKSRC}/xbackdrop/backdrops/index
 
 .include <bsd.port.mk>
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-aa x11/tycoon/files/patch-aa
--- /usr/ports/x11/tycoon/files/patch-aa	Mon Nov 24 14:02:45 1997
+++ x11/tycoon/files/patch-aa	Wed Nov  1 08:13:36 2000
@@ -1,5 +1,5 @@
---- ./xprompt/Imakefile.orig	Thu Sep 18 23:49:06 1997
-+++ ./xprompt/Imakefile	Fri Sep 19 00:05:45 1997
+--- xprompt/Imakefile.orig	Thu Jun 29 12:48:41 1995
++++ xprompt/Imakefile	Wed Nov  1 08:13:28 2000
 @@ -2,14 +2,14 @@
  SRCS = xprompt.c xprompt_cb.c xprompt_main.c
  OBJS = xprompt.o xprompt_cb.o xprompt_main.o
@@ -19,4 +19,5 @@
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
- ComplexProgramTarget(xprompt)
+-ComplexProgramTarget(xprompt)
++ComplexProgramTargetNoMan(xprompt)
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-ab x11/tycoon/files/patch-ab
--- /usr/ports/x11/tycoon/files/patch-ab	Mon Nov 24 14:02:45 1997
+++ x11/tycoon/files/patch-ab	Wed Nov  1 08:20:19 2000
@@ -1,6 +1,6 @@
---- ./tycoon/Imakefile.orig	Thu Sep 18 23:46:15 1997
-+++ ./tycoon/Imakefile	Thu Sep 18 23:47:03 1997
-@@ -26,8 +26,8 @@
+--- tycoon/Imakefile.orig	Fri Jun 14 03:20:52 1996
++++ tycoon/Imakefile	Wed Nov  1 08:18:43 2000
+@@ -26,10 +26,10 @@
  VERSION=1.07o
  SRCS = wiconsh.c blip.c tycoon.c main.c DragAndDrop.c menu.c
  OBJS = wiconsh.o blip.o tycoon.o main.o DragAndDrop.o menu.o
@@ -11,3 +11,6 @@
  EXTRA_DEFINES = -DVERSION=\"$(VERSION)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(XAWLIB) $(XMULIB) \
  	$(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) 
+ 
+-ComplexProgramTarget(tycoon)
++ComplexProgramTargetNoMan(tycoon)
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-ac x11/tycoon/files/patch-ac
--- /usr/ports/x11/tycoon/files/patch-ac	Mon Nov 24 14:02:45 1997
+++ x11/tycoon/files/patch-ac	Wed Nov  1 08:19:23 2000
@@ -1,5 +1,5 @@
---- xbackdrop/Imakefile.orig	Sat Mar  9 05:41:13 1996
-+++ xbackdrop/Imakefile	Sun Nov 23 20:36:15 1997
+--- xbackdrop/Imakefile.orig	Sat Mar  9 22:41:13 1996
++++ xbackdrop/Imakefile	Wed Nov  1 08:19:17 2000
 @@ -1,24 +1,28 @@
 -XBACKDROP_DIR = /usr/lib/X11/backdrops
 +XCOMM
@@ -24,7 +24,8 @@
  EXTRA_DEFINES =  -DXBACKDROP_DIR=\"$(XBACKDROP_DIR)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
- ComplexProgramTarget(xbackdrop)
+-ComplexProgramTarget(xbackdrop)
++ComplexProgramTargetNoMan(xbackdrop)
  
 -install::	xbackdrop                                                  @@\
 +install::	xbackdrop                                            @@\
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-ad x11/tycoon/files/patch-ad
--- /usr/ports/x11/tycoon/files/patch-ad	Mon Nov 24 14:02:46 1997
+++ x11/tycoon/files/patch-ad	Wed Nov  1 08:12:52 2000
@@ -1,5 +1,5 @@
---- ./xchooser/Imakefile.orig	Fri Sep 19 00:02:41 1997
-+++ ./xchooser/Imakefile	Fri Sep 19 00:04:39 1997
+--- xchooser/Imakefile.orig	Sun Oct 15 19:06:15 1995
++++ xchooser/Imakefile	Wed Nov  1 08:12:46 2000
 @@ -2,14 +2,14 @@
  SRCS = xchooser.c xchooser_cb.c xchooser_main.c
  OBJS = xchooser.o xchooser_cb.o xchooser_main.o
@@ -14,9 +14,10 @@
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
-+EXTRA_INCLUDES  = -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
++EXTRA_INCLUDES  = -I.
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
- ComplexProgramTarget(xchooser)
+-ComplexProgramTarget(xchooser)
++ComplexProgramTargetNoMan(xchooser)
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-ae x11/tycoon/files/patch-ae
--- /usr/ports/x11/tycoon/files/patch-ae	Mon Nov 24 14:02:46 1997
+++ x11/tycoon/files/patch-ae	Wed Nov  1 08:18:38 2000
@@ -1,15 +1,16 @@
---- ./fclock/Imakefile.orig	Thu Sep 18 23:52:13 1997
-+++ ./fclock/Imakefile	Thu Sep 18 23:52:46 1997
+--- fclock/Imakefile.orig	Tue Sep 26 20:53:47 1995
++++ fclock/Imakefile	Wed Nov  1 08:18:31 2000
 @@ -1,9 +1,9 @@
  
  SRCS =  clock_main.c
  OBJS =  clock_main.o
 -EXTRA_LIBRARIES  = -L/usr/local/lib -lforms -lXpm -lm
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
 -EXTRA_INCLUDES  = -I/usr/local/include -I.
-+EXTRA_INCLUDES  = -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
++EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_INCLUDES  = -I.
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
- ComplexProgramTarget(fclock)
+-ComplexProgramTarget(fclock)
++ComplexProgramTargetNoMan(fclock)
diff -urN -xCVS /usr/ports/x11/tycoon/files/patch-af x11/tycoon/files/patch-af
--- /usr/ports/x11/tycoon/files/patch-af	Mon Nov 24 14:02:46 1997
+++ x11/tycoon/files/patch-af	Wed Nov  1 08:11:56 2000
@@ -1,5 +1,5 @@
---- tyman/Imakefile.orig	Thu Sep 18 23:53:43 1997
-+++ tyman/Imakefile	Fri Sep 19 00:07:48 1997
+--- tyman/Imakefile.orig	Fri Mar  1 22:37:02 1996
++++ tyman/Imakefile	Wed Nov  1 08:11:48 2000
 @@ -2,14 +2,14 @@
  SRCS = tyman.c tyman_cb.c tyman_main.c
  OBJS = tyman.o tyman_cb.o tyman_main.o
@@ -14,9 +14,10 @@
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
-+EXTRA_INCLUDES  = -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
++EXTRA_INCLUDES  = -I.
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
- ComplexProgramTarget(tyman)
+-ComplexProgramTarget(tyman)
++ComplexProgramTargetNoMan(tyman)

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001210190148.2B61C5EC4>