cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix & fake

Browse Source
This commit is contained in:
espie 2000-06-05 01:09:24 +00:00
parent ed8131e081
commit c9685a9d2d
15 changed files with 499 additions and 747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail/xfaces/Makefile
View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2000/04/09 17:37:00 espie Exp $
BROKEN= bad packing lists
# $OpenBSD: Makefile,v 1.14 2000/06/05 01:09:24 espie Exp $
DISTNAME= xfaces-3.3
CATEGORIES= mail
NEED_VERSION= 1.230
FAKE=No
# xfaces-sounds.tar.gz only in LOCAL_PORTS
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
ftp://odie.physik2.uni-rostock.de/pub/ \
@ -24,11 +22,11 @@ LIB_DEPENDS= compface::mail/faces
USE_IMAKE= Yes
pre-configure:
post-extract:
@ln -sf ../sounds ${WRKSRC}
pre-install:
@mkdir -p ${LOCALBASE}/share/sounds
@mkdir -p ${X11BASE}/include/X11/pixmaps
@${INSTALL_DATA_DIR} ${PREFIX}/share/sounds
@${INSTALL_DATA_DIR} ${PREFIX}/include/X11/pixmaps
.include <bsd.port.mk>

37
mail/xfaces/patches/patch-Imakefile Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-Imakefile,v 1.1 2000/06/05 01:09:24 espie Exp $
--- Imakefile.orig Sun Mar 13 01:38:53 1994
+++ Imakefile Mon Jun 5 02:43:45 2000
@@ -48,11 +48,13 @@
#define USE_XPM
#define USE_SHAPE
#define USE_XFACE
-#define USE_SOUND
-#define USE_BUCKETS
+#undef USE_SOUND
+#undef USE_BUCKETS
#define USE_POP
#define LOOKUP_HOSTNAME
+#define IHaveSubdirs
+SUBDIRS = images sounds
#
# For debugging.
#
@@ -65,7 +67,7 @@
# -DLOOKUP_DEBUG
#
#CDEBUGFLAGS= -Wall -g
-#CDEBUGFLAGS= -g
+CDEBUGFLAGS= -pipe -O2
#ifdef USE_XFACE
XFACE_SRCS = face_search_xface.c face_image_xface.c
@@ -265,7 +267,7 @@ tag:
files:
@echo $(HDRS) $(SRCS) $(OTHER_FILES)
-
+
clean::
rm -rf Distribution

69
mail/xfaces/patches/patch-XFaces_ad Normal file
View File

@ -0,0 +1,69 @@
$OpenBSD: patch-XFaces_ad,v 1.1 2000/06/05 01:09:24 espie Exp $
--- XFaces.ad.orig Sun Mar 13 01:38:54 1994
+++ XFaces.ad Mon Jun 5 02:43:44 2000
@@ -71,8 +71,8 @@
! lists.
!
-XFaces.soundPath: /usr/sounds:/usr/demo/SOUND/sounds
-XFaces.imagePath: /usr/images
+XFaces.soundPath: /usr/local/share/sounds
+XFaces.imagePath: /usr/X11R6/include/X11/pixmaps
!
! This is where we look for sounds/images in the "faces" format.
@@ -100,7 +100,7 @@ XFaces.imagePath: /usr/images
! image types are set in the imageTypes resource.
!
-XFaces.facedbPath: /usr/faces
+XFaces.facedbPath: /usr/local/share/faces
!
! Tell how many different annotations there are. We can support any number.
@@ -244,7 +244,7 @@ XFaces.fromField: From:
!
weather.listCommand: wx.faces wbc
-weather.facedbPath: /usr/faces/weather
+weather.facedbPath: /usr/local/share/faces/weather
weather.compressImages: False
weather.keepOrder: True
weather.shapeExtra: False
@@ -337,22 +337,22 @@ XFaces.beforeImageBindings: \
! Could setup special sounds for mailing lists.
!
-!XFaces.beforeSoundBindings: \
-! Cc: foo: train
+|Faces.beforeSoundBindings: \
+| Cc: foo: train
!
! Could use this to show a special face for users that we have no face for.
!
-!XFaces.afterImageBindings: \
-! * .*: unknown
+XFaces.afterImageBindings: \
+ * .*: unknown
!
! Could setup default sounds if no sound is specified.
!
-!XFaces.afterSoundBindings: \
-! * .*: train
+XFaces.afterSoundBindings: \
+ * .*: train
!
! This set of bindings is run after the all of the image search has
@@ -382,6 +382,5 @@ XFaces.sound.uucp: computer
! Mail from root.
!
-XFaces.image.root: root
+XFaces.image.root root
XFaces.sound.root: busy
-

602
mail/xfaces/patches/patch-aa
View File

