pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/ivtools Add DragonFly support, fix build with...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb4d313aa783
branches:  trunk
changeset: 525314:fb4d313aa783
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 15 18:26:14 2007 +0000

description:
Add DragonFly support, fix build with modular and pkgsrc Xorg and
shared library linkage in general. On DragonFly and NetBSD build
with -Wl,-z,defs to find possible regressions.

diffstat:

 graphics/ivtools/Makefile         |  12 +++++++---
 graphics/ivtools/PLIST            |   3 +-
 graphics/ivtools/distinfo         |  29 +++++++++++++++++++++++++--
 graphics/ivtools/patches/patch-ab |  16 +++++++++++---
 graphics/ivtools/patches/patch-ac |  15 +++++++++++--
 graphics/ivtools/patches/patch-af |  22 +++++++++++++++++++++
 graphics/ivtools/patches/patch-ag |  13 ++++++++++++
 graphics/ivtools/patches/patch-ah |  22 +++++++++++++++++++++
 graphics/ivtools/patches/patch-ai |  13 ++++++++++++
 graphics/ivtools/patches/patch-aj |  40 +++++++++++++++++++++++++++++++++++++++
 graphics/ivtools/patches/patch-ak |  13 ++++++++++++
 graphics/ivtools/patches/patch-al |  12 +++++++++++
 graphics/ivtools/patches/patch-am |  12 +++++++++++
 graphics/ivtools/patches/patch-an |  12 +++++++++++
 graphics/ivtools/patches/patch-ao |  15 ++++++++++++++
 graphics/ivtools/patches/patch-ap |  14 +++++++++++++
 graphics/ivtools/patches/patch-aq |  15 ++++++++++++++
 graphics/ivtools/patches/patch-ar |  39 ++++++++++++++++++++++++++++++++++++++
 graphics/ivtools/patches/patch-as |  12 +++++++++++
 graphics/ivtools/patches/patch-at |  13 ++++++++++++
 graphics/ivtools/patches/patch-au |  15 ++++++++++++++
 graphics/ivtools/patches/patch-av |  16 +++++++++++++++
 graphics/ivtools/patches/patch-aw |  13 ++++++++++++
 graphics/ivtools/patches/patch-ax |  21 ++++++++++++++++++++
 graphics/ivtools/patches/patch-ay |  20 +++++++++++++++++++
 graphics/ivtools/patches/patch-az |  21 ++++++++++++++++++++
 graphics/ivtools/patches/patch-ba |  21 ++++++++++++++++++++
 graphics/ivtools/patches/patch-bb |  23 ++++++++++++++++++++++
 28 files changed, 477 insertions(+), 15 deletions(-)

diffs (truncated from 668 to 300 lines):

diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/Makefile
--- a/graphics/ivtools/Makefile Thu Feb 15 16:27:54 2007 +0000
+++ b/graphics/ivtools/Makefile Thu Feb 15 18:26:14 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/07/26 11:53:39 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/15 18:26:14 joerg Exp $
 
 DISTNAME=      ivtools-1.2.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ivtools/}
 EXTRACT_SUFX=  .tgz
@@ -16,20 +16,24 @@
 DEPENDS+=      wget>=1.0:../../net/wget
 
 USE_LANGUAGES= c c++
