summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-10-17 12:47:19 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-10-17 12:47:19 +0000
commit61373dc4060070765f61529ac92e263454a74c0f (patch)
treea7ab0af667155b4061098379619e976fcdaa0de0 /graphics
parentae33b8c1e98c68d5f3afa96fc860c772fd45aa15 (diff)
downloadpkgsrc-61373dc4060070765f61529ac92e263454a74c0f.tar.gz
update to tgif-4.1.41.
Partial list of changes are: -fixes the bugs addressed by the patches in tgif-4.1.40nb3 -several other bug fixes. -Fix a bug with "on_resize=" attribute -Fix a bug with Tgif.DeleteCmdAsCut -Remove a redundant "a4" string in the generates PS file if A4 paper is requested -Add horizontal scroll for mouse wheel -Add a compiler option -D_DONT_REENCODE -Add ConvertToBezier in the Poly/Polygon submenu of the Edit Menu -Add a bunch of commands for adding tick marks to a poly/polygon/spline object. -New Tgif.tmpl-darwin file for Darwin/Mac OS X (with XFree86) -Update tgwb (the tgif-based whiteboard application) to use a new Reliable IP-multicast Library -Add a new X default, Tgif.UseXPmVersion1ForXPmDeck -Add new X defaults, Tgif.SlideShowWindowOffsets -Add the following new internal commands: edit_attr_in_text_mode(<attr_name>) for a more detailed list refer to the HISTORY file included with tgif.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/tgif/Makefile6
-rw-r--r--graphics/tgif/distinfo9
-rw-r--r--graphics/tgif/patches/patch-aa202
-rw-r--r--graphics/tgif/patches/patch-ab147
-rw-r--r--graphics/tgif/patches/patch-ac40
5 files changed, 6 insertions, 398 deletions
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 24830834a2a..4589756b9e8 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2001/08/22 17:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/10/17 12:47:19 dmcmahill Exp $
#
-DISTNAME= tgif-4.1.40
-PKGNAME= tgif-4.1.40nb3
+DISTNAME= tgif-4.1.41
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \
ftp://ftp.cs.ucla.edu/pub/tgif/
@@ -18,5 +17,6 @@ post-patch::
@${RM} -f ${WRKSRC}/Tgif.tmpl
@${CP} ${WRKSRC}/Tgif.tmpl-netbsd ${WRKSRC}/Tgif.tmpl
+.include "../../devel/pth/buildlink.mk"
.include "../../graphics/jpeg/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tgif/distinfo b/graphics/tgif/distinfo
index d7c74d9afbe..5a171f18d56 100644
--- a/graphics/tgif/distinfo
+++ b/graphics/tgif/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/07/18 20:26:21 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2001/10/17 12:47:19 dmcmahill Exp $
-SHA1 (tgif-4.1.40.tar.gz) = 478d24a338d71f20649d03fe6b888d733baca82e
-Size (tgif-4.1.40.tar.gz) = 1436655 bytes
-SHA1 (patch-aa) = 585096ebe834f47dc4091eeeec63fcb5510fc123
-SHA1 (patch-ab) = 5f3ca62f2f0cbbdcdcfa3c279a01210015fc548c
-SHA1 (patch-ac) = 93f835fbd264f5f2e39caba6be5797810f071550
+SHA1 (tgif-4.1.41.tar.gz) = bd703861961a76a81d2ef366532b5ce8bd408eb1
+Size (tgif-4.1.41.tar.gz) = 1497477 bytes
diff --git a/graphics/tgif/patches/patch-aa b/graphics/tgif/patches/patch-aa
deleted file mode 100644
index a8c0aac76d6..00000000000
--- a/graphics/tgif/patches/patch-aa
+++ /dev/null
@@ -1,202 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/07/15 03:29:23 dmcmahill Exp $
-
-fix a bug in running tgif scripts via the -exec flag. Patch provided
-by the tgif author:
-Bill Cheng // william@cs.umd.edu <URL:http://www.cs.umd.edu/~william/>
-
-*** exec.c.orig 2000/11/09 00:07:26
---- exec.c 2001/03/19 22:08:19
-***************
-*** 71,74 ****
---- 71,75 ----
- #include "obj.e"
- #include "oval.e"
-+ #include "page.e"
- #include "pattern.e"
- #include "poly.e"
-***************
-*** 1404,1408 ****
- /* obj_ptr better be a top-level object */
- {
-! int count=0, need_to_change=FALSE;
- struct StrRec *str_ptr=NULL;
- MiniLineInfo *pMiniLine=NULL;
---- 1405,1409 ----
- /* obj_ptr better be a top-level object */
- {
-! int count=0, need_to_change=TRUE;
- struct StrRec *str_ptr=NULL;
- MiniLineInfo *pMiniLine=NULL;
-***************
-*** 1411,1439 ****
- count++;
- }
-! if (count != attr_ptr->obj->detail.t->lines) {
-! need_to_change = TRUE;
-! } else {
-! for (str_ptr=(*ppTopStr),
-! pMiniLine=attr_ptr->obj->detail.t->minilines.first;
-! str_ptr != NULL;
-! str_ptr=str_ptr->next, pMiniLine=pMiniLine->next) {
-! if (pMiniLine == NULL) {
-! need_to_change = TRUE;
-! break;
-! } else {
-! if (pMiniLine == attr_ptr->obj->detail.t->minilines.first) {
-! if (strcmp(attr_ptr->attr_value.s, str_ptr->dyn_str.s) != 0) {
-! need_to_change = TRUE;
-! break;
-! }
-! } else {
-! if (strcmp(str_ptr->dyn_str.s, str_ptr->dyn_str.s) != 0) {
-! need_to_change = TRUE;
-! break;
-! }
-! }
-! }
-! }
-! }
- if (need_to_change) {
- int ltx, lty, rbx, rby, switch_selected=FALSE;
---- 1412,1442 ----
- count++;
- }
-! /*
-! * if (count != attr_ptr->obj->detail.t->lines) {
-! * need_to_change = TRUE;
-! * } else {
-! * for (str_ptr=(*ppTopStr),
-! * pMiniLine=attr_ptr->obj->detail.t->minilines.first;
-! * str_ptr != NULL;
-! * str_ptr=str_ptr->next, pMiniLine=pMiniLine->next) {
-! * if (pMiniLine == NULL) {
-! * need_to_change = TRUE;
-! * break;
-! * } else {
-! * if (pMiniLine == attr_ptr->obj->detail.t->minilines.first) {
-! * if (strcmp(attr_ptr->attr_value.s, str_ptr->dyn_str.s) != 0) {
-! * need_to_change = TRUE;
-! * break;
-! * }
-! * } else {
-! * if (strcmp(str_ptr->dyn_str.s, str_ptr->dyn_str.s) != 0) {
-! * need_to_change = TRUE;
-! * break;
-! * }
-! * }
-! * }
-! * }
-! * }
-! */
- if (need_to_change) {
- int ltx, lty, rbx, rby, switch_selected=FALSE;
-***************
-*** 8392,8395 ****
---- 8395,8423 ----
- }
-
-+ static
-+ int DoExecSelectEachObjAndExec(attr_name)
-+ char *attr_name;
-+ {
-+ struct ObjRec *optr=NULL;
-+ int rc=TRUE;
-+
-+ for (optr=botObj; rc && optr != NULL; optr=optr->prev) {
-+ struct AttrRec *attr_ptr=NULL;
-+
-+ attr_ptr = FindAttrWithName(optr, attr_name, NULL);
-+ if (attr_ptr != NULL) {
-+ struct SelRec *sel_ptr=SelectThisObject(optr);
-+
-+ AddSel(NULL, topSel, sel_ptr);
-+ UpdSelBBox();
-+ if (!DoExec(attr_ptr, optr)) {
-+ rc = FALSE;
-+ }
-+ RemoveAllSel();
-+ }
-+ }
-+ return rc;
-+ }
-+
- int ExecSelectEachObjAndExec(argv, obj_ptr, orig_cmd)
- char **argv, *orig_cmd;
-***************
-*** 8398,8420 ****
- {
- char *attr_name_to_exec=argv[0];
-- struct ObjRec *optr=NULL;
-- struct AttrRec *attr_ptr=NULL;
- int rc=TRUE;
-
- UtilRemoveQuotes(attr_name_to_exec);
-- sprintf(execDummyStr, "%s=", attr_name_to_exec);
-- attr_ptr = FindAttrWithName(obj_ptr, execDummyStr, NULL);
-- if (attr_ptr == NULL) return BadAttr(execDummyStr, orig_cmd);
-
-! MakeQuiescent();
-! for (optr=botObj; rc && optr != NULL; optr=optr->prev) {
-! struct SelRec *sel_ptr=SelectThisObject(optr);
-
-! AddSel(NULL, topSel, sel_ptr);
-! UpdSelBBox();
-! if (!DoExec(attr_ptr, optr)) {
-! rc = FALSE;
- }
-! RemoveAllSel();
- }
- return rc;
---- 8426,8477 ----
- {
- char *attr_name_to_exec=argv[0];
- int rc=TRUE;
-
- UtilRemoveQuotes(attr_name_to_exec);
-
-! if (topSel != NULL) {
-! struct AttrRec *attr_ptr=NULL;
-
-! sprintf(execDummyStr, "%s=", attr_name_to_exec);
-! attr_ptr = FindAttrWithName(obj_ptr, execDummyStr, NULL);
-! if (attr_ptr == NULL) return BadAttr(execDummyStr, orig_cmd);
-!
-! rc = DoExecSelectEachObjAndExec(execDummyStr);
-! } else {
-! char *attr_name=(char*)malloc(strlen(attr_name_to_exec)+2);
-!
-! if (attr_name == NULL) FailAllocMessage();
-! sprintf(attr_name, "%s=", attr_name_to_exec);
-!
-! MakeQuiescent();
-! StartCompositeCmd();
-! if (lastPageNum == 1) {
-! rc = DoExecSelectEachObjAndExec(attr_name);
-! } else {
-! int saved_cur_page_num=curPageNum, prev_page_num=curPageNum;
-!
-! for (curPageNum=1; rc && curPageNum <= lastPageNum; curPageNum++) {
-! if (prev_page_num != curPageNum) {
-! PrepareToRecord(CMD_GOTO_PAGE, NULL, NULL, prev_page_num);
-! GotoPageNum(curPageNum);
-! RedrawPageWindow();
-! RecordCmd(CMD_GOTO_PAGE, NULL, NULL, NULL, curPageNum);
-! ClearAndRedrawDrawWindow();
-! prev_page_num = curPageNum;
-! }
-! rc = DoExecSelectEachObjAndExec(attr_name);
-! }
-! if (prev_page_num != curPageNum) {
-! PrepareToRecord(CMD_GOTO_PAGE, NULL, NULL, prev_page_num);
-! GotoPageNum(saved_cur_page_num);
-! RedrawPageWindow();
-! RecordCmd(CMD_GOTO_PAGE, NULL, NULL, NULL, saved_cur_page_num);
-! ClearAndRedrawDrawWindow();
-! prev_page_num = curPageNum;
-! }
- }
-! EndCompositeCmd();
-!
-! UtilFree(attr_name);
- }
- return rc;
diff --git a/graphics/tgif/patches/patch-ab b/graphics/tgif/patches/patch-ab
deleted file mode 100644
index 1f0d0be3224..00000000000
--- a/graphics/tgif/patches/patch-ab
+++ /dev/null
@@ -1,147 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/07/18 20:28:35 dmcmahill Exp $
-
-Fixes a bug in exporting postscript from the command line where the
-temporary directory name is not initialized properly.
-
-Patch is from the tgif author and it will be in the next release.
-
-*** tgif.c.orig Wed Jul 18 10:33:11 2001
---- tgif.c Wed Jul 18 10:33:25 2001
-***************
-*** 336,339 ****
---- 336,340 ----
- }
- InitPaperSize();
-+ InitTmpDir();
- if (PRTGIF && !cmdLineOpenDisplay) InitDontReencode(NULL);
- if (argc <= 0) {
-*** setup.e.orig Wed Jul 18 10:33:08 2001
---- setup.e Wed Jul 18 10:33:32 2001
-***************
-*** 183,186 ****
---- 183,187 ----
- extern void InitPaperSize ARGS_DECL((void));
- extern void CleanUpPaperSize ARGS_DECL((void));
-+ extern void InitTmpDir ARGS_DECL((void));
- extern void Setup ARGS_DECL((void));
- extern void CleanUpResiduals ARGS_DECL((void));
-*** setup.c.orig Wed Jul 18 10:33:05 2001
---- setup.c Wed Jul 18 10:36:36 2001
-***************
-*** 843,846 ****
---- 843,895 ----
- }
-
-+ void InitTmpDir()
-+ {
-+ int tmp_dir_in_x_def=FALSE;
-+ char *c_ptr=NULL;
-+
-+ if (!PRTGIF || cmdLineOpenDisplay) {
-+ /* do not translate -- program constants */
-+ if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDir")) != NULL) {
-+ UtilTrimBlanks(c_ptr);
-+ if (*c_ptr == '\0') {
-+ fprintf(stderr, TgLoadString(STID_INVALID_DIR_IN_X_DEFAULT),
-+ c_ptr, TOOL_NAME, "TmpDir");
-+ fprintf(stderr, "\n");
-+ } else {
-+ UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, c_ptr);
-+ strcat(tmpDir, DIR_SEP_STR);
-+ if (UtilIsDirectory(tmpDir)) {
-+ tmp_dir_in_x_def = TRUE;
-+ } else {
-+ fprintf(stderr, TgLoadString(STID_TMP_DIR_NOT_EXIST_USE_XDEF),
-+ tmpDir, TOOL_NAME, "TmpDir");
-+ fprintf(stderr, "\n");
-+ }
-+ }
-+ }
-+ }
-+ if (!tmp_dir_in_x_def) {
-+ #ifndef _TMP_DIR_IN_HOME_DIR
-+ UtilStrCpyN(tmpDir, sizeof(tmpDir), TMP_DIR);
-+ if (!PRTGIF || cmdLineOpenDisplay) {
-+ if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDirInHomeDir")) !=
-+ NULL && UtilStrICmp(c_ptr, "true") == 0) {
-+ UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, tgifDir);
-+ strcat(tmpDir, DIR_SEP_STR);
-+ }
-+ }
-+ #else /* _TMP_DIR_IN_HOME_DIR */
-+ UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, tgifDir);
-+ strcat(tmpDir, DIR_SEP_STR);
-+ if (!PRTGIF || cmdLineOpenDisplay) {
-+ if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDirInHomeDir")) !=
-+ NULL && UtilStrICmp(c_ptr, "false") == 0) {
-+ UtilStrCpyN(tmpDir, sizeof(tmpDir), TMP_DIR);
-+ }
-+ }
-+ #endif /* ~_TMP_DIR_IN_HOME_DIR */
-+ }
-+ }
-+
- void Setup()
- {
-***************
-*** 849,853 ****
- int bg_pixel=(-1);
- char *c_ptr=NULL;
-! int def_x_neg=0, def_y_neg=0, paper_size_set, tmp_dir_in_x_def=FALSE;
- struct stat stat_buf;
- XWMHints wmhints;
---- 898,902 ----
- int bg_pixel=(-1);
- char *c_ptr=NULL;
-! int def_x_neg=0, def_y_neg=0, paper_size_set;
- struct stat stat_buf;
- XWMHints wmhints;
-***************
-*** 1448,1487 ****
- GetWorkingDirectory(bootDir, sizeof(bootDir));
- }
-! /* do not translate -- program constants */
-! if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDir")) != NULL) {
-! UtilTrimBlanks(c_ptr);
-! if (*c_ptr == '\0') {
-! fprintf(stderr, TgLoadString(STID_INVALID_DIR_IN_X_DEFAULT),
-! c_ptr, TOOL_NAME, "TmpDir");
-! fprintf(stderr, "\n");
-! } else {
-! UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, c_ptr);
-! strcat(tmpDir, DIR_SEP_STR);
-! if (UtilIsDirectory(tmpDir)) {
-! tmp_dir_in_x_def = TRUE;
-! } else {
-! fprintf(stderr, TgLoadString(STID_TMP_DIR_NOT_EXIST_USE_XDEF),
-! tmpDir, TOOL_NAME, "TmpDir");
-! fprintf(stderr, "\n");
-! }
-! }
-! }
-! if (!tmp_dir_in_x_def) {
-! #ifndef _TMP_DIR_IN_HOME_DIR
-! UtilStrCpyN(tmpDir, sizeof(tmpDir), TMP_DIR);
-! if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDirInHomeDir")) !=
-! NULL && UtilStrICmp(c_ptr, "true") == 0) {
-! UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, tgifDir);
-! strcat(tmpDir, DIR_SEP_STR);
-! }
-! #else /* _TMP_DIR_IN_HOME_DIR */
-! UtilStrCpyN(tmpDir, sizeof(tmpDir)-1, tgifDir);
-! strcat(tmpDir, DIR_SEP_STR);
-! if ((c_ptr=XGetDefault(mainDisplay, TOOL_NAME, "TmpDirInHomeDir")) !=
-! NULL && UtilStrICmp(c_ptr, "false") == 0) {
-! UtilStrCpyN(tmpDir, sizeof(tmpDir), TMP_DIR);
-! }
-! #endif /* ~_TMP_DIR_IN_HOME_DIR */
-! }
- enableMouseWheel = TRUE;
- if (threeDLook && (c_ptr=XGetDefault(mainDisplay, TOOL_NAME,
---- 1497,1502 ----
- GetWorkingDirectory(bootDir, sizeof(bootDir));
- }
-! InitTmpDir();
-!
- enableMouseWheel = TRUE;
- if (threeDLook && (c_ptr=XGetDefault(mainDisplay, TOOL_NAME,
diff --git a/graphics/tgif/patches/patch-ac b/graphics/tgif/patches/patch-ac
deleted file mode 100644
index b33c6f067d4..00000000000
--- a/graphics/tgif/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/07/18 20:28:35 dmcmahill Exp $
-
-work around a compiler bug which causes arrowheads to not
-display correctly on NetBSD-1.5 and older alpha's when
-optimization is used.
-
---- poly.c.orig Sat Aug 5 09:57:25 2000
-+++ poly.c Wed Jul 18 16:12:24 2001
-@@ -3232,4 +3232,5 @@
- double len, sin, cos;
- XGCValues values;
-+ short tmps;
-
- trans_pat = ObjPtr->trans_pat;
-@@ -3320,8 +3321,8 @@
- tmp_v[0].x = tmp_v[3].x = v0.x;
- tmp_v[0].y = tmp_v[3].y = v0.y;
-- tmp_v[1].x = round(v0.x + aw*cos - ah*sin);
-- tmp_v[1].y = round(v0.y + aw*sin + ah*cos);
-- tmp_v[2].x = round(v0.x + aw*cos + ah*sin);
-- tmp_v[2].y = round(v0.y + aw*sin - ah*cos);
-+ tmps = round(v0.x + aw*cos - ah*sin); tmp_v[1].x = tmps;
-+ tmps = round(v0.y + aw*sin + ah*cos); tmp_v[1].y = tmps;
-+ tmps = round(v0.x + aw*cos + ah*sin); tmp_v[2].x = tmps;
-+ tmps = round(v0.y + aw*sin - ah*cos); tmp_v[2].y = tmps;
-
- XFillPolygon(mainDisplay, Win, drawGC, tmp_v, 4, Convex,
-@@ -3340,8 +3341,8 @@
- tmp_v[0].x = tmp_v[3].x = vnminus1.x;
- tmp_v[0].y = tmp_v[3].y = vnminus1.y;
-- tmp_v[1].x = round(vnminus1.x - aw*cos + ah*sin);
-- tmp_v[1].y = round(vnminus1.y - aw*sin - ah*cos);
-- tmp_v[2].x = round(vnminus1.x - aw*cos - ah*sin);
-- tmp_v[2].y = round(vnminus1.y - aw*sin + ah*cos);
-+ tmps = round(vnminus1.x - aw*cos + ah*sin); tmp_v[1].x = tmps;
-+ tmps = round(vnminus1.y - aw*sin - ah*cos); tmp_v[1].y = tmps;
-+ tmps = round(vnminus1.x - aw*cos - ah*sin); tmp_v[2].x = tmps;
-+ tmps = round(vnminus1.y - aw*sin + ah*cos); tmp_v[2].y = tmps;
-
- XFillPolygon(mainDisplay, Win, drawGC, tmp_v, 4, Convex,