cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gd 2.0.33; brings gif back between many other things.

Browse Source 
reviewed by several ppl, many thanks.
This commit is contained in:
fgsch 2005-10-12 05:37:43 +00:00
parent 57f94070d9
commit 460ce94c0a
10 changed files with 71 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
graphics/gd/Makefile
View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.38 2004/11/30 01:06:34 espie Exp $
# $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $
# $OpenBSD: Makefile,v 1.39 2005/10/12 05:37:43 fgsch Exp $
COMMENT= "graphics library for fast PNG creation"
COMMENT= "library for dynamic creation of images"
DISTNAME= gd-1.8.3
DISTNAME= gd-2.0.33
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
MASTER_SITES= http://www.boutell.com/gd/http/
HOMEPAGE= http://www.boutell.com/gd/
@ -14,31 +12,27 @@ LIB_DEPENDS= jpeg.62::graphics/jpeg \
png.2::graphics/png \
ttf.1.3::print/freetype
MAINTAINER= Brad Smith <brad@openbsd.org>
MODULES= converters/libiconv
WANTLIB= X11 Xpm c fontconfig freetype m ttf z
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m z
MAKE_FLAGS= COMPILER="${CC}" prefix="${PREFIX}" \
CFLAGS="${CFLAGS} -DHAVE_JPEG -DHAVE_LIBTTF" \
INCLUDEDIRS="-I. -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype1/freetype -I${LOCALBASE}/include" \
LIBS="-lgd -lm -lpng -lz -ljpeg -lttf" \
LIBDIRS="-L. -L${LOCALBASE}/lib"
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR="${WRKINST}"
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-DHAVE_LIBTTF" \
LDFLAGS="-L/usr/local/lib" \
LIBS="-lttf"
USE_X11= Yes
NO_REGRESS= Yes
post-install:
@cd ${WRKSRC} && ./gddemo
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gd
${INSTALL_DATA} ${WRKSRC}/demoin.png ${PREFIX}/share/examples/gd
${INSTALL_DATA} ${WRKSRC}/demoout.png ${PREFIX}/share/examples/gd
${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/examples/gd
cd ${WRKSRC} && ${INSTALL_DATA} demoin.png demoout.png index.html \
${PREFIX}/share/examples/gd
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV+= NO_SHARED_LIBS=Yes
.endif

8
graphics/gd/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gd-1.8.3.tar.gz) = ad0e7dd1dda2812dbaeaa9706c4be536
RMD160 (gd-1.8.3.tar.gz) = 77ab2f979f67e3a7eee2ddbd344765b80414a14c
SHA1 (gd-1.8.3.tar.gz) = a0a40813a2a516be35f464a76f7e15af238b45e1
SIZE (gd-1.8.3.tar.gz) = 274318
MD5 (gd-2.0.33.tar.gz) = be0a6d326cd8567e736fbc75df0a5c45
RMD160 (gd-2.0.33.tar.gz) = 6c573638387bb36044f3d4d480b10229445b9a6b
SHA1 (gd-2.0.33.tar.gz) = 89548efb01116a740c796a8df80de16d19856811
SIZE (gd-2.0.33.tar.gz) = 587617

106
graphics/gd/patches/patch-Makefile
View File

@ -1,106 +0,0 @@
--- Makefile.orig Sat Jun 3 15:26:12 2000
+++ Makefile Wed Oct 18 09:30:03 2000
@@ -51,13 +51,13 @@
LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
#Location where libgd.a should be installed by "make install".
-INSTALL_LIB=/usr/local/lib
+INSTALL_LIB=$(prefix)/lib
#Location where .h files should be installed by "make install".
-INSTALL_INCLUDE=/usr/local/include
+INSTALL_INCLUDE=$(prefix)/include
#Location where useful non-test programs should be installed by "make install".
-INSTALL_BIN=/usr/local/bin
+INSTALL_BIN=$(prefix)/bin
#
#
@@ -75,26 +75,36 @@
BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
-all: libgd.a $(PROGRAMS)
+PICFLAG= -fpic
+SHLIB= libgd.so.18.3
+.if defined(NO_SHARED_LIB) && ${NO_SHARED_LIB:L} == "yes"
+all: libgd.a $(PROGRAMS)
install: libgd.a $(BIN_PROGRAMS)
- sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a
- sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd
- sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
- sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng
- sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng
- sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal
- sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng
- sh ./install-item 755 webpng $(INSTALL_BIN)/webpng
- sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd
- sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h
- sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h
- sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h
- sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
- sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
- sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
- sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
- sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
+.else
+all: libgd.a $(SHLIB) $(PROGRAMS)
+install: libgd.a $(SHLIB) $(BIN_PROGRAMS)
+.endif
+ $(BSD_INSTALL_DATA) libgd.a $(DESTDIR)$(INSTALL_LIB)
+ @if [ -f $(SHLIB) ]; then \
+ $(BSD_INSTALL_DATA) $(SHLIB) $(DESTDIR)$(INSTALL_LIB); \
+ fi
+ $(BSD_INSTALL_PROGRAM) pngtogd $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) pngtogd2 $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) gdtopng $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) gd2topng $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) gd2copypal $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) gdparttopng $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) webpng $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) bdftogd $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_DATA) gd.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdcache.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gd_io.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdfontg.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdfontl.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdfontmb.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdfonts.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdfontt.h $(DESTDIR)$(INSTALL_INCLUDE)
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
@@ -129,17 +139,21 @@
gdtestttf: gdtestttf.o libgd.a
$(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
-libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
+OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
- gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o \
- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
- rm -f libgd.a
- $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
- gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \
- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
- gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
- -ranlib libgd.a
+ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
+SHOBJS= $(OBJS:.o=.so)
+
+.SUFFIXES: .o .so
+
+libgd.a: $(OBJS)
+ $(AR) rc libgd.a $(OBJS)
+$(SHLIB): $(SHOBJS)
+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHOBJS)
+
clean:
- rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
+ rm -f *.o *.so ${PROGRAMS} libgd.a $(SHLIB) test/gdtest.jpg test/gdtest.wbmp
+.c.so:
+ $(CC) $(CFLAGS) $(PICFLAG) -DPIC -c $? -o $@

