diff options
author | obache <obache@pkgsrc.org> | 2008-03-28 09:01:30 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2008-03-28 09:01:30 +0000 |
commit | bf6a9fbe2840cde5773f909f668138080323164a (patch) | |
tree | c519f9a58f5f5f9f3228d48f4ffe9ae3d1402da3 /graphics | |
parent | 5e3979a3246798119bfaf49332417f7707ae70eb (diff) | |
download | pkgsrc-bf6a9fbe2840cde5773f909f668138080323164a.tar.gz |
Merge patch-af into patch-aa, both for 'makefile.cfg'.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/jpeg/distinfo | 5 | ||||
-rw-r--r-- | graphics/jpeg/patches/patch-aa | 52 | ||||
-rw-r--r-- | graphics/jpeg/patches/patch-af | 52 |
3 files changed, 52 insertions, 57 deletions
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo index c961ae4f36c..f3c4e641145 100644 --- a/graphics/jpeg/distinfo +++ b/graphics/jpeg/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.6 2007/06/05 22:07:25 tnn Exp $ +$NetBSD: distinfo,v 1.7 2008/03/28 09:01:30 obache Exp $ SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882 Size (jpegsrc.v6b.tar.gz) = 613261 bytes -SHA1 (patch-aa) = ffb4a89925187ebc74487ad8980266d1230a5efb +SHA1 (patch-aa) = 6a02e633084aa91e2b6b1bbd5668d91e9ec2c321 SHA1 (patch-ab) = e57da4f693e638cf58b414bfbc50e21d80270109 SHA1 (patch-ac) = 6c34738effc7df671d4522b4ecca06dab640ed16 SHA1 (patch-ad) = 73afda7c2c849c93d1c1dd2c632e1e67a1db97dc SHA1 (patch-ae) = 4d2b3316df3a6b3ae9c0ef5099620f5f24300cca -SHA1 (patch-af) = d414c8133878b9fe5f24a6ce008c36112f417e6d diff --git a/graphics/jpeg/patches/patch-aa b/graphics/jpeg/patches/patch-aa index d26e5839ca0..d38e8bd17d6 100644 --- a/graphics/jpeg/patches/patch-aa +++ b/graphics/jpeg/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2006/11/02 18:00:43 joerg Exp $ +$NetBSD: patch-aa,v 1.10 2008/03/28 09:01:30 obache Exp $ ---- makefile.cfg.orig 1998-03-21 11:08:57.000000000 -0800 +--- makefile.cfg.orig 1998-03-21 19:08:57.000000000 +0000 +++ makefile.cfg @@ -17,7 +17,7 @@ includedir = $(prefix)/include binprefix = @@ -11,3 +11,51 @@ $NetBSD: patch-aa,v 1.9 2006/11/02 18:00:43 joerg Exp $ # The name of your C compiler: CC= @CC@ +@@ -86,7 +86,7 @@ SYSDEPSOURCES= jmemansi.c jmemname.c jme + # source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom + APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \ + rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \ +- rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c ++ rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c jpegexiforient.c + SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES) + # files included by source files + INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \ +@@ -133,7 +133,7 @@ DOBJECTS= djpeg.$(O) wrppm.$(O) wrgif.$( + TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O) + + +-all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom ++all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient + + # Special compilation rules to support ansi2knr and libtool. + .SUFFIXES: .lo .la +@@ -179,6 +179,9 @@ cjpeg: $(COBJECTS) libjpeg.$(A) + djpeg: $(DOBJECTS) libjpeg.$(A) + $(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.$(A) $(LDLIBS) + ++jpegexiforient: jpegexiforient.$(O) ++ $(LN) $(LDFLAGS) -o jpegexiforient jpegexiforient.$(O) $(LDLIBS) ++ + jpegtran: $(TROBJECTS) libjpeg.$(A) + $(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.$(A) $(LDLIBS) + +@@ -190,9 +193,10 @@ wrjpgcom: wrjpgcom.$(O) + + # Installation rules: + +-install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ ++install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient @FORCE_INSTALL_LIB@ + $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg ++ $(INSTALL_PROGRAM) jpegexiforient $(bindir)/$(binprefix)jpegexiforient + $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran + $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom + $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom +@@ -300,6 +304,7 @@ jmemdos.$(O): jmemdos.c jinclude.h jconf + jmemmac.$(O): jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h + cjpeg.$(O): cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h + djpeg.$(O): djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h ++jpegexiforient.$(O): jpegexiforient.c + jpegtran.$(O): jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h + rdjpgcom.$(O): rdjpgcom.c jinclude.h jconfig.h + wrjpgcom.$(O): wrjpgcom.c jinclude.h jconfig.h diff --git a/graphics/jpeg/patches/patch-af b/graphics/jpeg/patches/patch-af deleted file mode 100644 index c58f5ccf085..00000000000 --- a/graphics/jpeg/patches/patch-af +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/06/05 22:07:26 tnn Exp $ - ---- makefile.cfg.orig 2007-06-05 23:27:21.000000000 +0200 -+++ makefile.cfg -@@ -86,7 +86,7 @@ SYSDEPSOURCES= jmemansi.c jmemname.c jme - # source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom - APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \ - rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \ -- rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c -+ rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c jpegexiforient.c - SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES) - # files included by source files - INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \ -@@ -133,7 +133,7 @@ DOBJECTS= djpeg.$(O) wrppm.$(O) wrgif.$( - TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O) - - --all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom -+all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient - - # Special compilation rules to support ansi2knr and libtool. - .SUFFIXES: .lo .la -@@ -179,6 +179,9 @@ cjpeg: $(COBJECTS) libjpeg.$(A) - djpeg: $(DOBJECTS) libjpeg.$(A) - $(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.$(A) $(LDLIBS) - -+jpegexiforient: jpegexiforient.$(O) -+ $(LN) $(LDFLAGS) -o jpegexiforient jpegexiforient.$(O) $(LDLIBS) -+ - jpegtran: $(TROBJECTS) libjpeg.$(A) - $(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.$(A) $(LDLIBS) - -@@ -190,9 +193,10 @@ wrjpgcom: wrjpgcom.$(O) - - # Installation rules: - --install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ -+install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient @FORCE_INSTALL_LIB@ - $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg - $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg -+ $(INSTALL_PROGRAM) jpegexiforient $(bindir)/$(binprefix)jpegexiforient - $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran - $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom - $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom -@@ -300,6 +304,7 @@ jmemdos.$(O): jmemdos.c jinclude.h jconf - jmemmac.$(O): jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h - cjpeg.$(O): cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h - djpeg.$(O): djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h -+jpegexiforient.$(O): jpegexiforient.c - jpegtran.$(O): jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h - rdjpgcom.$(O): rdjpgcom.c jinclude.h jconfig.h - wrjpgcom.$(O): wrjpgcom.c jinclude.h jconfig.h |