From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 11 18:30:06 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4D55616A41F for ; Wed, 11 Jul 2007 18:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 16EC313C45E for ; Wed, 11 Jul 2007 18:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l6BIU5od000299 for ; Wed, 11 Jul 2007 18:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l6BIU4Zj000294; Wed, 11 Jul 2007 18:30:04 GMT (envelope-from gnats) Resent-Date: Wed, 11 Jul 2007 18:30:04 GMT Resent-Message-Id: <200707111830.l6BIU4Zj000294@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pedro F. Giffuni" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C108D16A468 for ; Wed, 11 Jul 2007 18:25:36 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id A53FD13C483 for ; Wed, 11 Jul 2007 18:25:36 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l6BIPaBh005120 for ; Wed, 11 Jul 2007 18:25:36 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l6BIPa6l005119; Wed, 11 Jul 2007 18:25:36 GMT (envelope-from nobody) Message-Id: <200707111825.l6BIPa6l005119@www.freebsd.org> Date: Wed, 11 Jul 2007 18:25:36 GMT From: "Pedro F. Giffuni" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/114507: Cleanup x11-toolkits/xview X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 18:30:06 -0000 >Number: 114507 >Category: ports >Synopsis: Cleanup x11-toolkits/xview >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 11 18:30:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.2-Release >Organization: >Environment: FreeBSD kakumen.cable.net.co 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Sat Jun 30 14:14:28 COT 2007 root@kakumen.cable.net.co:/usr/src/sys/amd64/compile/SMP amd64 >Description: Cleanup the PREFIX/X11BASE reinplacing in this port. No functional change. >How-To-Repeat: The port was patching /usr/lib --> /usr/X11R6/lib and then replacing all occurrences of X11BASE to PREFIX. It's a lot cleaner to remove all prefix changing patches and directly change /usr/lib to $PREFIX/lib with reinplace. >Fix: patch: diff -ruN xview.orig/Makefile xview/Makefile --- xview.orig/Makefile Sat Jun 30 18:45:20 2007 +++ xview/Makefile Sat Jun 30 21:24:17 2007 @@ -28,35 +28,27 @@ ALL_TARGET= World SUB_FILES= pkg-message -X11BASE2FIX= clients/olwm/screen.c clients/olwmslave/help_file.c \ - lib/libxview/help/help_file.c lib/libxview/misc/gettext.h \ - lib/libxview/textsw/txt_e_menu.c - MAN1= xview.1 +X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ + lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c + .include -post-patch: - @${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \ +pre-configure: + @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+;' \ ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl @${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c - @${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \ - ${WRKSRC}/clients/olwmslave/help_file.c \ - ${WRKSRC}/lib/libxview/help/help_file.c \ - ${WRKSRC}/lib/libxview/misc/gettext.h \ - ${WRKSRC}/lib/libxview/textsw/txt_e_menu.c + ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ + ${X11BASE2FIX:C|^|${WRKSRC}/|} @${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \ ${WRKSRC}/util/Imakefile - -pre-configure: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\ s|^/\*\*/#*|XCOMM |' - ${REINPLACE_CMD} -e 's+/usr/X11R6+${X11BASE}+' \ - ${X11BASE2FIX:C|^|${WRKSRC}/|} post-install: .if !defined{NOPORTDOCS} diff -ruN xview.orig/files/patch-clients+olwm+screen.c xview/files/patch-clients+olwm+screen.c --- xview.orig/files/patch-clients+olwm+screen.c Sat Jun 30 18:45:20 2007 +++ xview/files/patch-clients+olwm+screen.c Sat Jun 30 19:44:35 2007 @@ -1,5 +1,5 @@ --- clients/olwm/screen.c.orig Tue Jun 29 00:11:56 1993 -+++ clients/olwm/screen.c Fri Oct 17 15:18:34 2003 ++++ clients/olwm/screen.c Sat Jun 30 19:34:43 2007 @@ -111,6 +111,12 @@ static XrmQuark stippledRubberBandsCQ; static XrmQuark stippledRubberBandsIQ; @@ -21,21 +21,3 @@ return True; /*NOTREACHED*/ break; -@@ -460,7 +467,7 @@ - * Construct bitmap search path as follows: - * $OPENWINHOME/etc/workspace/patterns - * $OPENWINHOME/include/X11/include/bitmaps -- * /usr/X11/include/X11/include/bitmaps -+ * /usr/X11R6/include/X11/include/bitmaps - * - * REMIND: this should be cleaned up so that it doesn't use a fixed-size - * array. -@@ -483,7 +490,7 @@ - (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); - bitmapSearchPath[i++] = MemNewString(bmPath); - -- bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps"); -+ bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps"); - - bitmapSearchPath[i] = (char *)NULL; - } diff -ruN xview.orig/files/patch-config+XView.cf xview/files/patch-config+XView.cf --- xview.orig/files/patch-config+XView.cf Sat Jun 30 18:45:20 2007 +++ xview/files/patch-config+XView.cf Sat Jun 30 20:55:40 2007 @@ -5,7 +5,7 @@ */ #ifndef XVDestDir -#define XVDestDir /usr/X11/xview -+#define XVDestDir /usr/X11R6 ++#define XVDestDir /usr/local #endif /* * Command to add object modules to the library. diff -ruN xview.orig/files/patch-lib+libxview+textsw+txt_e_menu.c xview/files/patch-lib+libxview+textsw+txt_e_menu.c --- xview.orig/files/patch-lib+libxview+textsw+txt_e_menu.c Sat Jun 30 18:45:20 2007 +++ xview/files/patch-lib+libxview+textsw+txt_e_menu.c Sat Jun 30 20:14:13 2007 @@ -1,14 +1,5 @@ ---- lib/libxview/textsw/txt_e_menu.c.orig Thu Oct 5 19:18:11 2006 -+++ lib/libxview/textsw/txt_e_menu.c Thu Oct 5 20:03:45 2006 -@@ -19,7 +19,7 @@ - * 3. $(HOME)/.text_extras_menu{.} (home dir), - * 4. locale sensitive system default - * ("$OPENWINHOME/lib/locale//XView/.text_extras_menu") -- * 4. fall back to SunView1 ("/usr/lib/.text_extras_menu") -+ * 4. fall back to SunView1 ("/usr/X11R6/lib/.text_extras_menu") - * - * Always try locale specific name first, if not there, try without - * locale name. In the #4, we will fall back to the "C" locale. +--- lib/libxview/textsw/txt_e_menu.c.orig Tue Jun 29 00:17:42 1993 ++++ lib/libxview/textsw/txt_e_menu.c Sat Jun 30 20:13:46 2007 @@ -76,6 +76,8 @@ static int Nargs; static char *check_filename_locale(); @@ -18,7 +9,7 @@ extern int EXTRASMENU_FILENAME_KEY; Pkg_private char * -@@ -138,15 +140,22 @@ +@@ -138,10 +140,17 @@ #ifdef notdef /* Gee, still?... We will try the old fashioned way */ @@ -36,9 +27,3 @@ #endif } - /* Giving up, try with ancient way (SunView1) */ -- (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU); -+ (void) sprintf(tmp, "/usr/X11R6/lib/.%s", EXTRASMENU); - result = xv_strsave(tmp); - - found: >Release-Note: >Audit-Trail: >Unformatted: