Date: Mon, 27 Dec 1999 08:50:03 -0800 (PST) From: Ade Lovett <ade@lovett.com> To: freebsd-ports@FreeBSD.org Subject: Re: ports/15313: Persuade graphics/gd to build shared libraries Message-ID: <199912271650.IAA22987@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/15313; it has been noted by GNATS.
From: Ade Lovett <ade@lovett.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/15313: Persuade graphics/gd to build shared libraries
Date: Mon, 27 Dec 1999 10:46:25 -0600
On Mon, Dec 06, 1999 at 09:45:12AM -0600, Ade Lovett wrote:
>
> >Number: 15313
> >Category: ports
> >Synopsis: Persuade graphics/gd to build shared libraries
>
> [snip]
New patch required, now that ports/15437 has been applied
(hi, Steve!) to add xpm and ttf support.
Version: unchanged - add capability to build shared library
Changes: Makefile patches/patch-ac pkg/PLIST
Adds: NONE
Removes: NONE
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 1999/12/25 02:01:47 1.15
+++ Makefile 1999/12/27 16:37:20
@@ -22,4 +22,7 @@
pre-install:
${MKDIR} ${PREFIX}/include/gd
+post-install:
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
.include <bsd.port.mk>
cvs diff: Diffing files
cvs diff: Diffing patches
Index: patches/patch-ac
===================================================================
RCS file: /home/ncvs/ports/graphics/gd/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- patches/patch-ac 1999/12/25 02:01:54 1.2
+++ patches/patch-ac 1999/12/27 16:42:50
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Oct 14 01:20:11 1999
-+++ Makefile Sat Dec 11 19:01:31 1999
+--- Makefile.orig Wed Oct 13 16:20:11 1999
++++ Makefile Mon Dec 27 10:42:48 1999
@@ -3,35 +3,35 @@
#If you do not have gcc, change the setting for COMPILER, but you must
#use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
@@ -65,7 +65,7 @@
#
#
-@@ -58,8 +58,8 @@
+@@ -58,34 +58,41 @@
VERSION=1.7
@@ -76,9 +76,17 @@
PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
-@@ -69,23 +69,23 @@
- all: libgd.a $(PROGRAMS)
+ BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
+ TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+-all: libgd.a $(PROGRAMS)
++.SUFFIXES: .c .so .o
++
++.c.so:
++ ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++
++all: libgd.a libgd.so.0 $(PROGRAMS)
+
install: libgd.a $(BIN_PROGRAMS)
- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a
- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd
@@ -98,6 +106,8 @@
- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
+ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a
++ $(INSTALL) -c -m 755 libgd.so.0 $(INSTALL_LIB)/libgd.so.0
++ ln -sf libgd.so.0 $(INSTALL_LIB)/libgd.so
+ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd
+ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
+ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng
@@ -117,3 +127,30 @@
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
+@@ -120,16 +127,19 @@
+ 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 gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
+- gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \
+- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o
++INCS=gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++
++libgd.a: $(INCS) $(OBJS)
+ 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 gdxpm.o \
+- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
+- gdtables.o gdttf.o gdcache.o gdkanji.o
++ $(AR) rc libgd.a $(OBJS)
+ -ranlib libgd.a
++
++libgd.so.0: $(INCS) $(OBJS:S/o$/so/g)
++ $(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/o$/so/g) $(LIBDIRS) $(LIBS)
++ ln -sf libgd.so.0 libgd.so
+
+ clean:
+ rm -f *.o *.a ${PROGRAMS}
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/graphics/gd/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 1999/11/01 01:01:02 1.6
+++ pkg/PLIST 1999/12/27 16:38:24
@@ -15,4 +15,8 @@
include/gd/gdfonts.h
include/gd/gdfontt.h
lib/libgd.a
+lib/libgd.so
+lib/libgd.so.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm include/gd
--
Ade Lovett, Austin, TX.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912271650.IAA22987>