+USE_TOOLS+=    imake
 
 WRKSRC=                ${WRKDIR}/ivtools-1.2
 GNU_CONFIGURE= YES
 CONFIGURE_ARGS=        --with-tiff=${BUILDLINK_PREFIX.tiff}
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-patch:
        ${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h
+       ${TOUCH} ${WRKSRC}/config/dragonfly-gcc.mk
 
 pre-install:
        ${RM} -f ${WRKSRC}/config/local.def.orig
        ${RM} -f ${WRKSRC}/config/params.def.orig
        ${RM} -f ${WRKSRC}/config/site.def.NETBSD.orig
+       ${RM} -f ${WRKSRC}/config/arch.def.orig
 
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/PLIST
--- a/graphics/ivtools/PLIST    Thu Feb 15 16:27:54 2007 +0000
+++ b/graphics/ivtools/PLIST    Thu Feb 15 18:26:14 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/24 12:04:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/02/15 18:26:14 joerg Exp $
 bin/comdraw
 bin/comterp
 bin/comtest
@@ -618,6 +618,7 @@
 lib/ivtools/config/config.null.mk
 lib/ivtools/config/darwin-gcc.mk
 lib/ivtools/config/default-gcc.mk
+lib/ivtools/config/dragonfly-gcc.mk
 lib/ivtools/config/freebsd-gcc.mk
 lib/ivtools/config/freebsd2.1-gcc.mk
 lib/ivtools/config/gcc.def
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/distinfo
--- a/graphics/ivtools/distinfo Thu Feb 15 16:27:54 2007 +0000
+++ b/graphics/ivtools/distinfo Thu Feb 15 18:26:14 2007 +0000
@@ -1,10 +1,33 @@
-$NetBSD: distinfo,v 1.12 2006/07/26 11:53:39 markd Exp $
+$NetBSD: distinfo,v 1.13 2007/02/15 18:26:14 joerg Exp $
 
 SHA1 (ivtools-1.2.4.tgz) = 9c9cbfeedd7692c001b458ce82958428082367a5
 RMD160 (ivtools-1.2.4.tgz) = 88cc853e7a31b56a1968021c86394084ba07a4f4
 Size (ivtools-1.2.4.tgz) = 2145688 bytes
 SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
-SHA1 (patch-ab) = 513a29c861c7e33771667088668eaf7ff8e12778
-SHA1 (patch-ac) = bcda1a0b71b669ad6a4900077564c226af262708
+SHA1 (patch-ab) = 3d3f9b7a821a666c4e0aade1f0236e6ee48f69b8
+SHA1 (patch-ac) = c775baafa06c485a43f4341f480c04763d786964
 SHA1 (patch-ad) = 6ea96c7805bb28305f42e980a86152317988be64
 SHA1 (patch-ae) = 64d0b99a868baf4be3ffd55f387ee1cd4f07747e
+SHA1 (patch-af) = de74e5bcb19c61938269a08c88e5962bbf675f76
+SHA1 (patch-ag) = d79843a5c27f024d4cb8f804c3875de29b0ec1cc
+SHA1 (patch-ah) = 4542d8bc5118d85b9722eb2f400dcc74930ff43c
+SHA1 (patch-ai) = 58bdfa9afb392298365c7d5cb203818cc64f437b
+SHA1 (patch-aj) = a69ae5ef3a8e1bacf103376f63d4935e3e6b1537
+SHA1 (patch-ak) = ac0fb27790caf62eae5afd2fa661a7d2d64589b7
+SHA1 (patch-al) = c905b8ccc563bc5abcf0886b7511b4b354e2126d
+SHA1 (patch-am) = 6fd5da0438b6ae590a3636a6cb8abfff39eb5a7b
+SHA1 (patch-an) = 77271166ace7fa09ab12f373a574285d4fa3c700
+SHA1 (patch-ao) = 9c102573e30668ac5e722a0b2154eff0acfd27cb
+SHA1 (patch-ap) = 48c66a135f2cc685baddd9f26ebd0088323c14ca
+SHA1 (patch-aq) = edb3d1729a4d3f1b2f2fc95b6f1ca1853d70b032
+SHA1 (patch-ar) = e15757657454a1d86be2d35eb723ae66137a3d6d
+SHA1 (patch-as) = 75260ee2e3b6138d0927a9699549791e5921147f
+SHA1 (patch-at) = 4721e365a4ef906b97e1ef420221fddc06b14bf9
+SHA1 (patch-au) = 584b290c3509f2c433462ceeaac9b74a28577c1b
+SHA1 (patch-av) = d08feade6cdcc103ffe9fcce77b6a9382a3a23cc
+SHA1 (patch-aw) = 74f0aa51dc30e5e516853b2d5313a66c063b18cb
+SHA1 (patch-ax) = dd1ce5494d1e4562108d3dd8b3dda914b4156f1e
+SHA1 (patch-ay) = 9b50981134c7051d81f233da5fb76e82500a5428
+SHA1 (patch-az) = f73e21946a93f645cc0d295824de4a216e2cc2b4
+SHA1 (patch-ba) = 886b050733da5e6b2c882874c056928669c62912
+SHA1 (patch-bb) = 8385ea997c189384f514dcec7700cb3a2ab30a9f
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ab
--- a/graphics/ivtools/patches/patch-ab Thu Feb 15 16:27:54 2007 +0000
+++ b/graphics/ivtools/patches/patch-ab Thu Feb 15 18:26:14 2007 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2006/07/24 12:04:26 markd Exp $
+$NetBSD: patch-ab,v 1.4 2007/02/15 18:26:14 joerg Exp $
 
---- configure.orig     2005-10-07 07:00:22.000000000 +1300
+--- configure.orig     2005-10-10 18:35:27.000000000 +0000
 +++ configure
-@@ -3734,7 +3734,7 @@ if test "${ac_cv_lib_stdcpp_peek__7istre
+@@ -1346,6 +1346,7 @@ case "$host" in
+     *hpux*10*20) platform_part=hpux10.20 ;;
+     *hpux* ) platform_part=hpux ;;
+     *netbsd* ) platform_part=netbsd ;;
++    *dragonfly* ) platform_part=netbsd ;;
+     *linux* ) platform_part=linux ;;
+     m88k-*-sysv4 ) platform_part=m88k-sysv4 ;;
+     m88k-*-sysv3 ) platform_part=m88k-sysv3 ;;
+@@ -3741,7 +3742,7 @@ if test "${ac_cv_lib_stdcpp_peek__7istre
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +19,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3804,7 +3804,7 @@ if test "${ac_cv_lib_stdcpp__ZNSi4peekEv
+@@ -3811,7 +3812,7 @@ if test "${ac_cv_lib_stdcpp__ZNSi4peekEv
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ac
--- a/graphics/ivtools/patches/patch-ac Thu Feb 15 16:27:54 2007 +0000
+++ b/graphics/ivtools/patches/patch-ac Thu Feb 15 18:26:14 2007 +0000
@@ -1,14 +1,23 @@
-$NetBSD: patch-ac,v 1.1 2003/11/18 21:09:18 markd Exp $
+$NetBSD: patch-ac,v 1.2 2007/02/15 18:26:14 joerg Exp $
 
