Ticket #34973: magicpoint-1.13a.2.diff

File magicpoint-1.13a.2.diff, 8.5 KB (added by ryandesign (Ryan Carsten Schmidt), 12 years ago)

proposed patch

  • files/patch-image.h

     
    1 --- image/image.h.orig  Wed Nov 12 11:07:35 2003
    2 +++ image/image.h       Wed Nov 12 11:07:49 2003
    3 @@ -182,6 +182,7 @@
    4  unsigned long doValToMemLSB();
    5  void          flipBits();
    6  
    7 +#define        zopen   mgp_zopen
    8  ZFILE *zopen();
    9  int    zread();
    10  void   zreset();

  • files/patch-config.guess

     
    1 --- config.guess.orig   Mon Jan  4 21:30:48 1999
    2 +++ config.guess        Wed Nov 12 11:06:57 2003
    3 @@ -51,6 +51,9 @@
    4  # Note: order is significant - the case branches are not exclusive.
    5  
    6  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    7 +    *:Darwin:*:*)
    8 +       echo `uname -p`-apple-darwin${UNAME_RELEASE}
    9 +       exit 0 ;;
    10      alpha:OSF1:V*:*)
    11         # After 1.2, OSF1 uses "V1.3" for uname -r.
    12         echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`

  • files/patch-new.c

     
    1 --- image/new.c.orig    Wed Nov 12 11:08:13 2003
    2 +++ image/new.c Wed Nov 12 11:08:20 2003
    3 @@ -11,7 +11,7 @@
    4  #include "copyright.h"
    5  #include "image.h"
    6  
    7 -#include <malloc.h>
    8 +#include <unistd.h>
    9  
    10  extern int _Xdebug;
    11  extern void memoryExhausted(void);

  • files/patch-parse.c

     
    1 --- parse.c.orig        Wed Jan 21 10:58:28 2004
    2 +++ parse.c     Wed Jan 21 10:58:38 2004
    3 @@ -848,7 +848,7 @@
    4         tmpint[2]->cti_value = DEFAULT_VGAP;
    5         tmpint[3] = ctlalloc1(CTL_QUALITY);
    6         tmpint[3]->cti_value = DEFAULT_BQUALITY;
    7 -#ifdef XFT2
    8 +#ifdef USE_XFT2
    9         tmpint[4] = ctlalloc1(CTL_OPAQUE);
    10         tmpint[4]->cti_value = DEFAULT_OPAQUE;
    11  #endif

  • files/patch-configure

     
    1 --- configure.orig      2003-05-28 15:34:23.000000000 +1000
    2 +++ configure   2011-08-21 10:57:46.000000000 +1000
    3 @@ -4940,9 +4940,9 @@
     1--- configure.orig      2007-12-28 14:31:26.000000000 -0600
     2+++ configure   2012-06-25 17:59:26.000000000 -0500
     3@@ -5703,9 +5703,9 @@
    44 _ACEOF
    55 
    66 else
    7 -  echo "$as_me:$LINENO: checking for png_set_gray_1_2_4_to_8 in -lpng" >&5
    8 -echo $ECHO_N "checking for png_set_gray_1_2_4_to_8 in -lpng... $ECHO_C" >&6
     7-  { echo "$as_me:$LINENO: checking for png_set_gray_1_2_4_to_8 in -lpng" >&5
     8-echo $ECHO_N "checking for png_set_gray_1_2_4_to_8 in -lpng... $ECHO_C" >&6; }
    99-if test "${ac_cv_lib_png_png_set_gray_1_2_4_to_8+set}" = set; then
    10 +  echo "$as_me:$LINENO: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5
    11 +echo $ECHO_N "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... $ECHO_C" >&6
     10+  { echo "$as_me:$LINENO: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5
     11+echo $ECHO_N "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... $ECHO_C" >&6; }
    1212+if test "${ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8+set}" = set; then
    1313   echo $ECHO_N "(cached) $ECHO_C" >&6
    1414 else
    1515   ac_check_lib_save_LIBS=$LIBS
    16 @@ -4957,7 +4957,7 @@
     16@@ -5723,11 +5723,11 @@
     17 #ifdef __cplusplus
     18 extern "C"
    1719 #endif
    18  /* We use char because int might match the return type of a gcc2
    19     builtin and then its argument prototype would still apply.  */
    2020-char png_set_gray_1_2_4_to_8 ();
    2121+char png_set_expand_gray_1_2_4_to_8 ();
    22  #ifdef F77_DUMMY_MAIN
    23  #  ifdef __cplusplus
    24       extern "C"
    25 @@ -4967,7 +4967,7 @@
    2622 int
    2723 main ()
    2824 {
    29 -png_set_gray_1_2_4_to_8 ();
    30 +png_set_expand_gray_1_2_4_to_8 ();
     25-return png_set_gray_1_2_4_to_8 ();
     26+return png_set_expand_gray_1_2_4_to_8 ();
    3127   ;
    3228   return 0;
    3329 }
    34 @@ -4984,18 +4984,18 @@
    35    ac_status=$?
    36    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    37    (exit $ac_status); }; }; then
     30@@ -5750,21 +5750,21 @@
     31         test ! -s conftest.err
     32        } && test -s conftest$ac_exeext &&
     33        $as_test_x conftest$ac_exeext; then
    3834-  ac_cv_lib_png_png_set_gray_1_2_4_to_8=yes
    3935+  ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=yes
    4036 else
    4137   echo "$as_me: failed program was:" >&5
    42  cat conftest.$ac_ext >&5
    43 -ac_cv_lib_png_png_set_gray_1_2_4_to_8=no
    44 +ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no
     38 sed 's/^/| /' conftest.$ac_ext >&5
     39 
     40-       ac_cv_lib_png_png_set_gray_1_2_4_to_8=no
     41+       ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no
    4542 fi
    46  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     43 
     44 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     45       conftest$ac_exeext conftest.$ac_ext
    4746 LIBS=$ac_check_lib_save_LIBS
    4847 fi
    49 -echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_gray_1_2_4_to_8" >&5
    50 -echo "${ECHO_T}$ac_cv_lib_png_png_set_gray_1_2_4_to_8" >&6
     48-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_gray_1_2_4_to_8" >&5
     49-echo "${ECHO_T}$ac_cv_lib_png_png_set_gray_1_2_4_to_8" >&6; }
    5150-if test $ac_cv_lib_png_png_set_gray_1_2_4_to_8 = yes; then
    52 +echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5
    53 +echo "${ECHO_T}$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6
     51+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5
     52+echo "${ECHO_T}$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6; }
    5453+if test $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8 = yes; then
    5554   LIBS="$LIBS -lpng -lz"
    5655                         cat >>confdefs.h <<\_ACEOF
    5756 #define USE_PNG 1
    58 @@ -5647,7 +5647,7 @@
     57@@ -6984,7 +6984,7 @@
    5958                echo 'FATAL: You need libungif to use gif images.  pass proper LIBS to configure.'
    6059                exit 1
    6160        fi

  • files/patch-freetype.patch

     
    1 --- mgp.h.orig  2009-02-03 10:06:51.000000000 -0500
    2 +++ mgp.h       2009-02-03 10:07:18.000000000 -0500
    3 @@ -62,6 +62,8 @@
    4  #include <X11/cursorfont.h>
    5  #include <X11/Xatom.h>
    6  #ifdef USE_XFT2
    7 +#include <ft2build.h>
    8 +#include FT_FREETYPE_H
    9  #include <freetype/freetype.h>
    10  #include <fontconfig/fontconfig.h>
    11  #include <X11/Xft/Xft.h>

  • Portfile

     
    22PortSystem 1.0
    33
    44name            magicpoint
    5 version         1.10a
    6 revision        3
     5version         1.13a
    76categories      graphics
    87maintainers     fenner
    98homepage        http://www.mew.org/mgp/
    10 master_sites    http://cvs.fedoraproject.org/repo/dist/MagicPoint/magicpoint-1.10a.tar.gz/7a5d91b2b3bdabea704ee3cb6505d772/
    11 checksums       md5 7a5d91b2b3bdabea704ee3cb6505d772
     9master_sites    http://pkgs.fedoraproject.org/repo/pkgs/MagicPoint/${distfiles}/ebc403982956e918ab327c54a90b44e0/
     10checksums       md5     ebc403982956e918ab327c54a90b44e0 \
     11                rmd160  067d7dee3b90ec354975d9ad4ea0c0df48cca191 \
     12                sha256  205e6752e3cb024bcce0583b43dafc9b89490c0016daa91d2486891edcf2cfc1
    1213platforms       macosx darwin
    1314description     An X11 based presentation tool.
    1415long_description Magic Point is an X11 based presentation tool. It \
    … …  
    1718 typically .mgp) is just text so that you can create presentation \
    1819 files quickly with your favorite editor (e.g. Emacs, vi).
    1920
    20 patchfiles      patch-config.guess patch-image.h patch-new.c patch-parse.c \
    21                 patch-default.mgp patch-configure patch-freetype.patch \
    22                 patch-image_png.c
    23 
    2421depends_build   port:pkgconfig \
    2522                port:imake
    2623
    … …  
    2926                port:libpng \
    3027                path:include/gif_lib.h:giflib
    3128
     29patchfiles      patch-configure \
     30                patch-default.mgp \
     31                patch-image_png.c
     32
    3233universal_variant no
    3334
    34 # LOCALPREFIX= is for configure to find libungif.
     35# LOCALPREFIX= is for configure to find giflib.
    3536configure.env   LOCALPREFIX=${prefix}
    36 configure.args  --enable-gif --mandir=${prefix}/share/man
     37configure.args  --enable-gif
    3738
    3839post-configure {
    3940        # unusual port: uses not just autoconf but also Imake
    40         system "cd \"${worksrcpath}\" && xmkmf && make Makefiles"
     41        system -W ${worksrcpath} "${prefix}/bin/xmkmf && make Makefiles"
    4142}
    4243
    4344destroot.target install install.man
    … …  
    5253        LIBDIR=${prefix}/lib/X11 \
    5354        FONTDIR=${prefix}/lib/X11/fonts \
    5455        MANPATH=${prefix}/share/man
     56
     57livecheck.type  regex
     58livecheck.url   http://pkgs.fedoraproject.org/repo/pkgs/MagicPoint/
     59livecheck.regex ${name}-(\[0-9a-z.\]+)${extract.suffix}