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

upgrade to version 5.0.1

Browse Source
This commit is contained in:
kevlo 2001-06-12 07:28:17 +00:00
parent 6e089e6bdd
commit 3c3ae82178
9 changed files with 38 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
x11/xfedor/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.12 2001/05/06 04:41:35 lebel Exp $
# $OpenBSD: Makefile,v 1.13 2001/06/12 07:28:17 kevlo Exp $
# ATTENTION: It does not work in > 256 color modes, please fix
# it if you can.
COMMENT= ".bdf, .xbm, .xpm mouse cursor editor"
DISTNAME= xfedor
PKGNAME= xfedor-1.0
DISTNAME= xfedor-5.0.1
CATEGORIES= x11
NEED_VERSION= 1.402
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/x11/util/
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/fonts
MAINTAINER= ports@openbsd.org
@ -17,21 +17,4 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= imake
XFHELP= ${PREFIX}/lib/X11/xfedor # See patches too
XCAT1= ${PREFIX}/man/cat1
do-install:
cd ${WRKSRC}; \
${INSTALL_PROGRAM} xfedor ${PREFIX}/bin
${INSTALL_DATA_DIR} ${XFHELP}
chown ${SHAREOWN}.${SHAREGRP} ${XFHELP}
chmod 755 ${XFHELP}
cd ${WRKSRC}/help; \
${INSTALL_DATA} * ${XFHELP}
${INSTALL_DATA} ${FILESDIR}/default.sos ${XFHELP}
cd ${WRKSRC}; \
${INSTALL_MAN} xfedor.txt ${XCAT1}/xfedor.0
.include <bsd.port.mk>

6
x11/xfedor/files/md5
View File

@ -1,3 +1,3 @@
MD5 (xfedor.tar.gz) = 09166cec44c5091af0bb383ca18e6533
RMD160 (xfedor.tar.gz) = ea8a81e0166d7e35361795de77cceab5904c1616
SHA1 (xfedor.tar.gz) = cd5802e0e59f6f6634579be91bfd5ed0cd947d72
MD5 (xfedor-5.0.1.tar.gz) = e41cf989bba655ff84b7926c1eac3a25
RMD160 (xfedor-5.0.1.tar.gz) = a644999d7b208c234e5bfd0007453d95baa3ee9e
SHA1 (xfedor-5.0.1.tar.gz) = a240e4b323149a9221b6454c1f3dfb8b0b544ff2

17
x11/xfedor/patches/patch-Imakefile
View File

@ -1,17 +0,0 @@
--- Imakefile.orig Thu May 26 10:56:29 1994
+++ Imakefile Sat Apr 15 04:58:25 2000
@@ -1,11 +1,8 @@
-XCOMM Specify here your Xpm installation directories
- XPM_INCLUDEDIR = /project/motif/build/Xpm3.4/source/lib
- XPM_LIBDIR = /project/motif/build/Xpm3.4/sun/lib
-
- EXTRA_INCLUDES = -I$(XPM_INCLUDEDIR)
+ DEFINES = -DDIRSOS=\"${X11BASE}/lib/X11/xfedor\"
+ EXTRA_INCLUDES = -I$(INCROOT)/X11 -I/usr/X11R6/include/X11
DEPLIBS = $(DEPXLIB)
-LOCAL_LIBRARIES = $(XLIB) -L$(XPM_LIBDIR) -lXpm
+LOCAL_LIBRARIES = $(XLIB) -lXpm
SYS_LIBRARIES = -lm
SRCS = couchex.c myrast.c dialogue.c popup.c\

31
x11/xfedor/patches/patch-Makefile Normal file
View File

