Attachment #79742 for bug #114507

View | Details | Raw Unified | Return to bug 114507
Collapse All | Expand All




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 <bsd.port.pre.mk>

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+'	\
		${X11BASE2FIX:C|^|${WRKSRC}/|}
	  ${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,^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}




--- clients/olwm/screen.c.orig	Tue Jun 29 00:11:56 1993
+++ clients/olwm/screen.c	Sat Jun 30 19:34:43 2007
@@ -111,6 +111,12 @@
 static XrmQuark stippledRubberBandsCQ;
 static XrmQuark stippledRubberBandsIQ;

 		    		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;
 }

Lines 5-11 Link Here

(-)xview/files/patch-config+XView.cf (-1 / +1 lines)
5	*/	5	*/
6	#ifndef XVDestDir	6	#ifndef XVDestDir
7	-#define XVDestDir /usr/X11/xview	7	-#define XVDestDir /usr/X11/xview
8	+#define XVDestDir /usr/X11R6	8	+#define XVDestDir /usr/local
9	#endif	9	#endif
10	/*	10	/*
11	* Command to add object modules to the library.	11	* Command to add object modules to the library.




--- 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
@@ -19,7 +19,7 @@
  *  3. $(HOME)/.text_extras_menu{.<locale>} (home dir),
  *  4. locale sensitive system default
  *		("$OPENWINHOME/lib/locale/<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.
@@ -76,6 +76,8 @@
 static	int      Nargs;
 static	char	*check_filename_locale();

 extern int      EXTRASMENU_FILENAME_KEY;
 
 Pkg_private char *
@@ -138,10 +140,17 @@
 
 #ifdef notdef
 	/* Gee, still?... We will try the old fashioned way */

 #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:

Return to bug 114507

Lines 28-62 Link Here