21
graphics/gd/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/10/12 05:37:43 fgsch Exp $
--- Makefile.in.orig Wed Nov 3 20:14:44 2004
+++ Makefile.in Sun Oct 2 05:13:13 2005
@@ -248,7 +248,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L./.libs @LDFLAGS@
LIBICONV = @LIBICONV@
LIBOBJS = @LIBOBJS@
LIBPNG12_CONFIG = @LIBPNG12_CONFIG@
@@ -321,7 +321,7 @@ EXTRA_DIST = README-JPEG.TXT README.TXT
include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
lib_LTLIBRARIES = libgd.la
libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
-libgd_la_LDFLAGS = -version-info 2:0:0
+libgd_la_LDFLAGS = -version-info @GDLIB_MAJOR@@GDLIB_MINOR@:@GDLIB_REVISION@:0
LDADD = ./libgd.la
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

12
graphics/gd/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2005/10/12 05:37:43 fgsch Exp $
--- configure.orig Wed Nov 3 20:14:47 2004
+++ configure Wed Sep 21 04:11:05 2005
@@ -11338,7 +11338,7 @@ if test `eval echo '${'$as_ac_Header'}'`
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS/libpng"
+ CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS"
else
CPPFLAGS="$_cppflags"
fi

8
graphics/gd/patches/patch-gd_c
View File

@ -1,8 +0,0 @@
--- gd.c.orig Sat Jun 3 15:26:12 2000
+++ gd.c Sat Jun 24 22:20:33 2000
@@ -1,5 +1,4 @@
#ifndef _OSD_POSIX /* _OSD_POSIX defines *alloc() in stdlib.h */
-#include <malloc.h>
#endif /*_OSD_POSIX*/
#include <stdio.h>
#include <math.h>

11
graphics/gd/patches/patch-gdcache_h
View File

@ -1,11 +0,0 @@
--- gdcache.h.orig Sat Jun 3 15:26:12 2000
+++ gdcache.h Sat Jun 24 22:20:32 2000
@@ -40,7 +40,7 @@
/* header */
/*********************************************************/
-#include <malloc.h>
+#include <stdlib.h>
#ifndef NULL
#define NULL (void *)0
#endif

22
graphics/gd/pkg/DESCR
View File

@ -1,15 +1,7 @@
gd is a graphics library. It allows your code to quickly draw images
complete with lines, arcs, text, multiple colors, cut and paste from
other images, and flood fills, and write out the result as a .PNG file.
This is particularly useful in World Wide Web applications, where .PNG
is one of the formats accepted for inline images by most browsers.
gd is not a paint program. If you are looking for a paint program, you
are looking in the wrong place. If you are not a programmer, you are
looking in the wrong place.
gd does not provide for every possible desirable graphics operation. It
is not necessary or desirable for gd to become a kitchen-sink graphics
package, but version 1.6.2 incorporates most of the commonly requested
features for an 8-bit 2D package. Support for scalable fonts, and
truecolor images, JPEG and truecolor PNG is planned for version 2.0.
GD is an open source code library for the dynamic creation of images
by programmers. GD is written in C, and "wrappers" are available
for Perl, PHP and other languages. GD creates PNG, JPEG and GIF
images, among other formats. GD is commonly used to generate charts,
graphics, thumbnails, and most anything else, on the fly. While not
restricted to use on the web, the most common applications of GD
involve web site development.

4
graphics/gd/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 00:50:08 espie Exp $
@lib lib/libgd.so.18.3
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/10/12 05:37:43 fgsch Exp $
@lib lib/libgd.so.20.33

12
graphics/gd/pkg/PLIST
View File

@ -1,12 +1,19 @@
@comment $OpenBSD: PLIST,v 1.10 2004/09/15 00:50:08 espie Exp $
@comment $OpenBSD: PLIST,v 1.11 2005/10/12 05:37:43 fgsch Exp $
%%SHARED%%
bin/annotate
bin/bdftogd
bin/gd2copypal
bin/gd2togif
bin/gd2topng
bin/gdcmpgif
bin/gdlib-config
bin/gdparttopng
bin/gdtopng
bin/giftogd2
bin/pngtogd
bin/pngtogd2
bin/webpng
include/entities.h
include/gd.h
include/gd_io.h
include/gdcache.h
@ -15,9 +22,10 @@ include/gdfontl.h
include/gdfontmb.h
include/gdfonts.h
include/gdfontt.h
include/gdfx.h
lib/libgd.a
lib/libgd.la
share/examples/gd/
share/examples/gd/demoin.png
share/examples/gd/demoout.png
share/examples/gd/index.html
%%SHARED%%