@ -0,0 +1,31 @@
--- Makefile.orig Fri Nov 6 23:34:35 1998
+++ Makefile Mon Jun 11 09:54:10 2001
@@ -1,8 +1,10 @@
+PREFIX?=/usr/local
+
LIBS= -L/usr/X11R6/lib -lX11 -lXpm -lm
-SOSDIR=/usr/local/lib/xfedor
-BINDIR=/usr/local/bin
-MANDIR=/usr/local/man/man1
+SOSDIR=${PREFIX}/lib/xfedor
+BINDIR=${PREFIX}/bin
+MANDIR=${PREFIX}/man/man1
CFLAGS= -I. -I/usr/X11R6/include -O2 -DSOSDIR=\"$(SOSDIR)\"
XFEDOR= couchex.o myrast.o dialogue.o popup.o\
@@ -23,9 +25,10 @@
rm -f *.o
rm -f xfedor core initfont.bdf
-install: xfedor
+install:
install -s xfedor $(BINDIR)
mkdir -p $(SOSDIR)
- cp Sosa/* $(SOSDIR)
- #cp xfedor_a.man $(MANDIR)/xfedor.1
- @echo "install xfedor_a.man yourself... (only preformatted version present)"
+ cp Sos/* $(SOSDIR)
+ cp xfedor_a.man $(MANDIR)/xfedor.1
+
+all: xfedor

19
x11/xfedor/patches/patch-bitmaps-bull
View File

@ -1,19 +0,0 @@
*** bitmaps/bull.bak Mon Jun 13 17:59:16 1988
--- bitmaps/bull Tue Sep 3 01:46:36 1996
***************
*** 1,7 ****
#define bull_width 70
#define bull_height 75
#define bull_x_hot 0
! #define bull-y_hot -1
static char bull_bits[] = {
0xff, 0xff, 0xff, 0xff, 0x5f, 0xfe, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff,
0xff, 0x29, 0xfc, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0,
--- 1,7 ----
#define bull_width 70
#define bull_height 75
#define bull_x_hot 0
! #define bull_y_hot -1
static char bull_bits[] = {
0xff, 0xff, 0xff, 0xff, 0x5f, 0xfe, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff,
0xff, 0x29, 0xfc, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0,

57
x11/xfedor/patches/patch-couchex.c
View File

@ -1,57 +0,0 @@
*** couchex.c.orig Thu May 26 21:59:03 1994
--- couchex.c Tue Sep 3 02:09:18 1996
***************
*** 366,377 ****
{
XEvent rep ;
static int ZoneCour = 0 ;
! int i, keysym ;
char s[1] ;
do {
XNextEvent(Dpl,&rep) ;
! if (rep.type == KeyPress) XLookupString(&rep,s,1,&keysym,NULL);
} while ( ((rep.type != Expose) || (rep.xexpose.count != 0)) &&
((rep.type != KeyPress) || (IsModifierKey(keysym))) &&
(rep.type != ButtonPress) &&
--- 366,378 ----
{
XEvent rep ;
static int ZoneCour = 0 ;
! int i ;
! KeySym keysym ;
char s[1] ;
do {
XNextEvent(Dpl,&rep) ;
! if (rep.type == KeyPress) XLookupString(&rep.xkey,s,1,&keysym,NULL);
} while ( ((rep.type != Expose) || (rep.xexpose.count != 0)) &&
((rep.type != KeyPress) || (IsModifierKey(keysym))) &&
(rep.type != ButtonPress) &&
***************
*** 788,798 ****
int wd ;
{
int px, py ;
! long bidon ;
XWindowAttributes watt ;
XGetWindowAttributes(Dpl,wd,&watt);
! XQueryPointer(Dpl,root,&bidon,&bidon,&px,&py,&bidon,&bidon,&bidon);
if ((px + watt.width/2) > DisplayWidth(Dpl,screen))
px = DisplayWidth(Dpl,screen) - watt.width/2 ;
--- 789,801 ----
int wd ;
{
int px, py ;
! Window bidon ;
! int fake;
! unsigned int mfake;
XWindowAttributes watt ;
XGetWindowAttributes(Dpl,wd,&watt);
! XQueryPointer(Dpl,root,&bidon,&bidon,&px,&py,&fake,&fake,&mfake);
if ((px + watt.width/2) > DisplayWidth(Dpl,screen))
px = DisplayWidth(Dpl,screen) - watt.width/2 ;

56
x11/xfedor/patches/patch-filer.c
View File

@ -1,56 +0,0 @@
*** filer.c.orig Thu May 26 21:59:10 1994
--- filer.c Tue Sep 3 15:01:15 1996
***************
*** 85,91 ****
{
int i ;
int nchars ;
! char * filename[138] ;
int bytesperrow ;
unsigned char * vidmem ;
int vidwidth ;
--- 85,91 ----
{
int i ;
int nchars ;
! char filename[138] ;
int bytesperrow ;
unsigned char * vidmem ;
int vidwidth ;
***************
*** 187,193 ****
fprintf(stderr,"\n");
fprintf(stderr, msg, p1, p2, p3, p4);
fprintf(stderr,"\n");
! fclose(pF);
return -1 ;
}
--- 187,196 ----
fprintf(stderr,"\n");
fprintf(stderr, msg, p1, p2, p3, p4);
fprintf(stderr,"\n");
! if (pF != NULL) {
! fclose(pF);
! pF = NULL;
! }
return -1 ;
}
***************
*** 300,306 ****
if (!Extension(filename,".bdf")) strcat(filename,".bdf");
! if ((pF = fopen( filename, "r")) == NULL) return fatal("Can't open file");
getline(linebuf);
if ((sscanf(linebuf, "STARTFONT %s", namebuf) != 1) ||
--- 303,309 ----
if (!Extension(filename,".bdf")) strcat(filename,".bdf");
! if ((pF = fopen( filename, "r")) == NULL) return fatal("Can't open file %s", filename);
getline(linebuf);
if ((sscanf(linebuf, "STARTFONT %s", namebuf) != 1) ||

19
x11/xfedor/patches/patch-sos.c
View File

@ -1,19 +0,0 @@
*** sos.c.bak Thu May 26 21:59:13 1994
--- sos.c Tue Sep 3 01:15:19 1996
***************
*** 36,42 ****
{
if ((dirsos = getenv("SOS"))==0)
! if (UnixFileNameMode) dirsos = "/usr/local/lib/X11/xfedor" ;
else dirsos = "";
if (UnixFileNameMode) {
newdirsos = (char *)malloc(strlen(dirsos)+2);
--- 36,42 ----
{
if ((dirsos = getenv("SOS"))==0)
! if (UnixFileNameMode) dirsos = DIRSOS;
else dirsos = "";
if (UnixFileNameMode) {
newdirsos = (char *)malloc(strlen(dirsos)+2);

83
x11/xfedor/patches/patch-xfedor.man
View File

@ -1,83 +0,0 @@
*** /dev/null Tue May 19 01:26:19 1998
--- xfedor.man Tue May 19 01:28:40 1998
***************
*** 0 ****
--- 1,78 ----
+
+ XFEDOR(1) X Version 11 XFEDOR(1)
+
+ NAME
+ xfedor - font, cursor, icon editor.
+
+ SYNTAX
+ xfedor [-f fontfile[.bdf]] [-b bitmapfile[.xbm]]
+ [-m mousefiles] [-p pixmapfile[.xpm]]
+ [-z] [-xy] [-f1 fontname] [-f2 fontname]
+ [-g +x+y] [-d host:display.screen]
+
+ DESCRIPTION
+ xfedor is an X Window System Version 11 client.
+ xfedor is essentially a font editor for X11 bdf files (V 2.1).
+ xfedor can also generates limited (128x128) bitmaps in X11 format
+ or in XPM format (color) and has facilities for creating cursors.
+ xfedor is pure Xlib and doesn't support X resources.
+
+ ARGUMENTS
+ -f fontfile
+ a bdf file to be read at startup.
+ (xfedor appends .bdf if there is no extention).
+ -b bitmapfile
+ bitmap file in X11 format : "include file C".
+ (priority to .xbm extensions)
+ -m mousefiles
+ two bitmap X11 files, mousefileFore and mousefileMask,
+ are looking for in $MAP directory. (as at run-time)
+ -p pixmapfile
+ pixmap file (color) in XPM format (ASCII editable)
+ (priority for .xpm extensions)
+ -rv
+ reverse video : white on black (default black on white).
+ -f1 fontname
+ font to be use in general interface
+ -f2 fontname
+ font to be use in mouse guide lines
+ +x+y
+ initial geometry of the main window (default 10,10).
+ -z, -xy
+ Pixmap format used in image transferts (XPutImage,XGetImage).
+
+ SHELL VARIABLES
+ BDF
+ directory for read and write bdf files.
+ default value is empty string (current).
+ SOS
+ directory where xfedor search help files (optional).
+ default is /usr/local/lib/X11/xfedor.
+ MAP
+ directory to read and write bitmap/pixmap files from.
+ default value is empty string (current).
+ DISPLAY
+ default server name.
+ HOME
+ User home directory. Used as ~ replacement when it
+ appears as the first character of file name.
+
+ If the file name begins by a /, full path is taken.
+
+ FILES
+ $SOS/*.sos help files:
+ (*.sos, with * = {BEZIERS,FILL,METRIC,ROTATE,
+ WRITE,CIRCLE,FONT,NUM,SAVE,CUTAP,GARB,SOS,
+ RECTANGLE,EDIT,LINE,RESIZE,TRANSLATE,default)
+ $MAP/Fore* bitmap files for cursor foreground
+ $MAP/Mask* bitmap files for cursor background
+ $BDF/*.bdf Bitmap Distribution Format Files.
+ $MAP/*.xbm Bitmap X11 file (#define ..)
+ $MAP/*.xpm XPM format file (color format in ASCII).
+
+ SEE ALSO
+ bitmap(X), bdftosnf(X), xsetroot(X), pixmap.
+
+ AUTHORS
+ A young Daniel DARDAILLER
+