Ignore:
Timestamp:
Sep 8, 2005, 7:33:48 PM (14 years ago)
Author:
gwright
Message:

Version bump to 2.6, thanks to Bryan Blackburn and Ryan Schmidt for patches!
The +quartz variant has been deleted. The quartz rendering code has been
refactored upstream and should be available again as part of the Cairo
plugin. (The Cairo SVG library plugin is not yet available in DP because
it requires gtk > 2.6.)
Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

Location:
trunk/dports/graphics/graphviz/files
Files:
8 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/graphviz/files/patch-Makefile.in

    r6546 r13981  
    1 --- tools/src/Makefile.in.sav   Mon Apr 19 11:00:44 2004
    2 +++ tools/src/Makefile.in       Mon Apr 19 10:59:53 2004
    3 @@ -214,9 +214,9 @@
     1--- cmd/tools/Makefile.in.sav   2005-09-08 13:34:32.000000000 -0400
     2+++ cmd/tools/Makefile.in       2005-09-08 13:35:52.000000000 -0400
     3@@ -16,7 +16,7 @@
    44 
    5  LIBS = @LIBS@
    65 
    7 -man_MANS = acyclic.1 gvcolor.1 gxl2dot.1 dot2gxl.1 nop.1 tred.1 ccomps.1 gc.1 sccmap.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1
    8 +man_MANS = acyclic.1 gvcolor.1 nop.1 tred.1 ccomps.1 gc.1 sccmap.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1
    96 
    10 -bin_PROGRAMS = gc gvcolor gxl2dot dot2gxl acyclic nop ccomps sccmap tred unflatten gvpack dijkstra bcomps
    11 +bin_PROGRAMS = gc gvcolor acyclic nop ccomps sccmap tred unflatten gvpack dijkstra bcomps
     7-SOURCES = $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
     8+SOURCES = $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
    129 
    13  noinst_HEADERS = ingraphs.h colortbl.h convert.h
    14  
    15 @@ -224,20 +224,6 @@
    16  
    17  libingraphs_la_SOURCES = ingraphs.c ingraphs.h
    18  
    19 -gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c convert.h
    20 -
    21 -gxl2dot_LDADD = \
    22 -       libingraphs.la \
    23 -       $(top_builddir)/agraph/libagraph.la \
    24 -       $(top_builddir)/cdt/libcdt.la \
    25 -       $(top_builddir)/graph/libgraph.la \
    26 -       ${EXPAT_LIBS}
    27 -
    28 -
    29 -dot2gxl_SOURCES = $(gxl2dot_SOURCES)
    30 -
    31 -dot2gxl_LDADD = $(gxl2dot_LDADD)
    32 -
    33  sccmap_SOURCES = sccmap.c
    34  
    35  sccmap_LDADD = \
    36 @@ -334,7 +320,7 @@
    37  
    38  EXTRA_DIST = $(man_MANS) Makefile.old
    39  
    40 -CLEANFILES = stamp.h dot2gxl.1
    41 +CLEANFILES = stamp.h
    42  subdir = tools/src
    43  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    44  CONFIG_HEADER = $(top_builddir)/config.h
    45 @@ -345,8 +331,8 @@
    46  libingraphs_la_LIBADD =
    47  am_libingraphs_la_OBJECTS = ingraphs.lo
    48  libingraphs_la_OBJECTS = $(am_libingraphs_la_OBJECTS)
     10 srcdir = @srcdir@
     11 top_srcdir = @top_srcdir@
     12@@ -40,7 +40,7 @@
     13 POST_UNINSTALL = :
     14 build_triplet = @build@
     15 host_triplet = @host@
    4916-bin_PROGRAMS = gc$(EXEEXT) gvcolor$(EXEEXT) gxl2dot$(EXEEXT) \
    50 -       dot2gxl$(EXEEXT) acyclic$(EXEEXT) nop$(EXEEXT) ccomps$(EXEEXT) \
    5117+bin_PROGRAMS = gc$(EXEEXT) gvcolor$(EXEEXT) \
    52 +       acyclic$(EXEEXT) nop$(EXEEXT) ccomps$(EXEEXT) \
    53         sccmap$(EXEEXT) tred$(EXEEXT) unflatten$(EXEEXT) \
    54         gvpack$(EXEEXT) dijkstra$(EXEEXT) bcomps$(EXEEXT)
    55  PROGRAMS = $(bin_PROGRAMS)
    56 @@ -372,13 +358,7 @@
    57         $(top_builddir)/agraph/libagraph.la \
    58         $(top_builddir)/cdt/libcdt.la
    59  dijkstra_LDFLAGS =
    60 -am__objects_1 = cvtgxl.$(OBJEXT) dot2gxl.$(OBJEXT) gxl2dot.$(OBJEXT)
    61 -am_dot2gxl_OBJECTS = $(am__objects_1)
    62 -dot2gxl_OBJECTS = $(am_dot2gxl_OBJECTS)
    63 -dot2gxl_DEPENDENCIES = libingraphs.la \
    64 -       $(top_builddir)/agraph/libagraph.la \
    65 -       $(top_builddir)/cdt/libcdt.la $(top_builddir)/graph/libgraph.la
    66 -dot2gxl_LDFLAGS =
    67 +am__objects_1 = cvtgxl.$(OBJEXT)
    68  am_gc_OBJECTS = gc.$(OBJEXT)
    69  gc_OBJECTS = $(am_gc_OBJECTS)
    70  gc_DEPENDENCIES = libingraphs.la $(top_builddir)/graph/libgraph.la \
    71 @@ -401,13 +381,6 @@
    72         $(top_builddir)/graph/libgraphconvenience.la \
    73         $(top_builddir)/cdt/libcdtconvenience.la
    74  gvpack_LDFLAGS =
     18        acyclic$(EXEEXT) nop$(EXEEXT) ccomps$(EXEEXT) sccmap$(EXEEXT) \
     19        tred$(EXEEXT) unflatten$(EXEEXT) gvpack$(EXEEXT) \
     20        dijkstra$(EXEEXT) bcomps$(EXEEXT)
     21@@ -89,12 +89,6 @@
     22 gvpack_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \
     23        $(top_builddir)/lib/ingraphs/libingraphs.la \
     24        $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la
    7525-am_gxl2dot_OBJECTS = cvtgxl.$(OBJEXT) dot2gxl.$(OBJEXT) \
    7626-       gxl2dot.$(OBJEXT)
    7727-gxl2dot_OBJECTS = $(am_gxl2dot_OBJECTS)
    78 -gxl2dot_DEPENDENCIES = libingraphs.la \
    79 -       $(top_builddir)/agraph/libagraph.la \
    80 -       $(top_builddir)/cdt/libcdt.la $(top_builddir)/graph/libgraph.la
    81 -gxl2dot_LDFLAGS =
     28-gxl2dot_DEPENDENCIES = $(top_builddir)/lib/ingraphs/libingraphs.la \
     29-       $(top_builddir)/lib/agraph/libagraph.la \
     30-       $(top_builddir)/lib/graph/libgraph.la
    8231 am_nop_OBJECTS = nop.$(OBJEXT)
    8332 nop_OBJECTS = $(am_nop_OBJECTS)
    84  nop_DEPENDENCIES = libingraphs.la $(top_builddir)/agraph/libagraph.la \
    85 @@ -439,9 +412,9 @@
    86  @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acyclic.Po ./$(DEPDIR)/bcomps.Po \
    87  @AMDEP_TRUE@   ./$(DEPDIR)/ccomps.Po ./$(DEPDIR)/colxlate.Po \
    88  @AMDEP_TRUE@   ./$(DEPDIR)/cvtgxl.Po ./$(DEPDIR)/dijkstra.Po \
    89 -@AMDEP_TRUE@   ./$(DEPDIR)/dot2gxl.Po ./$(DEPDIR)/gc.Po \
    90 +@AMDEP_TRUE@   ./$(DEPDIR)/gc.Po \
    91  @AMDEP_TRUE@   ./$(DEPDIR)/gvcolor.Po ./$(DEPDIR)/gvpack.Po \
    92 -@AMDEP_TRUE@   ./$(DEPDIR)/gxl2dot.Po ./$(DEPDIR)/ingraphs.Plo \
    93 +@AMDEP_TRUE@   ./$(DEPDIR)/ingraphs.Plo \
    94  @AMDEP_TRUE@   ./$(DEPDIR)/nop.Po ./$(DEPDIR)/sccmap.Po \
    95  @AMDEP_TRUE@   ./$(DEPDIR)/tred.Po ./$(DEPDIR)/unflatten.Po
    96  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    97 @@ -454,8 +427,8 @@
    98  CFLAGS = @CFLAGS@
    99  DIST_SOURCES = $(libingraphs_la_SOURCES) $(acyclic_SOURCES) \
    100         $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) \
    101 -       $(dot2gxl_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) \
     33 nop_DEPENDENCIES = $(top_builddir)/lib/ingraphs/libingraphs.la \
     34@@ -124,11 +118,11 @@
     35        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     36 SOURCES = $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) \
     37        $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) \
    10238-       $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) \
    103 +       $(gc_SOURCES) $(gvcolor_SOURCES) \
    10439+       $(gvpack_SOURCES) $(nop_SOURCES) \
    10540        $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
     41 DIST_SOURCES = $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) \
     42        $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) \
     43-       $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) \
     44+       $(gvpack_SOURCES) $(nop_SOURCES) \
     45        $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
     46 man1dir = $(mandir)/man1
     47 NROFF = nroff
     48@@ -413,18 +407,12 @@
    10649 
    107  NROFF = nroff
    108 @@ -463,7 +436,7 @@
    109  HEADERS = $(noinst_HEADERS)
     50 pdfdir = $(pkgdatadir)/doc/pdf
     51 noinst_HEADERS = colortbl.h convert.h
     52-man_MANS = gc.1 gvcolor.1 gxl2dot.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
     53+man_MANS = gc.1 gvcolor.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
     54        tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1
    11055 
    111  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
    112 -SOURCES = $(libingraphs_la_SOURCES) $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(dot2gxl_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
    113 +SOURCES = $(libingraphs_la_SOURCES) $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
     56-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf acyclic.pdf nop.pdf ccomps.pdf \
     57+pdf_DATA = gc.pdf gvcolor.pdf acyclic.pdf nop.pdf ccomps.pdf \
     58        sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf dijkstra.pdf bcomps.pdf
    11459 
    115  all: all-am
    116  
    117 @@ -526,9 +499,6 @@
    118  dijkstra$(EXEEXT): $(dijkstra_OBJECTS) $(dijkstra_DEPENDENCIES)
    119         @rm -f dijkstra$(EXEEXT)
    120         $(LINK) $(dijkstra_LDFLAGS) $(dijkstra_OBJECTS) $(dijkstra_LDADD) $(LIBS)
    121 -dot2gxl$(EXEEXT): $(dot2gxl_OBJECTS) $(dot2gxl_DEPENDENCIES)
    122 -       @rm -f dot2gxl$(EXEEXT)
    123 -       $(LINK) $(dot2gxl_LDFLAGS) $(dot2gxl_OBJECTS) $(dot2gxl_LDADD) $(LIBS)
    124  gc$(EXEEXT): $(gc_OBJECTS) $(gc_DEPENDENCIES)
    125         @rm -f gc$(EXEEXT)
    126         $(LINK) $(gc_LDFLAGS) $(gc_OBJECTS) $(gc_LDADD) $(LIBS)
    127 @@ -538,9 +508,6 @@
     60-gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c
     61-gxl2dot_LDADD = \
     62-       $(top_builddir)/lib/ingraphs/libingraphs.la \
     63-       $(top_builddir)/lib/agraph/libagraph.la @EXPAT_LIBS@ \
     64-       $(top_builddir)/lib/graph/libgraph.la
     65-
     66 sccmap_SOURCES = sccmap.c
     67 sccmap_LDADD = \
     68        $(top_builddir)/lib/ingraphs/libingraphs.la \
     69@@ -566,9 +554,6 @@
    12870 gvpack$(EXEEXT): $(gvpack_OBJECTS) $(gvpack_DEPENDENCIES)
    12971        @rm -f gvpack$(EXEEXT)
     
    13577        @rm -f nop$(EXEEXT)
    13678        $(LINK) $(nop_LDFLAGS) $(nop_OBJECTS) $(nop_LDADD) $(LIBS)
    137 @@ -566,11 +533,9 @@
    138  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colxlate.Po@am__quote@
    139  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvtgxl.Po@am__quote@
    140  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dijkstra.Po@am__quote@
    141 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dot2gxl.Po@am__quote@
    142  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc.Po@am__quote@
     79@@ -599,7 +584,6 @@
    14380 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvcolor.Po@am__quote@
    14481 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpack.Po@am__quote@
     82 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpack_builtins.Po@am__quote@
    14583-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxl2dot.Po@am__quote@
    146  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ingraphs.Plo@am__quote@
    14784 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nop.Po@am__quote@
    14885 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sccmap.Po@am__quote@
    149 @@ -800,8 +765,6 @@
    150         uninstall-man uninstall-man1
     86 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tred.Po@am__quote@
     87@@ -828,11 +812,11 @@
    15188 
     89 install-data-am: install-man install-pdfDATA
     90        @$(NORMAL_INSTALL)
     91-       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
     92+       $(MAKE) $(AM_MAKEFLAGS)
    15293 
    153 -dot2gxl.1: $(top_srcdir)/tools/src/gxl2dot.1
    154 -       cp -f $(top_srcdir)/tools/src/gxl2dot.1 $@
     94 install-exec-am: install-binPROGRAMS
     95        @$(NORMAL_INSTALL)
     96-       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
     97+       $(MAKE) $(AM_MAKEFLAGS)
     98 
     99 install-info: install-info-am
     100 
     101@@ -861,7 +845,7 @@
     102 uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
     103        uninstall-pdfDATA
     104        @$(NORMAL_INSTALL)
     105-       $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
     106+       $(MAKE) $(AM_MAKEFLAGS)
     107 
     108 uninstall-man: uninstall-man1
     109 
     110@@ -870,29 +854,16 @@
     111        distclean-generic distclean-libtool distclean-tags distdir dvi \
     112        dvi-am html html-am info info-am install install-am \
     113        install-binPROGRAMS install-data install-data-am \
     114-       install-data-hook install-exec install-exec-am \
     115-       install-exec-hook install-info install-info-am install-man \
     116+       install-exec install-exec-am \
     117+       install-info install-info-am install-man \
     118        install-man1 install-pdfDATA install-strip installcheck \
     119        installcheck-am installdirs maintainer-clean \
     120        maintainer-clean-generic mostlyclean mostlyclean-compile \
     121        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     122        tags uninstall uninstall-am uninstall-binPROGRAMS \
     123-       uninstall-hook uninstall-info-am uninstall-man uninstall-man1 \
     124+       uninstall-info-am uninstall-man uninstall-man1 \
     125        uninstall-pdfDATA
     126 
     127-
     128-install-data-hook:
     129-       (cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1; $(LN_S) gxl2dot.1 dot2gxl.1;)
     130-       (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf; $(LN_S) gxl2dot.pdf dot2gxl.pdf;)
     131-
     132-install-exec-hook:
     133-       (cd $(DESTDIR)$(bindir); rm -f dot2gxl; $(LN_S) gxl2dot dot2gxl;)
     134-
     135-uninstall-hook:
     136-       (cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1;)
     137-       (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf;)
     138-       (cd $(DESTDIR)$(bindir); rm -f dot2gxl;)
     139-
     140 .1.pdf:
     141        groff -Tps -man $< | ps2pdf - - >$@
    155142 # Tell versions [3.59,3.63) of GNU make to not export all variables.
    156  # Otherwise a system limit (for SysV at least) may be exceeded.
    157  .NOEXPORT:
Note: See TracChangeset for help on using the changeset viewer.