diff options
author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2006-12-13 22:14:47 +0000 |
---|---|---|
committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2006-12-13 22:14:47 +0000 |
commit | 759d64363e8deb98b49900c3b91b0e515140ac73 (patch) | |
tree | 0f20babf13b3a3cd71bc1b6b3c3b1e55ca73d41c /print | |
parent | Update to 1.16.1. User-visible changes: (diff) |
- Honor CC in the lib subdir
- Fix the compilation with gcc 4.x
Notes
Notes:
svn path=/head/; revision=179681
Diffstat (limited to 'print')
-rw-r--r-- | print/dviselect/Makefile | 2 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::Makefile | 14 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::pkfont.c | 13 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::pxlfont.c | 28 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::search.c | 11 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::tfm.c | 23 | ||||
-rw-r--r-- | print/dviselect/files/patch-lib::tfmfont.c | 11 |
7 files changed, 101 insertions, 1 deletions
diff --git a/print/dviselect/Makefile b/print/dviselect/Makefile index 8b7c38c6f271..1b284a4c6c67 100644 --- a/print/dviselect/Makefile +++ b/print/dviselect/Makefile @@ -7,7 +7,7 @@ PORTNAME= dviselect PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jmz diff --git a/print/dviselect/files/patch-lib::Makefile b/print/dviselect/files/patch-lib::Makefile new file mode 100644 index 000000000000..b07c457b6d7d --- /dev/null +++ b/print/dviselect/files/patch-lib::Makefile @@ -0,0 +1,14 @@ +--- lib/Makefile.orig Wed Nov 15 13:19:54 1989 ++++ lib/Makefile Wed Dec 13 23:00:00 2006 +@@ -10,9 +10,8 @@ + DESTDIR= + # Alas, -R makes ALL initialised variables read-only, and we cannot + # use it on font files; hence, FCFLAGS. +-CC=cc +-CFLAGS= -O -I../h +-FCFLAGS=-O -I../h ++CFLAGS+= -I../h ++FCFLAGS+= -I../h + + # 4.1BSD Vax: + #ASSRC= bcopy.s bzero.s diff --git a/print/dviselect/files/patch-lib::pkfont.c b/print/dviselect/files/patch-lib::pkfont.c new file mode 100644 index 000000000000..a5f4853384d5 --- /dev/null +++ b/print/dviselect/files/patch-lib::pkfont.c @@ -0,0 +1,13 @@ +--- lib/pkfont.c.orig Wed Nov 15 13:19:52 1989 ++++ lib/pkfont.c Wed Dec 13 23:01:34 2006 +@@ -781,8 +781,8 @@ + if (pk != NULL) { + free(pk->pk_base); pk -> pk_base = 0; + if (pk->pk_morec != NULL) { +- free((char *) pk->pk_morec); (char *) pk->pk_morec = 0; ++ free((char *) pk->pk_morec); pk->pk_morec = 0; + } +- free((char *) pk); (char *) pk = 0; ++ free((char *) pk); pk = 0; + } + } diff --git a/print/dviselect/files/patch-lib::pxlfont.c b/print/dviselect/files/patch-lib::pxlfont.c new file mode 100644 index 000000000000..2c9148755d63 --- /dev/null +++ b/print/dviselect/files/patch-lib::pxlfont.c @@ -0,0 +1,28 @@ +--- lib/pxlfont.c~ Wed Nov 15 13:19:53 1989 ++++ lib/pxlfont.c Wed Dec 13 23:03:21 2006 +@@ -156,7 +156,7 @@ + if (pd->pd_ras) { + free(pd->pd_ras); pd->pd_ras = 0; + } +- free((char *) pd); (char *) pd = 0; ++ free((char *) pd); pd = 0; + } + if (fp) + (void) fclose(fp); +@@ -286,7 +286,7 @@ + pd->pd_nconv += h - l; + if (pd->pd_nconv == 128) { + free(pd->pd_ras); pd->pd_ras = 0; +- free((char *) pd); (char *) pd = 0; ++ free((char *) pd); pd = 0; + f->f_details = NULL; + } + return (0); +@@ -305,6 +305,6 @@ + if (pd->pd_ras != NULL) { + free(pd->pd_ras); pd->pd_ras = 0; + } +- free((char *) pd); (char *) pd = 0; ++ free((char *) pd); pd = 0; + } + } diff --git a/print/dviselect/files/patch-lib::search.c b/print/dviselect/files/patch-lib::search.c new file mode 100644 index 000000000000..43054c620521 --- /dev/null +++ b/print/dviselect/files/patch-lib::search.c @@ -0,0 +1,11 @@ +--- lib/search.c~ Wed Nov 15 13:19:58 1989 ++++ lib/search.c Wed Dec 13 22:53:51 2006 +@@ -72,7 +72,7 @@ + s->s_space = 10; /* initially, room for 10 objects */ + s->s_n = 0; /* and none in the table */ + if ((s->s_data = malloc(s->s_space * dsize)) == 0) { +- free((char *) s); (char *) s = 0; ++ free((char *) s); s = 0; + return (0); + } + return (s); diff --git a/print/dviselect/files/patch-lib::tfm.c b/print/dviselect/files/patch-lib::tfm.c new file mode 100644 index 000000000000..72623335046a --- /dev/null +++ b/print/dviselect/files/patch-lib::tfm.c @@ -0,0 +1,23 @@ +--- lib/tfm.c~ Wed Nov 15 13:20:02 1989 ++++ lib/tfm.c Wed Dec 13 22:56:44 2006 +@@ -63,16 +63,16 @@ + + bad: + if (t->t_ci != NULL) { +- free((char *) t->t_ci); (char *) t->t_ci = 0; ++ free((char *) t->t_ci); t->t_ci = 0; + } + if (t->t_width != NULL) { +- free((char *) t->t_width); (char *) t->t_width = 0; ++ free((char *) t->t_width); t->t_width = 0; + } + if (t->t_height != NULL) { +- free((char *) t->t_height); (char *) t->t_height = 0; ++ free((char *) t->t_height); t->t_height = 0; + } + if (t->t_depth != NULL) { +- free((char *) t->t_depth); (char *) t->t_depth = 0; ++ free((char *) t->t_depth); t->t_depth = 0; + } + return (-1); + } diff --git a/print/dviselect/files/patch-lib::tfmfont.c b/print/dviselect/files/patch-lib::tfmfont.c new file mode 100644 index 000000000000..b4ebe64804c1 --- /dev/null +++ b/print/dviselect/files/patch-lib::tfmfont.c @@ -0,0 +1,11 @@ +--- lib/tfmfont.c~ Wed Nov 15 13:20:03 1989 ++++ lib/tfmfont.c Wed Dec 13 23:04:06 2006 +@@ -139,7 +139,7 @@ + fail: + (void) fclose(fd); + if (tfm != NULL) { +- free((char *) tfm); (char *) tfm = 0; ++ free((char *) tfm); tfm = 0; + } + return (-1); + } |