@ -1,602 +0,0 @@
diff -c -N ../xfaces-3.3-org/XFaces.ad ./XFaces.ad
*** ../xfaces-3.3-org/XFaces.ad Sun Mar 13 01:38:54 1994
--- ./XFaces.ad Wed Dec 11 14:22:15 1996
***************
*** 71,78 ****
! lists.
!
! XFaces.soundPath: /usr/sounds:/usr/demo/SOUND/sounds
! XFaces.imagePath: /usr/images
!
! This is where we look for sounds/images in the "faces" format.
--- 71,78 ----
! lists.
!
! XFaces.soundPath: /usr/local/share/sounds
! XFaces.imagePath: /usr/X11R6/include/X11/pixmaps
!
! This is where we look for sounds/images in the "faces" format.
***************
*** 100,106 ****
! image types are set in the imageTypes resource.
!
! XFaces.facedbPath: /usr/faces
!
! Tell how many different annotations there are. We can support any number.
--- 100,106 ----
! image types are set in the imageTypes resource.
!
! XFaces.facedbPath: /usr/local/share/faces
!
! Tell how many different annotations there are. We can support any number.
***************
*** 244,250 ****
!
weather.listCommand: wx.faces wbc
! weather.facedbPath: /usr/faces/weather
weather.compressImages: False
weather.keepOrder: True
weather.shapeExtra: False
--- 244,250 ----
!
weather.listCommand: wx.faces wbc
! weather.facedbPath: /usr/local/share/faces/weather
weather.compressImages: False
weather.keepOrder: True
weather.shapeExtra: False
***************
*** 337,358 ****
! Could setup special sounds for mailing lists.
!
! !XFaces.beforeSoundBindings: \
! ! Cc: foo: train
!
! Could use this to show a special face for users that we have no face for.
!
! !XFaces.afterImageBindings: \
! ! * .*: unknown
!
! Could setup default sounds if no sound is specified.
!
! !XFaces.afterSoundBindings: \
! ! * .*: train
!
! This set of bindings is run after the all of the image search has
--- 337,358 ----
! Could setup special sounds for mailing lists.
!
! |Faces.beforeSoundBindings: \
! | Cc: foo: train
!
! Could use this to show a special face for users that we have no face for.
!
! XFaces.afterImageBindings: \
! * .*: unknown
!
! Could setup default sounds if no sound is specified.
!
! XFaces.afterSoundBindings: \
! * .*: train
!
! This set of bindings is run after the all of the image search has
***************
*** 382,387 ****
! Mail from root.
!
! XFaces.image.root: root
XFaces.sound.root: busy
-
--- 382,386 ----
! Mail from root.
!
! XFaces.image.root root
XFaces.sound.root: busy
diff -c -N ../xfaces-3.3-org/face_image.c ./face_image.c
*** ../xfaces-3.3-org/face_image.c Sun Mar 13 01:38:40 1994
--- ./face_image.c Wed Dec 11 09:22:28 1996
***************
*** 204,218 ****
int length;
static char* filename = NULL;
static int filename_length = 0;
!
/*
* First see if we already have this image.
*/
for (fi = TheImages; fi != NULL; fi = fi->next)
{
if (strcmp(fi->file, file) == 0)
{
/*
* Yep!
*/
--- 204,225 ----
int length;
static char* filename = NULL;
static int filename_length = 0;
!
! char my_label[512];
/*
* First see if we already have this image.
*/
+
for (fi = TheImages; fi != NULL; fi = fi->next)
{
if (strcmp(fi->file, file) == 0)
{
+ if (info && info->item) {
+ sprintf(my_label, "%s@%s", info->item->user, info->item->host);
+ if (strcmp(fi->label, my_label))
+ break;
+ }
/*
* Yep!
*/
***************
*** 290,296 ****
/*
* Ok, create a face image struct.
*/
-
fi = FaceImageCreate(file, info->type, image_data);
info->item->image = fi;
--- 297,302 ----
***************
*** 367,372 ****
--- 373,383 ----
break;
}
}
+
+ #ifdef FACEDB_DEBUG
+ if (found)
+ fprintf(stderr, "FaceImageLoad: Reporting %s as found\n", file);
+ #endif
return found;
}
diff -c -N ../xfaces-3.3-org/face_search_facedb.c ./face_search_facedb.c
*** ../xfaces-3.3-org/face_search_facedb.c Sun Mar 13 01:38:42 1994
--- ./face_search_facedb.c Tue Dec 10 10:41:23 1996
***************
*** 483,488 ****
--- 483,492 ----
int parts;
char* username;
FacedbMap* map;
+
+ #ifdef FACEDB_DEBUG
+ fprintf(stderr, "facedb: searching in path %s\n", path);
+ #endif
if (buffer1 == NULL)
{
***************
*** 535,541 ****
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
!
/*
* Try to load this guy.
*/
--- 539,545 ----
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
! #ifndef FACE_FILES_ONLY
/*
* Try to load this guy.
*/
***************
*** 550,556 ****
XtFree(hostdata);
return 1;
}
!
/*
* try adding "/face" and see what we find.
*/
--- 554,560 ----
XtFree(hostdata);
return 1;
}
! #endif
/*
* try adding "/face" and see what we find.
*/
***************
*** 570,598 ****
return 1;
}
- #if 0
- /*
- * Finally if we are looking for an image try "/48x48x1".
- */
-
- if (info->data->format == FormatImage)
- {
- strcpy(tail, "/48x48x1");
-
- if (FaceSearchLoad(buffer1, info->item, info->data))
- {
- XtFree((char*) host);
- XtFree(hostdata);
- return 1;
- }
- }
- #endif
}
/*
* try for user in the MISC directory.
*/
!
sprintf(buffer1, "%sMISC/%s", file, username);
#ifdef FACEDB_DEBUG
--- 574,585 ----
return 1;
}
}
/*
* try for user in the MISC directory.
*/
! #ifndef FACE_FILES_ONLY
sprintf(buffer1, "%sMISC/%s", file, username);
#ifdef FACEDB_DEBUG
***************
*** 605,611 ****
XtFree(hostdata);
return 1;
}
!
sprintf(buffer1, "%sMISC/%s/face", file, username);
#ifdef FACEDB_DEBUG
--- 592,598 ----
XtFree(hostdata);
return 1;
}
! #endif
sprintf(buffer1, "%sMISC/%s/face", file, username);
#ifdef FACEDB_DEBUG
***************
*** 632,638 ****
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
!
/*
* Try to load this guy.
*/
--- 619,625 ----
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
! #ifndef FACE_FILES_ONLY
/*
* Try to load this guy.
*/
***************
*** 653,659 ****
return 1;
}
!
/*
* try adding "/face" and see what we find.
*/
--- 640,646 ----
return 1;
}
! #endif
/*
* try adding "/face" and see what we find.
*/
***************
*** 679,701 ****
return 1;
}
- #if 0
- /*
- * Finally if we are looking for an image try "/48x48x1".
- */
-
- if (info->data->format == FormatImage)
- {
- strcpy(tail, "/48x48x1");
-
- if (FaceSearchLoad(buffer1, info->item, info->data))
- {
- XtFree((char*) host);
- XtFree(hostdata);
- return 1;
- }
- }
- #endif
}
XtFree((char*) host);
--- 666,671 ----
***************
*** 704,710 ****
/*
* One last try. The MISC directory. Look for "unknown"
*/
!
sprintf(buffer1, "%sMISC/unknown", file);
#ifdef FACEDB_DEBUG
--- 674,680 ----
/*
* One last try. The MISC directory. Look for "unknown"
*/
! #ifndef FACE_FILES_ONLY
sprintf(buffer1, "%sMISC/unknown", file);
#ifdef FACEDB_DEBUG
***************
*** 721,727 ****
return 1;
}
!
sprintf(buffer1, "%sMISC/unknown/face", file);
#ifdef FACEDB_DEBUG
--- 691,697 ----
return 1;
}
! #endif
sprintf(buffer1, "%sMISC/unknown/face", file);
#ifdef FACEDB_DEBUG
Common subdirectories: ../xfaces-3.3-org/images and ./images
diff -c -N ../xfaces-3.3-org/mail_items.c ./mail_items.c
*** ../xfaces-3.3-org/mail_items.c Sun Mar 13 01:38:44 1994
--- ./mail_items.c Tue Dec 10 10:25:32 1996
***************
*** 351,359 ****
MailBoxClean()
{
MailItem *item;
!
! for (item = TheMailItems; item != NULL; item = item->next)
{
if (item->in_use == 0)
{
MailItemFree(item);
--- 351,368 ----
MailBoxClean()
{
MailItem *item;
! MailItem *next_item;
!
! for (item = TheMailItems; item != NULL; item = next_item)
{
+ /*
+ * Save item->next here because if MailItemFree() is called, it will
+ * free item and we won't be able to access it after the call.
+ * Found by phkmalloc. Philippe Charnier (charnier@xp11.frmug.org)
+ * 11/96.
+ */
+ next_item = item->next;
+
if (item->in_use == 0)
{
MailItemFree(item);
***************
*** 651,656 ****
--- 660,666 ----
{
item->prev = TheMailItemsTail;
item->prev->next = item;
+ TheMailItemsTail = item;
}
item->face = FaceDisplay(item);
diff -c -N ../xfaces-3.3-org/main.c ./main.c
*** ../xfaces-3.3-org/main.c Sun Mar 13 01:38:45 1994
--- ./main.c Wed Dec 11 14:23:05 1996
***************
*** 124,130 ****
},
{
"spoolDir", "SpoolDir", XtRString, sizeof(String),
! offset(spool_dir), XtRString, "/usr/spool/mail"
},
{
"popHost", "PopHost", XtRString, sizeof(String),
--- 124,130 ----
},
{
"spoolDir", "SpoolDir", XtRString, sizeof(String),
! offset(spool_dir), XtRString, "/var/mail/"
},
{
"popHost", "PopHost", XtRString, sizeof(String),
***************
*** 144,158 ****
},
{
"imagePath", "Path", XtRString, sizeof(String),
! offset(image_path), XtRString, "/usr/images"
},
{
"soundPath", "Path", XtRString, sizeof(String),
! offset(sound_path), XtRString, "/usr/sounds"
},
{
"facedbPath", "Path", XtRString, sizeof(String),
! offset(facedb_path), XtRString, "/usr/local/faces"
},
{
"machine", "Path", XtRString, sizeof(String),
--- 144,158 ----
},
{
"imagePath", "Path", XtRString, sizeof(String),
! offset(image_path), XtRString, "/usr/X11R6/include/X11/pixmaps"
},
{
"soundPath", "Path", XtRString, sizeof(String),
! offset(sound_path), XtRString, "/usr/local/share/sounds"
},
{
"facedbPath", "Path", XtRString, sizeof(String),
! offset(facedb_path), XtRString, "/usr/local/share/faces"
},
{
"machine", "Path", XtRString, sizeof(String),
***************
*** 297,303 ****
static XrmOptionDescRec options[] =
{
{
! "-c", "frame.setWidth", XrmoptionSepArg, NULL
},
{
"-e", "listCommand", XrmoptionSepArg, NULL
--- 297,303 ----
static XrmOptionDescRec options[] =
{
{
! "-c", "frame.maxWidth", XrmoptionSepArg, NULL
},
{
"-e", "listCommand", XrmoptionSepArg, NULL
Common subdirectories: ../xfaces-3.3-org/sounds and ./sounds
diff -c -N ../xfaces-3.3-org/xfaces.man ./xfaces.man
*** ../xfaces-3.3-org/xfaces.man Sun Mar 13 01:38:54 1994
--- ./xfaces.man Wed Dec 11 16:20:47 1996
***************
*** 171,177 ****
.TP 8
.BI XFaces.spoolDir: " <mail spool directory>"
This resource specifies the directory that contains user mail spool
! files. The default is \fI/usr/spool/mail\fP. On some machines (SVR4?)
you may want to set this to \fI/usr/mail\fP.
.TP 8
.BI XFaces.popHost: " <hostname>"
--- 171,177 ----
.TP 8
.BI XFaces.spoolDir: " <mail spool directory>"
This resource specifies the directory that contains user mail spool
! files. The default is \fI/var/mail\fP. On some machines (SVR4?)
you may want to set this to \fI/usr/mail\fP.
.TP 8
.BI XFaces.popHost: " <hostname>"
***************
*** 198,209 ****
.BI XFaces.imagePath: " <image path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for image files. The default
! is \fI/usr/images\fP.
.TP 8
.BI XFaces.soundPath: " <sound path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for sound files. The default
! is \fI/usr/sounds\fP.
.TP 8
.BI XFaces.facedbPath: " <facedb path>"
This is a list of directories that contain a multi-level directory hierarchy.
--- 198,209 ----
.BI XFaces.imagePath: " <image path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for image files. The default
! is \fI/usr/X11/include/X11/pixmaps\fP.
.TP 8
.BI XFaces.soundPath: " <sound path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for sound files. The default
! is \fI/usr/local/share/sounds\fP.
.TP 8
.BI XFaces.facedbPath: " <facedb path>"
This is a list of directories that contain a multi-level directory hierarchy.
***************
*** 289,295 ****
no image. This defaults to \fITrue\fP.
.TP 8
.BI XFaces.useCommands: " <flag>"
! This resource tells \FIXFaces\fP if it needs to search for shell commands to
run in addition to image and sounds. The default is \fIFalse\fP.
.TP 8
.BI XFaces.useContentLength: " <flag>"
--- 289,295 ----
no image. This defaults to \fITrue\fP.
.TP 8
.BI XFaces.useCommands: " <flag>"
! This resource tells \fIXFaces\fP if it needs to search for shell commands to
run in addition to image and sounds. The default is \fIFalse\fP.
.TP 8
.BI XFaces.useContentLength: " <flag>"
***************
*** 318,324 ****
.TP 8
.B xpm-shaped
This is a shaped color image. Shaped xpm files should be named
! \fIface-shaped.xpm\fP.
.TP 8
.B xpm
This is a non shaped color image. These files should be named
--- 318,324 ----
.TP 8
.B xpm-shaped
This is a shaped color image. Shaped xpm files should be named
! \fIface-shape.xpm\fP.
.TP 8
.B xpm
This is a non shaped color image. These files should be named
***************
*** 357,363 ****
The \fI<format list>\fP is currently ignored for the \fBsoundSearch\fP
resource. Both the \fI<format list>\fP and the <search path> are
(except if you use the \fIfacedb\fP search) for the \fBcommandSearch\fP
! resoiurce. If the \fI<format list>\fP is empty then the list in the
\fBimageFormats\fP resource is used. If the \fI<search path>\fP is
empty then the \fBfacedbPath\fP is used for \fIfacedb\fP searches for
both sounds and images and one of the \fBsoundPath\fP or
--- 357,363 ----
The \fI<format list>\fP is currently ignored for the \fBsoundSearch\fP
resource. Both the \fI<format list>\fP and the <search path> are
(except if you use the \fIfacedb\fP search) for the \fBcommandSearch\fP
! resource. If the \fI<format list>\fP is empty then the list in the
\fBimageFormats\fP resource is used. If the \fI<search path>\fP is
empty then the \fBfacedbPath\fP is used for \fIfacedb\fP searches for
both sounds and images and one of the \fBsoundPath\fP or

71
mail/xfaces/patches/patch-ab
View File

@ -1,71 +0,0 @@
diff -c -N ../xfaces-3.3-org/images/Imakefile ./images/Imakefile
*** ../xfaces-3.3-org/images/Imakefile Thu Jan 1 01:00:00 1970
--- ./images/Imakefile Wed Dec 11 18:24:35 1996
***************
*** 0 ****
--- 1,5 ----
+
+ InstallNonExec( *.xpm, $(INCDIR)/X11/pixmaps)
+
+ clean::
+ rm -f Makefile.*
\ No newline at end of file
diff -c -N ../xfaces-3.3-org/images/unknown.xpm ./images/unknown.xpm
*** ../xfaces-3.3-org/images/unknown.xpm Thu Jan 1 01:00:00 1970
--- ./images/unknown.xpm Wed Dec 11 11:46:59 1996
***************
*** 0 ****
--- 1,53 ----
+ /* XPM */
+ static char * claude_xpm[] = {
+ "64 38 12 1",
+ " s None c None",
+ ". c black",
+ "X c peachpuff4",
+ "o c #727277778585",
+ "O c gray100",
+ "+ c tan",
+ "@ c lightyellow",
+ "# c red",
+ "$ c wheat",
+ "% c gray85",
+ "& c cornflower blue",
+ "* c lightskyblue",
+ " .XXXXXXXXX. oOOOOOOOOOOOOOOOo ",
+ " ...+++++++++XXX. oOOOOOOOOOOOOOOOOOo ",
+ " ++++@@@+++@@+XXX. oOOO#OOO#OOO#OOO#OOoo ",
+ " ++$@@@++@++@@@++XXX. oOOOO#OOO#OOOOOOO#OOOo ",
+ " ++X@@@@@++@@@@@@.++X. oOOOO#OOO#OO##OOO#OOOOo ",
+ " +X@@@@@++++@@@@@@.+XX oOOOO#####OOO#OOO#OOOoo ",
+ " X+@@@@@@@+++@@@@@@@X+X+ oOOOO#OOO#OOO#OOO#OOOo ",
+ " +++@@@@@@+++@@@@@@@@.+XX oOOOO#OOO#OOO#OOOOOOOoooo ",
+ " ++X.@@@@@@++@@@@@@@@@.++X oOOOO#OOO#OO###OO#OOOOOO o ",
+ " X+X@@@@@@@@@@@@@@@@@@@.++.oOOOOOOOOOOOOOOOOOOOOOOOOooo ",
+ " XX.@@@@@@@@@@@@@@@@@@@@+XXooOOOOOOOOOOOOOOOOOOOOOOOOOoo ",
+ " XX@@@@@@@@@@@@@@@@@@@@@+XX oOOO###OOOOOOOOOOOOOOOOOOOOo ",
+ " +XX@@@@@@@@@@@@@@@@@@@@@XXXXoOOOO#OOOOOOOOOOOOOOOOOOOOOo ",
+ " XXX@@@+++@@@@@++++@@@@@@@+XXooOOO#OOOOOO###OO##O#OOOOOOo ",
+ " XXX@......@@@@.......@@...XX oOOO#OOOOOOOOO#O#O#O#OOOOOo ",
+ " XXX%%%%%%%@@@@%%%%%%%@..@.XX oOOO#OOOOOO####O#O#O#OOOOOo ",
+ " XXX%%%XX%.@.@.%XX%%%%.@@@XXX oOOO#OOOOO#OOO#O#O#O#OOOOoo ooo ",
+ " XX.%%%XX%.@@@.%XX%%%%.@@@XX. oOO###OOOOO####O#OOO#OOOOooooOooo ",
+ " XX@%%%%%%.@@@.%%%%%%..@@@.X oOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOoo",
+ " .X...%%...@@@@.%%%%..@@@@@@.OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo",
+ " .@@....@@@@@@@....@@@@@.@.O###OOO##OOOOOOOOOOOOOOOOOOO#OOOOOOO",
+ " ..@@@@@@@@@@@@@@@@@@@@@.@O#OOO#OOO#OOOOOOOOOOOOOOOOOOO#OOOOOOO",
+ " .@@@@@@@@@@@@@@@@@@@@. O#OOOOOOO#OOOO###OO#OOO#OO##O#OO###OO",
+ " .@@@@@@.....@@@@@@@@@...#OOOOOOO#OOOOOOO#O#OOO#O#OO##O#OOO#O",
+ " .@@@@@@...@@@@.@@@@....#OOOOOOO#OOOO####O#OOO#O#OOO#O#####O",
+ " .@@..@@@@@@@@...@@@...O#OOO#OOO#OOO#OOO#O#OO##O#OO##O#OOOOO",
+ " O.@@.........@@@@@.%..OO###OOO###OOO####OO##O#OO##O#OO###OO",
+ " ..@@@@@@@@@@@@@@@.%%..OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo",
+ " .&.@@@@....@@@@@.%%.&..OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO ",
+ " ...&&.@@@@@@@@@@..%%%.&....OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ",
+ ".......&&..@@@@@@..%%%%.&&&&&.....OooooooOOOOOOOOOOOOOOOOOoooo ",
+ ".&&&&&..&.%......%%%%...&&&..&&&&... oooOOOOOOOOOOOooooo ",
+ "&&&&&&..&&.%%%%%%%%%..&&&&&.&&&&&&&... oooooooooooo ",
+ "&&&&&&&&.&&..%%%%%%..$&&...&.&&&&&&&&... ",
+ "&&&&&&&&.&&&..%%%%..&&&$.$.&.****.&&.&... ",
+ "&&&&&*&&&.&&&..%%..$&&&.$&&..*****..&&&.. ",
+ "&*&&***&&..$&&....*&&&.*&&..*****..&&&&&. ",
+ "&*********..***...***.**&..******.&&.***. "};

63
mail/xfaces/patches/patch-ac
View File

@ -1,63 +0,0 @@
*** Imakefile.orig Sat Mar 12 19:38:53 1994
--- Imakefile Thu Dec 4 22:17:31 1997
***************
*** 48,58 ****
#define USE_XPM
#define USE_SHAPE
#define USE_XFACE
! #define USE_SOUND
! #define USE_BUCKETS
#define USE_POP
#define LOOKUP_HOSTNAME
#
# For debugging.
#
--- 48,60 ----
#define USE_XPM
#define USE_SHAPE
#define USE_XFACE
! #undef USE_SOUND
! #undef USE_BUCKETS
#define USE_POP
#define LOOKUP_HOSTNAME
+ #define IHaveSubdirs
+ SUBDIRS = images sounds
#
# For debugging.
#
***************
*** 65,71 ****
# -DLOOKUP_DEBUG
#
#CDEBUGFLAGS= -Wall -g
! #CDEBUGFLAGS= -g
#ifdef USE_XFACE
XFACE_SRCS = face_search_xface.c face_image_xface.c
--- 67,73 ----
# -DLOOKUP_DEBUG
#
#CDEBUGFLAGS= -Wall -g
! CDEBUGFLAGS= -pipe -O2
#ifdef USE_XFACE
XFACE_SRCS = face_search_xface.c face_image_xface.c
***************
*** 265,271 ****
files:
@echo $(HDRS) $(SRCS) $(OTHER_FILES)
!
clean::
rm -rf Distribution
--- 267,273 ----
files:
@echo $(HDRS) $(SRCS) $(OTHER_FILES)
!
clean::
rm -rf Distribution

47
mail/xfaces/patches/patch-face_image_c Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-face_image_c,v 1.1 2000/06/05 01:09:24 espie Exp $
--- face_image.c.orig Sun Mar 13 01:38:40 1994
+++ face_image.c Mon Jun 5 02:43:44 2000
@@ -204,15 +204,22 @@ FaceImageLoadInfo* info;
int length;
static char* filename = NULL;
static int filename_length = 0;
-
+
+ char my_label[512];
/*
* First see if we already have this image.
*/
+
for (fi = TheImages; fi != NULL; fi = fi->next)
{
if (strcmp(fi->file, file) == 0)
{
+ if (info && info->item) {
+ sprintf(my_label, "%s@%s", info->item->user, info->item->host);
+ if (strcmp(fi->label, my_label))
+ break;
+ }
/*
* Yep!
*/
@@ -290,7 +297,6 @@ FaceImageLoadInfo* info;
/*
* Ok, create a face image struct.
*/
-
fi = FaceImageCreate(file, info->type, image_data);
info->item->image = fi;
@@ -367,6 +373,11 @@ FaceSearchData* data;
break;
}
}
+
+#ifdef FACEDB_DEBUG
+ if (found)
+ fprintf(stderr, "FaceImageLoad: Reporting %s as found\n", file);
+#endif
return found;
}

132
mail/xfaces/patches/patch-face_search_facedb_c Normal file
View File

@ -0,0 +1,132 @@
$OpenBSD: patch-face_search_facedb_c,v 1.1 2000/06/05 01:09:24 espie Exp $
--- face_search_facedb.c.orig Sun Mar 13 01:38:42 1994
+++ face_search_facedb.c Mon Jun 5 02:43:44 2000
@@ -483,6 +483,10 @@ FacedbInfo* info;
int parts;
char* username;
FacedbMap* map;
+
+#ifdef FACEDB_DEBUG
+ fprintf(stderr, "facedb: searching in path %s\n", path);
+#endif
if (buffer1 == NULL)
{
@@ -535,7 +539,7 @@ FacedbInfo* info;
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
-
+#ifndef FACE_FILES_ONLY
/*
* Try to load this guy.
*/
@@ -550,7 +554,7 @@ FacedbInfo* info;
XtFree(hostdata);
return 1;
}
-
+#endif
/*
* try adding "/face" and see what we find.
*/
@@ -570,29 +574,12 @@ FacedbInfo* info;
return 1;
}
-#if 0
- /*
- * Finally if we are looking for an image try "/48x48x1".
- */
-
- if (info->data->format == FormatImage)
- {
- strcpy(tail, "/48x48x1");
-
- if (FaceSearchLoad(buffer1, info->item, info->data))
- {
- XtFree((char*) host);
- XtFree(hostdata);
- return 1;
- }
- }
-#endif
}
/*
* try for user in the MISC directory.
*/
-
+#ifndef FACE_FILES_ONLY
sprintf(buffer1, "%sMISC/%s", file, username);
#ifdef FACEDB_DEBUG
@@ -605,7 +592,7 @@ FacedbInfo* info;
XtFree(hostdata);
return 1;
}
-
+#endif
sprintf(buffer1, "%sMISC/%s/face", file, username);
#ifdef FACEDB_DEBUG
@@ -632,7 +619,7 @@ FacedbInfo* info;
*/
FaceSearchFacedbMakeName(file, info, i, buffer1);
-
+#ifndef FACE_FILES_ONLY
/*
* Try to load this guy.
*/
@@ -653,7 +640,7 @@ FacedbInfo* info;
return 1;
}
-
+#endif
/*
* try adding "/face" and see what we find.
*/
@@ -679,23 +666,6 @@ FacedbInfo* info;
return 1;
}
-#if 0
- /*
- * Finally if we are looking for an image try "/48x48x1".
- */
-
- if (info->data->format == FormatImage)
- {
- strcpy(tail, "/48x48x1");
-
- if (FaceSearchLoad(buffer1, info->item, info->data))
- {
- XtFree((char*) host);
- XtFree(hostdata);
- return 1;
- }
- }
-#endif
}
XtFree((char*) host);
@@ -704,7 +674,7 @@ FacedbInfo* info;
/*
* One last try. The MISC directory. Look for "unknown"
*/
-
+#ifndef FACE_FILES_ONLY
sprintf(buffer1, "%sMISC/unknown", file);
#ifdef FACEDB_DEBUG
@@ -721,7 +691,7 @@ FacedbInfo* info;
return 1;
}
-
+#endif
sprintf(buffer1, "%sMISC/unknown/face", file);
#ifdef FACEDB_DEBUG

9
mail/xfaces/patches/patch-images_Imakefile Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-images_Imakefile,v 1.1 2000/06/05 01:09:24 espie Exp $
--- images/Imakefile.orig Mon Jun 5 02:43:45 2000
+++ images/Imakefile Mon Jun 5 02:52:50 2000
@@ -0,0 +1,5 @@
+
+InstallNonExec( *.xpm,$(INCDIR)/X11/pixmaps)
+
+clean::
+ rm -f Makefile.*

57
mail/xfaces/patches/patch-images_unknown_xpm Normal file
View File

@ -0,0 +1,57 @@
$OpenBSD: patch-images_unknown_xpm,v 1.1 2000/06/05 01:09:25 espie Exp $
--- images/unknown.xpm.orig Mon Jun 5 02:43:45 2000
+++ images/unknown.xpm Mon Jun 5 02:43:45 2000
@@ -0,0 +1,53 @@
+/* XPM */
+static char * claude_xpm[] = {
+"64 38 12 1",
+" s None c None",
+". c black",
+"X c peachpuff4",
+"o c #727277778585",
+"O c gray100",
+"+ c tan",
+"@ c lightyellow",
+"# c red",
+"$ c wheat",
+"% c gray85",
+"& c cornflower blue",
+"* c lightskyblue",
+" .XXXXXXXXX. oOOOOOOOOOOOOOOOo ",
+" ...+++++++++XXX. oOOOOOOOOOOOOOOOOOo ",
+" ++++@@@+++@@+XXX. oOOO#OOO#OOO#OOO#OOoo ",
+" ++$@@@++@++@@@++XXX. oOOOO#OOO#OOOOOOO#OOOo ",
+" ++X@@@@@++@@@@@@.++X. oOOOO#OOO#OO##OOO#OOOOo ",
+" +X@@@@@++++@@@@@@.+XX oOOOO#####OOO#OOO#OOOoo ",
+" X+@@@@@@@+++@@@@@@@X+X+ oOOOO#OOO#OOO#OOO#OOOo ",
+" +++@@@@@@+++@@@@@@@@.+XX oOOOO#OOO#OOO#OOOOOOOoooo ",
+" ++X.@@@@@@++@@@@@@@@@.++X oOOOO#OOO#OO###OO#OOOOOO o ",
+" X+X@@@@@@@@@@@@@@@@@@@.++.oOOOOOOOOOOOOOOOOOOOOOOOOooo ",
+" XX.@@@@@@@@@@@@@@@@@@@@+XXooOOOOOOOOOOOOOOOOOOOOOOOOOoo ",
+" XX@@@@@@@@@@@@@@@@@@@@@+XX oOOO###OOOOOOOOOOOOOOOOOOOOo ",
+" +XX@@@@@@@@@@@@@@@@@@@@@XXXXoOOOO#OOOOOOOOOOOOOOOOOOOOOo ",
+" XXX@@@+++@@@@@++++@@@@@@@+XXooOOO#OOOOOO###OO##O#OOOOOOo ",
+" XXX@......@@@@.......@@...XX oOOO#OOOOOOOOO#O#O#O#OOOOOo ",
+" XXX%%%%%%%@@@@%%%%%%%@..@.XX oOOO#OOOOOO####O#O#O#OOOOOo ",
+" XXX%%%XX%.@.@.%XX%%%%.@@@XXX oOOO#OOOOO#OOO#O#O#O#OOOOoo ooo ",
+" XX.%%%XX%.@@@.%XX%%%%.@@@XX. oOO###OOOOO####O#OOO#OOOOooooOooo ",
+" XX@%%%%%%.@@@.%%%%%%..@@@.X oOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOoo",
+" .X...%%...@@@@.%%%%..@@@@@@.OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo",
+" .@@....@@@@@@@....@@@@@.@.O###OOO##OOOOOOOOOOOOOOOOOOO#OOOOOOO",
+" ..@@@@@@@@@@@@@@@@@@@@@.@O#OOO#OOO#OOOOOOOOOOOOOOOOOOO#OOOOOOO",
+" .@@@@@@@@@@@@@@@@@@@@. O#OOOOOOO#OOOO###OO#OOO#OO##O#OO###OO",
+" .@@@@@@.....@@@@@@@@@...#OOOOOOO#OOOOOOO#O#OOO#O#OO##O#OOO#O",
+" .@@@@@@...@@@@.@@@@....#OOOOOOO#OOOO####O#OOO#O#OOO#O#####O",
+" .@@..@@@@@@@@...@@@...O#OOO#OOO#OOO#OOO#O#OO##O#OO##O#OOOOO",
+" O.@@.........@@@@@.%..OO###OOO###OOO####OO##O#OO##O#OO###OO",
+" ..@@@@@@@@@@@@@@@.%%..OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo",
+" .&.@@@@....@@@@@.%%.&..OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO ",
+" ...&&.@@@@@@@@@@..%%%.&....OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOo ",
+".......&&..@@@@@@..%%%%.&&&&&.....OooooooOOOOOOOOOOOOOOOOOoooo ",
+".&&&&&..&.%......%%%%...&&&..&&&&... oooOOOOOOOOOOOooooo ",
+"&&&&&&..&&.%%%%%%%%%..&&&&&.&&&&&&&... oooooooooooo ",
+"&&&&&&&&.&&..%%%%%%..$&&...&.&&&&&&&&... ",
+"&&&&&&&&.&&&..%%%%..&&&$.$.&.****.&&.&... ",
+"&&&&&*&&&.&&&..%%..$&&&.$&&..*****..&&&.. ",
+"&*&&***&&..$&&....*&&&.*&&..*****..&&&&&. ",
+"&*********..***...***.**&..******.&&.***. "};

32
mail/xfaces/patches/patch-mail_items_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-mail_items_c,v 1.1 2000/06/05 01:09:25 espie Exp $
--- mail_items.c.orig Sun Mar 13 01:38:44 1994
+++ mail_items.c Mon Jun 5 02:43:44 2000
@@ -351,9 +351,18 @@ void
MailBoxClean()
{
MailItem *item;
-
- for (item = TheMailItems; item != NULL; item = item->next)
+ MailItem *next_item;
+
+ for (item = TheMailItems; item != NULL; item = next_item)
{
+ /*
+ * Save item->next here because if MailItemFree() is called, it will
+ * free item and we won't be able to access it after the call.
+ * Found by phkmalloc. Philippe Charnier (charnier@xp11.frmug.org)
+ * 11/96.
+ */
+ next_item = item->next;
+
if (item->in_use == 0)
{
MailItemFree(item);
@@ -651,6 +660,7 @@ char** annotations;
{
item->prev = TheMailItemsTail;
item->prev->next = item;
+ TheMailItemsTail = item;
}
item->face = FaceDisplay(item);

40
mail/xfaces/patches/patch-main_c Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-main_c,v 1.1 2000/06/05 01:09:25 espie Exp $
--- main.c.orig Sun Mar 13 01:38:45 1994
+++ main.c Mon Jun 5 02:43:45 2000
@@ -124,7 +124,7 @@ static XtResource FacesResourcesList[] =
},
{
"spoolDir", "SpoolDir", XtRString, sizeof(String),
- offset(spool_dir), XtRString, "/usr/spool/mail"
+ offset(spool_dir), XtRString, "/var/mail/"
},
{
"popHost", "PopHost", XtRString, sizeof(String),
@@ -144,15 +144,15 @@ static XtResource FacesResourcesList[] =
},
{
"imagePath", "Path", XtRString, sizeof(String),
- offset(image_path), XtRString, "/usr/images"
+ offset(image_path), XtRString, "/usr/X11R6/include/X11/pixmaps"
},
{
"soundPath", "Path", XtRString, sizeof(String),
- offset(sound_path), XtRString, "/usr/sounds"
+ offset(sound_path), XtRString, "/usr/local/share/sounds"
},
{
"facedbPath", "Path", XtRString, sizeof(String),
- offset(facedb_path), XtRString, "/usr/local/faces"
+ offset(facedb_path), XtRString, "/usr/local/share/faces"
},
{
"machine", "Path", XtRString, sizeof(String),
@@ -297,7 +297,7 @@ static XtResource FacesResourcesList[] =
static XrmOptionDescRec options[] =
{
{
- "-c", "frame.setWidth", XrmoptionSepArg, NULL
+ "-c", "frame.maxWidth", XrmoptionSepArg, NULL
},
{
"-e", "listCommand", XrmoptionSepArg, NULL

10
mail/xfaces/patches/patch-sounds_Imakefile Normal file
View File

@ -0,0 +1,10 @@
--- sounds/Imakefile.orig Mon Jun 5 02:56:12 2000
+++ sounds/Imakefile Mon Jun 5 02:56:15 2000
@@ -1,5 +1,5 @@
-InstallNonExec( *.au, /usr/local/share/sounds)
+InstallNonExec( *.au,/usr/local/share/sounds)
clean::
- rm -f Makefile.*
+ rm -f Makefile.*

54
mail/xfaces/patches/patch-xfaces_man Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-xfaces_man,v 1.1 2000/06/05 01:09:25 espie Exp $
--- xfaces.man.orig Sun Mar 13 01:38:54 1994
+++ xfaces.man Mon Jun 5 02:43:45 2000
@@ -171,7 +171,7 @@ is to append the users name onto the \fB
.TP 8
.BI XFaces.spoolDir: " <mail spool directory>"
This resource specifies the directory that contains user mail spool
-files. The default is \fI/usr/spool/mail\fP. On some machines (SVR4?)
+files. The default is \fI/var/mail\fP. On some machines (SVR4?)
you may want to set this to \fI/usr/mail\fP.
.TP 8
.BI XFaces.popHost: " <hostname>"
@@ -198,12 +198,12 @@ COMMANDS\fP section for a description of
.BI XFaces.imagePath: " <image path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for image files. The default
-is \fI/usr/images\fP.
+is \fI/usr/X11/include/X11/pixmaps\fP.
.TP 8
.BI XFaces.soundPath: " <sound path>"
This resource specifies a colon-separated list of directories that
specify the default directories to use for sound files. The default
-is \fI/usr/sounds\fP.
+is \fI/usr/local/share/sounds\fP.
.TP 8
.BI XFaces.facedbPath: " <facedb path>"
This is a list of directories that contain a multi-level directory hierarchy.
@@ -289,7 +289,7 @@ of the \fIXFaces\fP main window to becom
no image. This defaults to \fITrue\fP.
.TP 8
.BI XFaces.useCommands: " <flag>"
-This resource tells \FIXFaces\fP if it needs to search for shell commands to
+This resource tells \fIXFaces\fP if it needs to search for shell commands to
run in addition to image and sounds. The default is \fIFalse\fP.
.TP 8
.BI XFaces.useContentLength: " <flag>"
@@ -318,7 +318,7 @@ types are attempted. Valid types are:
.TP 8
.B xpm-shaped
This is a shaped color image. Shaped xpm files should be named
-\fIface-shaped.xpm\fP.
+\fIface-shape.xpm\fP.
.TP 8
.B xpm
This is a non shaped color image. These files should be named
@@ -357,7 +357,7 @@ search. Each line is constructed as fol
The \fI<format list>\fP is currently ignored for the \fBsoundSearch\fP
resource. Both the \fI<format list>\fP and the <search path> are
(except if you use the \fIfacedb\fP search) for the \fBcommandSearch\fP
-resoiurce. If the \fI<format list>\fP is empty then the list in the
+resource. If the \fI<format list>\fP is empty then the list in the
\fBimageFormats\fP resource is used. If the \fI<search path>\fP is
empty then the \fBfacedbPath\fP is used for \fIfacedb\fP searches for
both sounds and images and one of the \fBsoundPath\fP or

11
mail/xfaces/pkg/PLIST
View File

@ -1,4 +1,5 @@
lib/X11/app-defaults/XFaces
@comment $OpenBSD: PLIST,v 1.3 2000/06/05 01:09:25 espie Exp $
bin/xfaces
include/X11/pixmaps/andrew-shape.xpm
include/X11/pixmaps/andrew.xpm
include/X11/pixmaps/asterix.xpm
@ -32,18 +33,20 @@ include/X11/pixmaps/taz.xpm
include/X11/pixmaps/texas-shape.xpm
include/X11/pixmaps/texas.xpm
include/X11/pixmaps/unido-shape.xpm
include/X11/pixmaps/unknown.xpm
include/X11/pixmaps/uucp-shape.xpm
include/X11/pixmaps/uucp.xpm
include/X11/pixmaps/window.xpm
include/X11/pixmaps/www-shape.xpm
include/X11/pixmaps/x.xpm
include/X11/pixmaps/xconq.xpm
bin/xfaces
man/man1/xfaces.1
@cwd /usr/local
lib/X11/app-defaults/XFaces
man/cat1/xfaces.0
share/sounds/bong.au
share/sounds/busy.au
share/sounds/computer.au
share/sounds/ding.au
share/sounds/drip.au
share/sounds/train.au
@dirrm share/sounds
@dirrm include/X11/pixmaps