---- config/site.def.NETBSD.orig        2003-10-23 07:13:39.000000000 +1300
+--- config/site.def.NETBSD.orig        2003-10-22 18:13:39.000000000 +0000
 +++ config/site.def.NETBSD
 @@ -16,6 +16,9 @@
  #undef TroffCmd
  #define TroffCmd groff
  
 +#undef CppCmd
-+#define CppCmd /usr/bin/cpp
++#define CppCmd cpp
 +
  /* 
   * build RPC classes -- requires iostreams & TCP sockets
   */
+@@ -35,7 +38,7 @@
+ #define ExtraCCLdLibs -lstdc++ -lm
+ 
+ /* command to create shared libraries */
+-#define SharedLibraryCmd(ldobjs,extra_flags) gcc -shared extra_flags -o $@ ldobjs
++#define SharedLibraryCmd(ldobjs,extra_flags) ${CXX} -Wl,-z,defs ${CCLDFLAGS} -shared extra_flags -o $@ ldobjs
+ 
+ /*
+  * Install a shared library on NetBSD.
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-af Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.3 2007/02/15 18:26:14 joerg Exp $
+
+--- config/arch.def.orig       2007-02-15 15:28:24.000000000 +0000
++++ config/arch.def
+@@ -463,6 +463,17 @@
+ #define MacroFile InterViews/iv-netbsd.cf
+ #endif /* __NetBSD__ */
+ 
++#if defined(__DragonFly__)
++#undef DRAGONFLY
++#undef dragonfly
++#define DragonFlyArchitecture
++#define ArchitectureName DragonFly
++#define architectureName dragonfly
++#define SiteDefCpu <site.def.NETBSD>
++#define MacroIncludeFile <InterViews/iv-netbsd.cf>
++#define MacroFile InterViews/iv-netbsd.cf
++#endif /* __NetBSD__ */
++
+ #if defined(__FreeBSD__)
+ #undef FREEBSD
+ #undef freebsd
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-ag Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- config/InterViews/TIFF.def.orig    2007-02-15 15:29:59.000000000 +0000
++++ config/InterViews/TIFF.def
+@@ -142,7 +142,7 @@ TIFF_OPTIMIZE_CFLAGS = TIFFOptimizeCFlag
+    -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+ #endif
+-#if defined(NetBSDArchitecture)
++#if defined(NetBSDArchitecture) || defined(DragonflyArchitecture)
+ #define TIFFStdCDefines \
+     -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-ah Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/include/ivstd/nan.h.orig       2007-02-15 15:31:06.000000000 +0000
++++ src/include/ivstd/nan.h
+@@ -3,7 +3,7 @@
+ 
+ #if defined(__GLIBC__) && (__GLIBC__==2 && __GLIBC_MINOR__>0 || __GLIBC__>2)
+ #include <bits/nan.h>
+-#elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
++#elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #include_next <nan.h>
+ #else
+ #include <math.h>
+@@ -12,7 +12,7 @@
+ #include <ieeefp.h>
+ #endif
+ 
+-#if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #define isnanorinf(dval) (!finite(dval))
+ #elif defined(__alpha)
+ #define isnanorinf(dval) (IsNANorINF(dval))
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-ai Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/IV-X11/xwindow.c.orig  2007-02-15 15:44:36.000000000 +0000
++++ src/IV-X11/xwindow.c
+@@ -62,7 +62,7 @@
+ #include <stropts.h>
+ #include <sys/conf.h>
+ #endif
+-#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #if !defined(__linux__) && !defined(__CYGWIN__)
+ /* no standard place for this */
+ extern "C" {
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-aj Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/ComTerp/comterpserv.c.orig     2006-07-20 20:48:00.000000000 +0000
++++ src/ComTerp/comterpserv.c
+@@ -161,7 +161,7 @@ char* ComTerpServ::fd_fgets(char* s, int
+     fileptr_filebuf fbuf(ifptr, ios_base::in);
+     istream in (&fbuf);
+     in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
+-#elif __GNUC__>3
++#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+     char instr[BUFSIZ];
+     FILE* ifptr = fd==0 ? stdin : server->handler()->rdfptr();
+     fileptr_filebuf fbuf(ifptr, ios_base::in);
+@@ -214,7 +214,7 @@ int ComTerpServ::fd_fputs(const char* s,
+ #elif (__GNUC__==3 && __GNUC_MINOR__<1)
+     FILE* ofptr = fd==0 ? stdout : fdopen(fd, "w");
+     fileptr_filebuf fbuf(ofptr, ios_base::out);
+-#elif __GNUC__>3
++#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+     FILE* ofptr = fd==0 ? stdout : server->handler()->wrfptr();
+     fileptr_filebuf fbuf(ofptr, ios_base::out);
+ #else
+@@ -335,7 +335,7 @@ int ComTerpServ::runfile(const char* fil
+ #elif __GNUC__==3 && __GNUC_MINOR__<1
+                 FILE* ofptr = handler() ? fdopen(handler()->get_handle(), "w") : stdout; 
+               fileptr_filebuf obuf(ofptr, ios_base::out);
+-#elif __GNUC__>3
++#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+                 FILE* ofptr = handler() ? handler()->wrfptr() : stdout; 
+               fileptr_filebuf obuf(ofptr, ios_base::out);
+ #else
+@@ -363,7 +363,7 @@ int ComTerpServ::runfile(const char* fil
+ #elif __GNUC__==3 && __GNUC_MINOR__<1
+           FILE* ofptr = handler() ? fdopen(handler()->get_handle(), "w") : stdout; 
+         fileptr_filebuf obuf(ofptr, ios_base::out);
+-#elif __GNUC__>3
++#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+           FILE* ofptr = handler() ? handler()->wrfptr() : stdout; 
+         fileptr_filebuf obuf(ofptr, ios_base::out);
+ #else
diff -r e7537ead5a7a -r fb4d313aa783 graphics/ivtools/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ivtools/patches/patch-ak Thu Feb 15 18:26:14 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/ComTerp/comterp.c.orig 2007-02-15 16:01:11.000000000 +0000
++++ src/ComTerp/comterp.c
+@@ -899,7 +899,7 @@ int ComTerp::run(boolean one_expr, boole
+     fbuf.attach(fd);
+   } else



Home | Main Index | Thread Index | Old Index