mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Fix build on -CURRENT.

Browse Source
This commit is contained in:
Trevor Johnson 2002-09-25 14:58:56 +00:00
parent 6567bb1a20
commit 7f2ebf6208
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=67132
5 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-wm/uwm/Makefile
View File

@ -18,10 +18,12 @@ MAINTAINER= trevor@FreeBSD.org
MAN1= uwm.1
PLIST= ${WRKDIR}/pkg-plist
USE_IMAKE= yes
USE_REINPLACE= yes
REINPLACE_ARGS= -i'' -E
WRKSRC= ${WRKDIR}/X.V11R3/clients/uwm
post-patch:
${PERL} -pi -e 's:/usr/lib/X11:${PREFIX}/lib/X11:g' ${WRKSRC}/uwm.man
${REINPLACE_CMD} 's:/usr/lib/X11:${PREFIX}/lib/X11:g' ${WRKSRC}/uwm.man
pre-install:
${ECHO_CMD} bin/uwm > ${PLIST}

25
x11-wm/uwm/files/patch-ab
View File

@ -1,7 +1,8 @@
$FreeBSD$
$NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
--- uwm.c.orig Sun Oct 23 13:21:55 1988
+++ uwm.c Mon Oct 16 08:58:41 2000
+++ uwm.c Wed Sep 25 14:53:13 2002
@@ -41,9 +41,18 @@
#include "uwm.h"
@ -50,7 +51,15 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
#define gray_width 16
#define gray_height 16
static char gray_bits[] = {
@@ -115,6 +145,10 @@
@@ -103,7 +133,6 @@
GC gc; /* graphics context for gray background */
XImage grayimage; /* for gray background */
XGCValues xgc; /* to create font GCs */
- char *malloc();
Bool fallbackMFont = False, /* using default GC font for menus, */
fallbackPFont = False, /* popups, */
fallbackIFont = False; /* icons */
@@ -115,6 +144,10 @@
#ifdef PROFIL
signal(SIGTERM, ptrap);
#endif
@ -61,7 +70,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
/*
* Set up internal defaults.
@@ -369,7 +403,7 @@
@@ -369,7 +402,7 @@
if (IFontInfo == NULL) {
fprintf(stderr, "uwm: Unable to open icon font '%s', using server default.\n",
IFontName);
@ -70,7 +79,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
fallbackIFont = True;
}
PFontInfo = XLoadQueryFont(dpy, PFontName);
@@ -379,7 +413,7 @@
@@ -379,7 +412,7 @@
if (fallbackIFont)
PFontInfo = IFontInfo;
else
@ -79,7 +88,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
fallbackPFont = True;
}
MFontInfo = XLoadQueryFont(dpy, MFontName);
@@ -389,7 +423,7 @@
@@ -389,7 +422,7 @@
if (fallbackIFont || fallbackPFont)
MFontInfo = fallbackPFont ? PFontInfo : IFontInfo;
else
@ -88,7 +97,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
fallbackMFont = True;
}
@@ -685,7 +719,11 @@
@@ -685,7 +718,11 @@
*/
InitBindings()
{
@ -100,7 +109,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
char *tempfile; /* Temporary filename. */
register FILE *fp; /* Temporary file pointer. */
register char **ptr; /* Default bindings string array pointer. */
@@ -699,15 +737,26 @@
@@ -699,15 +736,26 @@
exit (1);
}
strcpy (tempfile, TEMPFILE);
@ -127,7 +136,7 @@ $NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
fclose(fp);
/*
@@ -717,6 +766,7 @@
@@ -717,6 +765,7 @@
perror("uwm: cannot open temp file");
exit(1);
}

44
x11-wm/uwm/files/patch-ad
View File

@ -1,8 +1,18 @@
$FreeBSD$
$NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
--- gram.y.orig Thu Sep 22 22:14:31 1988
+++ gram.y Thu Dec 23 22:04:02 1999
@@ -117,18 +117,18 @@
--- gram.y.orig Thu Sep 22 13:14:31 1988
+++ gram.y Wed Sep 25 14:48:16 2002
@@ -60,8 +60,6 @@
static char *mcolors[2]; /* Color values used in menus. */
MenuLink *menu_link; /* Temporary menu link pointer. */
-char *calloc();
-
%}
%union {
@@ -117,18 +115,18 @@
case IsString:
if ($3 == C_STRING) {
strcpy(KeywordTable[$1].sptr,
@ -25,7 +35,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
break;
case IsBoolTrue:
case IsBoolFalse:
@@ -197,12 +197,12 @@
@@ -197,12 +195,12 @@
ml_ptr = $3;
}
| STRING
@ -40,7 +50,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
switch (KeywordTable[ki].type) {
case IsBoolTrue:
*(KeywordTable[ki].bptr) = TRUE;
@@ -220,7 +220,7 @@
@@ -220,7 +218,7 @@
;
keyword: STRING {
@ -49,7 +59,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
}
;
@@ -246,9 +246,9 @@
@@ -246,9 +244,9 @@
{ $$ = CheckButtonState($1); }
;
@ -61,7 +71,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
buttmodexpr: buttmodifier
{ $$ = $1; }
@@ -257,7 +257,7 @@
@@ -257,7 +255,7 @@
;
buttmodifier: STRING
@ -70,7 +80,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
;
menuname: STRING
@@ -304,7 +304,7 @@
@@ -304,7 +302,7 @@
menuaction: STRING
{
@ -79,7 +89,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
if ((ki != -1) &&
(KeywordTable[ki].type != IsFunction) &&
(KeywordTable[ki].type != IsQuitFunction) &&
@@ -350,7 +350,7 @@
@@ -350,7 +348,7 @@
}
;
@ -88,7 +98,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
| strings STRING
{ $$ = strconcat($1, $2); }
;
@@ -387,7 +387,7 @@
@@ -387,7 +385,7 @@
}
;
@ -97,7 +107,15 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
| /* empty */ { $$ = NULL; }
;
%%
@@ -572,6 +572,8 @@
@@ -503,7 +501,6 @@
strconcat(s1, s2)
char *s1, *s2;
{
- char *malloc();
char *p;
p = malloc(strlen(s1) + strlen(s2) + 2);
@@ -572,6 +569,8 @@
setbinding(ICON, index, mask, name);
if (context & WINDOW)
setbinding(WINDOW, index, mask, name);
@ -106,7 +124,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
}
/*
@@ -599,12 +601,13 @@
@@ -599,12 +598,13 @@
char *mname; /* Pointer to menu name, if needed. */
{
Binding *ptr;
@ -121,7 +139,7 @@ $NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
switch (m & (LeftMask | MiddleMask | RightMask)) {
case LeftMask:
@@ -771,9 +774,8 @@
@@ -771,9 +771,8 @@
else {
for(ptr = list; ptr->next; ptr = ptr->next) /* NULL */;
ptr->next = link;

11
x11-wm/uwm/files/patch-aj
View File

@ -1,7 +1,8 @@
$FreeBSD$
$NetBSD: patch-aj,v 1.1 2000/01/19 07:24:07 itohy Exp $
--- Menu.c.orig Sat Oct 1 09:41:13 1988
+++ Menu.c Mon Oct 16 09:10:20 2000
+++ Menu.c Wed Sep 25 14:50:55 2002
@@ -84,6 +84,14 @@
char **oldenviron;
extern char **environ, **newenviron;
@ -31,3 +32,11 @@ $NetBSD: patch-aj,v 1.1 2000/01/19 07:24:07 itohy Exp $
return(status);
}
@@ -129,7 +140,6 @@
char *hlname; /* Pointer to hi-liter name. */
char *strbuf; /* String buffer for IsTextNL. */
Bool checkMotion = TRUE; /* To Restore Cursor Position */
- char *malloc();
int funcbutton; /* function button for window select */
/*

12
x11-wm/uwm/files/patch-lex.l Normal file
View File

@ -0,0 +1,12 @@
$FreeBSD$
--- lex.l.orig Sun Oct 23 13:20:00 1988
+++ lex.l Wed Sep 25 14:50:06 2002
@@ -81,7 +81,6 @@
char *s;
{
char *ptr;
- char *malloc();
ptr = malloc(strlen(s) + 1);
if (ptr == NULL) {