- Fix xfig to be able to use Ghostscript fonts again

- While here, update download location

PR:		ports/117253
Submitted by:	Steven G. Kargl <kargl@troutmask.apl.washington.edu>
This commit is contained in:
Pav Lucistnik 2007-12-15 20:48:48 +00:00
parent fb68a5185a
commit 7120c49524
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=203796
6 changed files with 63 additions and 3 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= xfig
PORTVERSION= 3.2.5.a5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/
DISTNAME= ${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full

View File

@ -0,0 +1,11 @@
--- u_fonts.c.old 2007-10-17 12:22:24.000000000 -0700
+++ u_fonts.c 2007-10-17 12:23:36.000000000 -0700
@@ -107,7 +107,7 @@
/* PostScript font names matched with X11 font names in x_fontinfo */
struct _fstruct ps_fontinfo[NUM_FONTS + 1] = {
- {"Default", -1},
+ {"Default", 0},
{"Times-Roman", 0},
{"Times-Italic", 1},
{"Times-Bold", 2},

View File

@ -0,0 +1,20 @@
--- w_fontpanel.c.orig Fri Feb 24 12:23:06 2006
+++ w_fontpanel.c
@@ -143,7 +143,7 @@
ps_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in
* menu */
ps_fontmenu_items[i].label = ps_fontinfo[i].name;
- ps_fontmenu_items[i].info = (caddr_t) (i - 1); /* index for font # */
+ ps_fontmenu_items[i].info = (caddr_t) i; /* index for font # */
}
for (i = 0; i < NUM_LATEX_FONTS; i++) {
@@ -359,7 +359,7 @@
char *font_name = mi->label;
if (*flag_sel)
- *font_ps_sel = (int) mi->info; /* set ps font to one selected */
+ *font_ps_sel = (int) mi->info - 1; /* set ps font to one selected */
else
*font_latex_sel = (int) mi->info; /* set latex font to one
* selected */

View File

@ -7,9 +7,9 @@
PORTNAME= xfig
PORTVERSION= 3.2.5
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://xfig.org/software/xfig/${PORTVERSION}/ \
ftp://www-epb.lbl.gov/xfig/
MASTER_SITES= http://files.xfig.org/
DISTNAME= ${PORTNAME}.${PORTVERSION}.full
MAINTAINER= ports@FreeBSD.org

View File

@ -0,0 +1,11 @@
--- u_fonts.c.old 2007-10-17 12:22:24.000000000 -0700
+++ u_fonts.c 2007-10-17 12:23:36.000000000 -0700
@@ -107,7 +107,7 @@
/* PostScript font names matched with X11 font names in x_fontinfo */
struct _fstruct ps_fontinfo[NUM_FONTS + 1] = {
- {"Default", -1},
+ {"Default", 0},
{"Times-Roman", 0},
{"Times-Italic", 1},
{"Times-Bold", 2},

View File

@ -1,5 +1,14 @@
--- w_fontpanel.c.orig Fri Feb 24 12:23:06 2006
+++ w_fontpanel.c
@@ -143,7 +143,7 @@
ps_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in
* menu */
ps_fontmenu_items[i].label = ps_fontinfo[i].name;
- ps_fontmenu_items[i].info = (caddr_t) (i - 1); /* index for font # */
+ ps_fontmenu_items[i].info = (caddr_t) i; /* index for font # */
}
for (i = 0; i < NUM_LATEX_FONTS; i++) {
@@ -183,7 +183,7 @@
ps_cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
ps_form, Args, ArgCount);
@ -36,3 +45,12 @@
XtInstallAccelerators(ps_form, ps_cancel);
XtInstallAccelerators(latex_form, latex_cancel);
@@ -359,7 +359,7 @@
char *font_name = mi->label;
if (*flag_sel)
- *font_ps_sel = (int) mi->info; /* set ps font to one selected */
+ *font_ps_sel = (int) mi->info - 1; /* set ps font to one selected */
else
*font_latex_sel = (int) mi->info; /* set latex font to one
* selected */