(-)xview/Makefile (-15 / +7 lines)
28	ALL_TARGET= World	28	ALL_TARGET= World
29	SUB_FILES= pkg-message	29	SUB_FILES= pkg-message
30		30
31	X11BASE2FIX= clients/olwm/screen.c clients/olwmslave/help_file.c \
32	lib/libxview/help/help_file.c lib/libxview/misc/gettext.h \
33	lib/libxview/textsw/txt_e_menu.c
34
35	MAN1= xview.1	31	MAN1= xview.1
36		32
		33	X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \
		34	lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c
		35
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
39	post-patch:	38	pre-configure:
40	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \	39	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+;' \
41	${WRKSRC}/config/XView.cf	40	${WRKSRC}/config/XView.cf
42	@${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \	41	@${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \
43	${WRKSRC}/config/XView.tmpl	42	${WRKSRC}/config/XView.tmpl
44	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \	43	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \
45	${WRKSRC}/clients/olwm/screen.c	44	${WRKSRC}/clients/olwm/screen.c
46	@${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \	45	${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \
47	${WRKSRC}/clients/olwmslave/help_file.c \	46	${X11BASE2FIX:C\|^\|${WRKSRC}/\|}
48	${WRKSRC}/lib/libxview/help/help_file.c \
49	${WRKSRC}/lib/libxview/misc/gettext.h \
50	${WRKSRC}/lib/libxview/textsw/txt_e_menu.c
51	@${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \	47	@${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \
52	${WRKSRC}/util/Imakefile	48	${WRKSRC}/util/Imakefile
53
54	pre-configure:
55	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${REINPLACE_CMD} -e \	49	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${REINPLACE_CMD} -e \
56	's\|^#endif.$$\|#endif\|;s\|^#else.$$\|#else\|;\	50	's\|^#endif.$$\|#endif\|;s\|^#else.$$\|#else\|;\
57	s\|^/\\/#*\|XCOMM \|'	51	s\|^/\\/#*\|XCOMM \|'
58	${REINPLACE_CMD} -e 's+/usr/X11R6+${X11BASE}+' \
59	${X11BASE2FIX:C\|^\|${WRKSRC}/\|}
60		52
61	post-install:	53	post-install:
62	.if !defined{NOPORTDOCS}	54	.if !defined{NOPORTDOCS}

Lines 1-5 Link Here

(-)xview/files/patch-clients+olwm+screen.c (-19 / +1 lines)
1	--- clients/olwm/screen.c.orig Tue Jun 29 00:11:56 1993	1	--- clients/olwm/screen.c.orig Tue Jun 29 00:11:56 1993
2	+++ clients/olwm/screen.c Fri Oct 17 15:18:34 2003	2	+++ clients/olwm/screen.c Sat Jun 30 19:34:43 2007
3	@@ -111,6 +111,12 @@	3	@@ -111,6 +111,12 @@
4	static XrmQuark stippledRubberBandsCQ;	4	static XrmQuark stippledRubberBandsCQ;
5	static XrmQuark stippledRubberBandsIQ;	5	static XrmQuark stippledRubberBandsIQ;
Lines 21-41 Link Here
21	return True;	21	return True;
22	/NOTREACHED/	22	/NOTREACHED/
23	break;	23	break;
24	@@ -460,7 +467,7 @@
25	* Construct bitmap search path as follows:
26	* $OPENWINHOME/etc/workspace/patterns
27	* $OPENWINHOME/include/X11/include/bitmaps
28	- * /usr/X11/include/X11/include/bitmaps
29	+ * /usr/X11R6/include/X11/include/bitmaps
30	*
31	* REMIND: this should be cleaned up so that it doesn't use a fixed-size
32	* array.
33	@@ -483,7 +490,7 @@
34	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
35	bitmapSearchPath[i++] = MemNewString(bmPath);
36
37	- bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
38	+ bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps");
39
40	bitmapSearchPath[i] = (char *)NULL;
41	}

Lines 1-14 Link Here

(-)xview/files/patch-lib+libxview+textsw+txt_e_menu.c (-18 / +3 lines)
1	--- lib/libxview/textsw/txt_e_menu.c.orig Thu Oct 5 19:18:11 2006	1	--- lib/libxview/textsw/txt_e_menu.c.orig Tue Jun 29 00:17:42 1993
2	+++ lib/libxview/textsw/txt_e_menu.c Thu Oct 5 20:03:45 2006	2	+++ lib/libxview/textsw/txt_e_menu.c Sat Jun 30 20:13:46 2007
3	@@ -19,7 +19,7 @@
4	* 3. $(HOME)/.text_extras_menu{.<locale>} (home dir),
5	* 4. locale sensitive system default
6	* ("$OPENWINHOME/lib/locale/<locale>/XView/.text_extras_menu")
7	- * 4. fall back to SunView1 ("/usr/lib/.text_extras_menu")
8	+ * 4. fall back to SunView1 ("/usr/X11R6/lib/.text_extras_menu")
9	*
10	* Always try locale specific name first, if not there, try without
11	* locale name. In the #4, we will fall back to the "C" locale.
12	@@ -76,6 +76,8 @@	3	@@ -76,6 +76,8 @@
13	static int Nargs;	4	static int Nargs;
14	static char *check_filename_locale();	5	static char *check_filename_locale();
Lines 18-24 Link Here
18	extern int EXTRASMENU_FILENAME_KEY;	9	extern int EXTRASMENU_FILENAME_KEY;
19		10
20	Pkg_private char *	11	Pkg_private char *
21	@@ -138,15 +140,22 @@	12	@@ -138,10 +140,17 @@
22		13
23	#ifdef notdef	14	#ifdef notdef
24	/* Gee, still?... We will try the old fashioned way */	15	/* Gee, still?... We will try the old fashioned way */
Lines 36-44 Link Here
36	#endif	27	#endif
37	}	28	}
38		29
39	/* Giving up, try with ancient way (SunView1) */
40	- (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU);
41	+ (void) sprintf(tmp, "/usr/X11R6/lib/.%s", EXTRASMENU);
42	result = xv_strsave(tmp);
43
44	found: