diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-03-02 17:49:29 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-03-02 17:49:29 +0000 |
commit | b3166e3f9902eddbcb05d0d870e1186156be05a5 (patch) | |
tree | 299fab56956a9a5907616c1bb2a6c35950b99496 /graphics/aalib | |
parent | - update to 3.16.1 (diff) |
Update to 1.4.r5
PR: 35480
Submitted by: Norikatsu Shigemura <nork@ninth-nine.com>
Notes
Notes:
svn path=/head/; revision=55405
Diffstat (limited to 'graphics/aalib')
-rw-r--r-- | graphics/aalib/Makefile | 33 | ||||
-rw-r--r-- | graphics/aalib/distinfo | 3 | ||||
-rw-r--r-- | graphics/aalib/files/patch-af | 11 | ||||
-rw-r--r-- | graphics/aalib/files/patch-ag | 72 | ||||
-rw-r--r-- | graphics/aalib/files/patch-ah | 20 | ||||
-rw-r--r-- | graphics/aalib/files/patch-ai | 6 | ||||
-rw-r--r-- | graphics/aalib/pkg-plist | 2 |
7 files changed, 81 insertions, 66 deletions
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 25a90c7e022b..4cc169b8d42c 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -6,14 +6,15 @@ # PORTNAME= aalib -PORTVERSION= 1.2 -PORTREVISION= 2 +PORTVERSION= 1.4.r5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= aa-project +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= ports@FreeBSD.org +WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 USE_LIBTOOL= yes INSTALLS_SHLIB= yes @@ -25,9 +26,35 @@ CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \ CONFIGURE_ARGS= --with-x=no .endif +MAN1= aafire.1 +MAN3= aa_attrs.3 aa_autoinit.3 aa_close.3 aa_createedit.3 \ + aa_currentfont.3 aa_defparams.3 aa_autoinitkbd.3 \ + aa_autoinitmouse.3 aa_defrenderparams.3 aa_dithernames.3 \ + aa_drivers.3 mem_d.3 aa_edit.3 aa_fonts.3 aa_getkey.3 \ + aa_gotoxy.3 aa_help.3 aa_hidecursor.3 aa_image.3 \ + aa_displayrecommended.3 aa_editkey.3 aa_fastrender.3 \ + aa_init.3 aa_printf.3 aa_formats.3 aa_getevent.3 \ + aa_getmouse.3 aa_hidemouse.3 aa_imgheight.3 aa_imgwidth.3 \ + aa_initkbd.3 aa_initmouse.3 aa_kbddrivers.3 \ + aa_kbdrecommended.3 aa_mmheight.3 aa_mmwidth.3 \ + aa_mousedrivers.3 aa_mouserecommended.3 aa_parseoptions.3 \ + aa_putpixel.3 aa_puts.3 aa_recommendhi.3 \ + aa_recommendhidisplay.3 aa_recommendhikbd.3 \ + aa_recommendhimouse.3 aa_recommendlow.3 \ + aa_recommendlowdisplay.3 aa_recommendlowkbd.3 \ + aa_recommendlowmouse.3 aa_registerfont.3 aa_render.3 \ + aa_resize.3 aa_resizehandler.3 aa_scrheight.3 aa_scrwidth.3 \ + aa_setfont.3 aa_setsupported.3 aa_showcursor.3 aa_showmouse.3 \ + aa_text.3 aa_uninitkbd.3 aa_uninitmouse.3 save_d.3 + +post-extract: + @${RM} -f ${WRKSRC}/doc/aalib.info* + post-patch: @${RM} -f ${WRKSRC}/config.cache - @${PERL} -pi -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|/usr/local|${LOCALBASE}|g; \ + s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \ + ${WRKSRC}/configure @find ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \ | xargs ${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo index fa4e1d513cd9..af46f04a6f98 100644 --- a/graphics/aalib/distinfo +++ b/graphics/aalib/distinfo @@ -1,2 +1 @@ -MD5 (aalib-1.2.tar.gz) = 36c7156f33a6bb7a0fac735d8a4d1791 -MD5 (aalib-1.2.tar.gz) = 790434e0f2005fc95559ab3eab42e746 +MD5 (aalib-1.4rc5.tar.gz) = 9801095c42bba12edebd1902bcf0a990 diff --git a/graphics/aalib/files/patch-af b/graphics/aalib/files/patch-af deleted file mode 100644 index 4451d84cf42d..000000000000 --- a/graphics/aalib/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- aalib.h.orig Tue Nov 11 20:06:44 1997 -+++ aalib.h Thu Feb 1 15:21:47 2001 -@@ -183,7 +183,7 @@ - typedef struct aa_linkedlist aa_linkedlist; - typedef struct aa_linkedlist aa_reclist; - typedef struct aa_renderparams aa_renderparams; --typedef struct aa_hardwareparams aa_hardware_params; -+typedef struct aa_hardware_params aa_hardware_params; - typedef struct aa_driver aa_driver; - typedef struct aa_font aa_font; - typedef struct aa_format aa_format; diff --git a/graphics/aalib/files/patch-ag b/graphics/aalib/files/patch-ag index 27a3a3ea0806..f2ed1336f6b0 100644 --- a/graphics/aalib/files/patch-ag +++ b/graphics/aalib/files/patch-ag @@ -1,39 +1,37 @@ ---- aafire.c.orig Fri Mar 2 16:30:27 2001 -+++ aafire.c Fri Mar 2 16:31:17 2001 -@@ -51,6 +51,7 @@ - static void initialize() +--- src/aafire.c.orig Fri Apr 27 00:30:03 2001 ++++ src/aafire.c Sat Mar 2 22:51:46 2002 +@@ -48,6 +48,7 @@ + initialize (void) { - int i; -+ srandomdev(); - context = aa_autoinit(&aa_defparams); - if (context == NULL) { - printf("Failed to initialize aalib\n"); -@@ -107,21 +108,21 @@ - height++; - loop--; - if (loop < 0) -- loop = rand() % 3, sloop++;; -+ loop = random() % 3, sloop++;; - i1 = 1; - i2 = 4 * XSIZ + 1; - for (p = (char *) bitmap + XSIZ * (YSIZ + 0); p < ((unsigned char *) bitmap + XSIZ * (YSIZ + 1)); p++, i1 += 4, i2 -= 4) { -- last1 = rand() % min(i1, min(i2, height)); -- i = rand() % 6; -+ last1 = random() % min(i1, min(i2, height)); -+ i = random() % 6; - for (; p < (unsigned char *) bitmap + XSIZ * (YSIZ + 1) && i != 0; p++, i--, i1 += 4, i2 -= 4) -- *p = last1, last1 += rand() % 6 - 2, -- *(p + XSIZ) = last1, last1 += rand() % 6 - 2; -- *(p + 2 * XSIZ) = last1, last1 += rand() % 6 - 2; -+ *p = last1, last1 += random() % 6 - 2, -+ *(p + XSIZ) = last1, last1 += random() % 6 - 2; -+ *(p + 2 * XSIZ) = last1, last1 += random() % 6 - 2; + int i; ++ srandomdev(); + context = aa_autoinit (&aa_defparams); + if (context == NULL) + { +@@ -114,20 +115,20 @@ + height++; + loop--; + if (loop < 0) +- loop = rand () % 3, sloop++;; ++ loop = random () % 3, sloop++;; + i1 = 1; + i2 = 4 * XSIZ + 1; + for (p = (char *) bitmap + XSIZ * (YSIZ + 0); + p < ((unsigned char *) bitmap + XSIZ * (YSIZ + 1)); + p++, i1 += 4, i2 -= 4) + { +- last1 = rand () % min (i1, min (i2, height)); +- i = rand () % 6; ++ last1 = random () % min (i1, min (i2, height)); ++ i = random () % 6; + for (; p < (unsigned char *) bitmap + XSIZ * (YSIZ + 1) && i != 0; + p++, i--, i1 += 4, i2 -= 4) +- *p = last1, last1 += rand () % 6 - 2, *(p + XSIZ) = last1, last1 += +- rand () % 6 - 2; +- *(p + 2 * XSIZ) = last1, last1 += rand () % 6 - 2; ++ *p = last1, last1 += random () % 6 - 2, *(p + XSIZ) = last1, last1 += ++ random () % 6 - 2; ++ *(p + 2 * XSIZ) = last1, last1 += random () % 6 - 2; } - /* - for(p=bitmap+XSIZ*YSIZ;p<bitmap+(YSIZ+2)*XSIZ;p++) - { -- *p=rand(); -+ *p=random(); - } */ - i = 0; - firemain(); + i = 0; + firemain (); diff --git a/graphics/aalib/files/patch-ah b/graphics/aalib/files/patch-ah index f3de83cd4656..e29437b8a358 100644 --- a/graphics/aalib/files/patch-ah +++ b/graphics/aalib/files/patch-ah @@ -1,27 +1,27 @@ ---- aarender.c.orig Mon Oct 13 10:21:01 1997 -+++ aarender.c Fri Mar 2 16:30:17 2001 -@@ -26,11 +26,11 @@ +--- src/aarender.c.orig Thu Apr 26 23:37:31 2001 ++++ src/aarender.c Sat Mar 2 23:02:04 2002 +@@ -27,11 +27,11 @@ return (p); } - #define MYLONG_MAX 0xffffffff /*this is enought for me. */ + #define MYLONG_MAX 0xffffffffU /*this is enought for me. */ -#define myrand() (state = ((state * 1103515245) + 12345) & MYLONG_MAX) +#define myrand() (random() & MYLONG_MAX) - void aa_renderpalette(aa_context * c, aa_palette palette, aa_renderparams * p, int x1, int y1, int x2, int y2) + void aa_renderpalette(aa_context * c, __AA_CONST aa_palette palette, __AA_CONST aa_renderparams * p, int x1, int y1, int x2, int y2) { - static int state; + static int rand_init = 0; int x, y; int val; int wi = c->imgwidth; -@@ -43,6 +43,11 @@ - int mval; - int gamma = p->gamma != 1.0; +@@ -47,6 +47,11 @@ + int randomval = p->randomval; + int dither = p->dither; aa_palette table; + + if (!rand_init) { -+ srandomdev(); -+ rand_init = 1; ++ srandomdev(); ++ rand_init = 1; + } if (x2 < 0 || y2 < 0 || x1 > aa_scrwidth(c) || y1 > aa_scrheight(c)) return; diff --git a/graphics/aalib/files/patch-ai b/graphics/aalib/files/patch-ai index f01765cc3b58..811a580214a0 100644 --- a/graphics/aalib/files/patch-ai +++ b/graphics/aalib/files/patch-ai @@ -1,6 +1,6 @@ ---- aaprintf.c.orig Fri Mar 2 16:34:22 2001 -+++ aaprintf.c Fri Mar 2 16:35:20 2001 -@@ -6,7 +6,7 @@ +--- src/aaprintf.c.orig Thu Apr 26 23:37:31 2001 ++++ src/aaprintf.c Sat Mar 2 22:54:56 2002 +@@ -7,7 +7,7 @@ char buf[1025]; int i; va_start(args,fmt); diff --git a/graphics/aalib/pkg-plist b/graphics/aalib/pkg-plist index 38e1af3ea5b4..ffa3bcb01b0c 100644 --- a/graphics/aalib/pkg-plist +++ b/graphics/aalib/pkg-plist @@ -2,10 +2,12 @@ bin/aafire bin/aainfo bin/aasavefont bin/aatest +bin/aalib-config include/aalib.h lib/libaa.a lib/libaa.so lib/libaa.so.1 +share/aclocal/aalib.m4 @unexec install-info --delete %D/info/aalib.info %D/info/dir info/aalib.info @exec install-info %D/info/aalib.info %D/info/dir |