aboutsummaryrefslogtreecommitdiff
path: root/misc/magicpoint
diff options
context:
space:
mode:
authorYoshio MITA <mita@FreeBSD.org>2004-11-07 01:29:07 +0000
committerYoshio MITA <mita@FreeBSD.org>2004-11-07 01:29:07 +0000
commitc6f3aee419cc8ba38cedc561c559c7aae1f9403e (patch)
tree051205b859611209b8888c60e95fe0b130856178 /misc/magicpoint
parentd1da4b5fb6468bdad40989ad2fc0403579902c51 (diff)
downloadports-c6f3aee419cc8ba38cedc561c559c7aae1f9403e.tar.gz
ports-c6f3aee419cc8ba38cedc561c559c7aae1f9403e.zip
Notes
Diffstat (limited to 'misc/magicpoint')
-rw-r--r--misc/magicpoint/Makefile3
-rw-r--r--misc/magicpoint/distinfo3
-rw-r--r--misc/magicpoint/files/patch-aa13
-rw-r--r--misc/magicpoint/files/patch-configure17
-rw-r--r--misc/magicpoint/files/patch-mgp.h10
-rw-r--r--misc/magicpoint/files/patch-mng.c77
-rw-r--r--misc/magicpoint/files/patch-new.c11
7 files changed, 20 insertions, 114 deletions
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index e230adf24d6a..e4f3cc3286c2 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -7,8 +7,7 @@
# "?=" and "+=" are for localized (i.e. Japanese) version
PORTNAME= magicpoint
-PORTVERSION= 1.10a
-PORTREVISION= 1
+PORTVERSION= 1.11a
CATEGORIES+= misc
MASTER_SITES= ftp://ftp.mew.org/pub/mgp/
diff --git a/misc/magicpoint/distinfo b/misc/magicpoint/distinfo
index 496b0b6d77e7..3da0cf58be0d 100644
--- a/misc/magicpoint/distinfo
+++ b/misc/magicpoint/distinfo
@@ -1 +1,2 @@
-MD5 (magicpoint-1.10a.tar.gz) = 7a5d91b2b3bdabea704ee3cb6505d772
+MD5 (magicpoint-1.11a.tar.gz) = 9e55166a7793de371803b0c20f965971
+SIZE (magicpoint-1.11a.tar.gz) = 871606
diff --git a/misc/magicpoint/files/patch-aa b/misc/magicpoint/files/patch-aa
deleted file mode 100644
index f8044db565e0..000000000000
--- a/misc/magicpoint/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru2 ../../work.orig/magicpoint-1.09a/image/new.c ./image/new.c
---- ../../work.orig/magicpoint-1.09a/image/new.c Sat Nov 17 23:06:01 2001
-+++ ./image/new.c Sat Nov 17 23:11:45 2001
-@@ -12,5 +12,9 @@
- #include "image.h"
-
-+#ifdef CSRG_BASED
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
-
- extern int _Xdebug;
diff --git a/misc/magicpoint/files/patch-configure b/misc/magicpoint/files/patch-configure
index 4a24cb77ee74..62c8bd591955 100644
--- a/misc/magicpoint/files/patch-configure
+++ b/misc/magicpoint/files/patch-configure
@@ -1,15 +1,10 @@
-
-$FreeBSD$
-
---- configure 2002/03/14 10:49:01 1.1
-+++ configure 2002/03/14 10:50:56
-@@ -1777,8 +1777,8 @@
- ac_cv_ft_lib="$dir/lib"
- ac_cv_ft_libpath="libttf.a"
+--- configure.orig Wed Aug 4 09:23:35 2004
++++ configure Fri Nov 5 13:36:43 2004
+@@ -4134,6 +4134,8 @@
fi
-- if test -d $dir/include -a -f $dir/include/freetype.h; then
-- ac_cv_ft_include="$dir/include"
-+ if test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
+ if test -d $dir/include -a -f $dir/include/freetype.h; then
+ ac_cv_ft_include="$dir/include"
++ elif test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
+ ac_cv_ft_include="$dir/include/freetype1/freetype"
elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
ac_cv_ft_include="$dir/include/freetype"
diff --git a/misc/magicpoint/files/patch-mgp.h b/misc/magicpoint/files/patch-mgp.h
deleted file mode 100644
index aa233bc7d06f..000000000000
--- a/misc/magicpoint/files/patch-mgp.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mgp.h.orig Fri Jun 6 16:18:25 2003
-+++ mgp.h Sun May 16 19:02:09 2004
-@@ -62,6 +62,7 @@
- #include <X11/cursorfont.h>
- #include <X11/Xatom.h>
- #ifdef USE_XFT2
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <fontconfig/fontconfig.h>
- #include <X11/Xft/Xft.h>
diff --git a/misc/magicpoint/files/patch-mng.c b/misc/magicpoint/files/patch-mng.c
deleted file mode 100644
index 8c0b020102e9..000000000000
--- a/misc/magicpoint/files/patch-mng.c
+++ /dev/null
@@ -1,77 +0,0 @@
---- mng.c.orig Tue Aug 31 06:03:07 2004
-+++ mng.c Tue Aug 31 06:06:28 2004
-@@ -252,6 +252,37 @@
- /* not implemented yet */
- }
-
-+void
-+mng_window_setup(mymng, x, y, width, height)
-+ mngstuff *mymng;
-+ int x, y;
-+ int width, height;
-+{
-+ Visual *get_visual();
-+
-+ if (!mngdisplay){
-+ if ((mngdisplay = XOpenDisplay(NULL)) == NULL) {
-+ fprintf(stderr, "Can't open display\n");
-+ exit(-1);
-+ }
-+ mngscreen = DefaultScreen(mngdisplay);
-+ mngvisual = get_visual(mngdisplay, mngscreen, &depth);
-+ }
-+
-+ mymng->window = XCreateSimpleWindow(mngdisplay,
-+ window,
-+ 0, 0,
-+ width, height, 0,
-+ WhitePixel(display, 0), WhitePixel(display, 0));
-+
-+ XMoveWindow(mngdisplay, mymng->window, x, y);
-+ XMapRaised(mngdisplay, mymng->window);
-+ XFlush(mngdisplay);
-+
-+ if (!gcmng)
-+ gcmng = XCreateGC(mngdisplay, mymng->window, 0, 0);
-+}
-+
- void
- mngload(mngfile, x, y, width, height)
- char *mngfile;
-@@ -317,36 +348,6 @@
- }
- }
-
--void
--mng_window_setup(mymng, x, y, width, height)
-- mngstuff *mymng;
-- int x, y;
-- int width, height;
--{
-- Visual *get_visual();
--
-- if (!mngdisplay){
-- if ((mngdisplay = XOpenDisplay(NULL)) == NULL) {
-- fprintf(stderr, "Can't open display\n");
-- exit(-1);
-- }
-- mngscreen = DefaultScreen(mngdisplay);
-- mngvisual = get_visual(mngdisplay, mngscreen, &depth);
-- }
--
-- mymng->window = XCreateSimpleWindow(mngdisplay,
-- window,
-- 0, 0,
-- width, height, 0,
-- WhitePixel(display, 0), WhitePixel(display, 0));
--
-- XMoveWindow(mngdisplay, mymng->window, x, y);
-- XMapRaised(mngdisplay, mymng->window);
-- XFlush(mngdisplay);
--
-- if (!gcmng)
-- gcmng = XCreateGC(mngdisplay, mymng->window, 0, 0);
--}
-
- void
- mngpreload(state, mngfile, width, height)
diff --git a/misc/magicpoint/files/patch-new.c b/misc/magicpoint/files/patch-new.c
new file mode 100644
index 000000000000..047351cd4aea
--- /dev/null
+++ b/misc/magicpoint/files/patch-new.c
@@ -0,0 +1,11 @@
+--- image/new.c.orig Tue Aug 31 20:50:32 2004
++++ image/new.c Fri Nov 5 13:53:17 2004
+@@ -11,7 +11,7 @@
+ #include "copyright.h"
+ #include "image.h"
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(CSRG_BASED)
+ #include <stdlib.h>
+ #else
+ #include <malloc.h>