summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2001-03-05 13:52:41 +0000
committerskrll <skrll@pkgsrc.org>2001-03-05 13:52:41 +0000
commitcd7df95f4e3ff447c33d7e43985d2b36bba07918 (patch)
tree93ee6fa59fcda9ce3bde4abdd51aaa1f2f96c5d0 /x11
parentb105ec5b4b3a845f77c945fab464ccd179f99e09 (diff)
downloadpkgsrc-cd7df95f4e3ff447c33d7e43985d2b36bba07918.tar.gz
Add definition of CC to make environment and get build system to use it
with libtool.
Diffstat (limited to 'x11')
-rw-r--r--x11/XmHTML/Makefile4
-rw-r--r--x11/XmHTML/files/patch-sum12
-rw-r--r--x11/XmHTML/patches/patch-aa17
-rw-r--r--x11/XmHTML/patches/patch-ac18
-rw-r--r--x11/XmHTML/patches/patch-ad8
-rw-r--r--x11/XmHTML/patches/patch-ae8
-rw-r--r--x11/XmHTML/patches/patch-af13
-rw-r--r--x11/XmHTML/patches/patch-ag13
8 files changed, 66 insertions, 27 deletions
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index d58a5aa026e..73edede9f8a 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/03/04 09:06:20 tron Exp $
+# $NetBSD: Makefile,v 1.19 2001/03/05 13:52:41 skrll Exp $
#
DISTNAME= XmHTML-1.1.7
@@ -20,6 +20,8 @@ USE_LIBTOOL= YES
NO_CONFIGURE= YES
+MAKE_ENV+= CC=${CC}
+
do-install:
${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
${WRKSRC}/lib/libXmHTML.la ${PREFIX}/lib
diff --git a/x11/XmHTML/files/patch-sum b/x11/XmHTML/files/patch-sum
index 312a55fd696..cf7150a8cb2 100644
--- a/x11/XmHTML/files/patch-sum
+++ b/x11/XmHTML/files/patch-sum
@@ -1,7 +1,9 @@
-$NetBSD: patch-sum,v 1.3 1999/11/13 07:31:39 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2001/03/05 13:52:42 skrll Exp $
-MD5 (patch-aa) = 94000be72176de16682f5680b59478c4
+MD5 (patch-aa) = c6a4f2e755feba6bd6627c3af2b81605
MD5 (patch-ab) = d3817484fffe2e00a011b8d884990b9b
-MD5 (patch-ac) = cf9669603682d262a597a9e358f0ba05
-MD5 (patch-ad) = 3383a75d041e5c76ce2d8001eaa9e96b
-MD5 (patch-ae) = 91a3e7d1bfb4fa1ba46e03e7b81c821c
+MD5 (patch-ac) = dba695f14971176f166586527e1bdc77
+MD5 (patch-ad) = eecfe3183be6a5d8e40adae9d4562d76
+MD5 (patch-ae) = fb94c328760a332a824d325f2663384c
+MD5 (patch-af) = 46b4207cfa00d4be844128013dbc5d17
+MD5 (patch-ag) = b942649946e3219cf2455a8d079aec0c
diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa
index b740386b5f6..6ed35c44a31 100644
--- a/x11/XmHTML/patches/patch-aa
+++ b/x11/XmHTML/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.3 1999/11/13 07:31:40 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/03/05 13:52:42 skrll Exp $
---- Makefile.orig Wed Feb 3 19:43:27 1999
-+++ Makefile Tue Nov 2 01:28:54 1999
-@@ -64,9 +64,9 @@
+--- Makefile.orig Thu Feb 4 00:43:27 1999
++++ Makefile
+@@ -64,9 +64,10 @@
# Compiler Settings #
# #
#####################
-CC = gcc
-CFLAGS = -g -funroll-loops -Wall -pipe -ansi
-LDFLAGS =
-+CC = $(LIBTOOL) gcc
++# Inherit from build environment
++#CC = gcc
+#CFLAGS = -g -funroll-loops -Wall -pipe -ansi
+#LDFLAGS =
# The following flags are *very* usefull if you are getting unresolved
# references to functions in libraries that you *know* to exist.
-@@ -114,8 +114,8 @@
+@@ -114,8 +115,8 @@
# HAVE_LIBPNG => png.h and zlib.h
# HAVE_LIBZ => zlib.h
@@ -26,7 +27,7 @@ $NetBSD: patch-aa,v 1.3 1999/11/13 07:31:40 jlam Exp $
# Image libraries
# No need to add -lXpm if you need to include it with LIBS below
-@@ -166,14 +166,14 @@
+@@ -166,14 +167,14 @@
# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
# info).
#
@@ -43,7 +44,7 @@ $NetBSD: patch-aa,v 1.3 1999/11/13 07:31:40 jlam Exp $
else
ifeq ($(PLATFORM),gtk)
PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
-@@ -192,17 +192,17 @@
+@@ -192,17 +193,17 @@
# Motif version (default)
ifeq ($(PLATFORM),Motif)
diff --git a/x11/XmHTML/patches/patch-ac b/x11/XmHTML/patches/patch-ac
index bb3c2f58f83..4a04383d9ae 100644
--- a/x11/XmHTML/patches/patch-ac
+++ b/x11/XmHTML/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 1999/11/13 07:31:40 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2001/03/05 13:52:42 skrll Exp $
---- http/Makefile.orig Wed Feb 3 19:43:27 1999
-+++ http/Makefile Tue Nov 2 01:28:54 1999
+--- http/Makefile.orig Thu Feb 4 00:43:27 1999
++++ http/Makefile
@@ -2,7 +2,7 @@
# lint configuration. I use lclint.
#
@@ -11,7 +11,15 @@ $NetBSD: patch-ac,v 1.3 1999/11/13 07:31:40 jlam Exp $
# List of source, object and header files
SRCS=HTTP.c cookie.c
-@@ -27,9 +27,8 @@
+@@ -20,16 +20,15 @@
+ # rule to create .o files from .c files
+ .c.o:
+ $(RM) $@
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
++ ${LIBTOOL} $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
+
+ all: $(TARGET)
+
# targets to build
$(TARGET):: $(OBJS)
@@ -19,7 +27,7 @@ $NetBSD: patch-ac,v 1.3 1999/11/13 07:31:40 jlam Exp $
- $(AR) $@ $(OBJS)
- $(RANLIB) $@
+ $(RM) $@
-+ $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
++ ${LIBTOOL} $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
stamp-includes:
@if [ -d ../include ]; then set +x; \
diff --git a/x11/XmHTML/patches/patch-ad b/x11/XmHTML/patches/patch-ad
index de87a3996cc..58478ec15d8 100644
--- a/x11/XmHTML/patches/patch-ad
+++ b/x11/XmHTML/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 1999/11/13 07:31:40 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/03/05 13:52:42 skrll Exp $
---- lib/Makefile.orig Wed Feb 3 19:43:26 1999
-+++ lib/Makefile Tue Nov 2 01:28:54 1999
+--- lib/Makefile.orig Thu Feb 4 00:43:26 1999
++++ lib/Makefile
@@ -25,7 +25,7 @@
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #
##############################################################################
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.3 1999/11/13 07:31:40 jlam Exp $
- $(AR) $@ common/*.o $(PLATFORM)/*.o
- $(RANLIB) $@
+ $(RM) $@
-+ $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
++ ${LIBTOOL} $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
+ -rpath ${PREFIX}/lib -version-info 1:2
depend::
diff --git a/x11/XmHTML/patches/patch-ae b/x11/XmHTML/patches/patch-ae
index 7d949e726e1..52098b368b0 100644
--- a/x11/XmHTML/patches/patch-ae
+++ b/x11/XmHTML/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 1999/11/13 07:31:40 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2001/03/05 13:52:42 skrll Exp $
---- tools/Makefile.orig Wed Feb 3 19:43:27 1999
-+++ tools/Makefile Tue Nov 2 01:38:36 1999
+--- tools/Makefile.orig Thu Feb 4 00:43:27 1999
++++ tools/Makefile
@@ -88,7 +88,7 @@
httpget:: httpget.o
$(RM) $@ \
- $(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
-+ $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
++ ${LIBTOOL} $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
# gif to gzf converter
gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o
diff --git a/x11/XmHTML/patches/patch-af b/x11/XmHTML/patches/patch-af
new file mode 100644
index 00000000000..833ba3dac06
--- /dev/null
+++ b/x11/XmHTML/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2001/03/05 13:52:42 skrll Exp $
+
+--- lib/common/Makefile.orig Mon Mar 5 13:37:18 2001
++++ lib/common/Makefile
+@@ -56,7 +56,7 @@
+ # rule to create .o files from .c files
+ .c.o:
+ $(RM) $@
+- $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++ ${LIBTOOL} $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+
+ # targets to build
+ all: $(TARGET)
diff --git a/x11/XmHTML/patches/patch-ag b/x11/XmHTML/patches/patch-ag
new file mode 100644
index 00000000000..a5f603eb33c
--- /dev/null
+++ b/x11/XmHTML/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2001/03/05 13:52:42 skrll Exp $
+
+--- lib/Motif/Makefile.orig Mon Mar 5 13:38:22 2001
++++ lib/Motif/Makefile
+@@ -50,7 +50,7 @@
+ # rule to create .o files from .c files
+ .c.o:
+ $(RM) $@
+- $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++ ${LIBTOOL} $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+
+ # targets to build
+ all: $(TARGET)