diff options
| author | tron <tron@pkgsrc.org> | 2001-11-01 11:36:32 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-11-01 11:36:32 +0000 |
| commit | ce4edb7d957ca09f4e4c28b99f28b677ca7ae3a6 (patch) | |
| tree | fbd33b48cc6e94f50a4f848ac7dd553e39533cd7 /mail/wmbiff | |
| parent | 3f44b12915f8afaffa9c3c8ab095f561ecec791a (diff) | |
| download | pkgsrc-ce4edb7d957ca09f4e4c28b99f28b677ca7ae3a6.tar.gz | |
Fix build problem on systems running XFree86 3.3.x in conjuction with the
"xpkgwedge" package.
Diffstat (limited to 'mail/wmbiff')
| -rw-r--r-- | mail/wmbiff/distinfo | 4 | ||||
| -rw-r--r-- | mail/wmbiff/patches/patch-aa | 27 |
2 files changed, 20 insertions, 11 deletions
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo index c57207fe1c6..612f2bced5f 100644 --- a/mail/wmbiff/distinfo +++ b/mail/wmbiff/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/07/04 19:04:15 magick Exp $ +$NetBSD: distinfo,v 1.3 2001/11/01 11:36:32 tron Exp $ SHA1 (wmbiff-0.3.1.tar.gz) = b2fd9ace17e4eed24004722c21b1f6bf3f5fc3e0 Size (wmbiff-0.3.1.tar.gz) = 29165 bytes -SHA1 (patch-aa) = 76992ca9fec442da49d5ce14eef74255ded5b8ba +SHA1 (patch-aa) = 7f2dece8bbcbded540c180205ff3425939509086 SHA1 (patch-ab) = 1c1cda1ec1e3727d2a1dd5ca58ceecededbe1eeb diff --git a/mail/wmbiff/patches/patch-aa b/mail/wmbiff/patches/patch-aa index 4db2657843c..392b971522d 100644 --- a/mail/wmbiff/patches/patch-aa +++ b/mail/wmbiff/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $ +$NetBSD: patch-aa,v 1.3 2001/11/01 11:36:33 tron Exp $ --- Makefile.orig Sun Jun 24 20:31:25 2001 -+++ Makefile -@@ -2,7 +2,9 @@ ++++ Makefile Thu Nov 1 12:35:28 2001 +@@ -1,17 +1,19 @@ + # $Id: patch-aa,v 1.3 2001/11/01 11:36:33 tron Exp $ WMBIFF_VERSION="0.3.1" DESTDIR= -prefix=/usr/local @@ -14,17 +15,20 @@ $NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $ + CONF=/etc -@@ -10,7 +12,7 @@ - LIBDIR = -L/usr/X11R6/lib + CC = gcc +-LIBDIR = -L/usr/X11R6/lib ++LIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -CFLAGS = -O2 -Wall #CFLAGS = -g -Wall -pedantic - +#CFLAGS += -Wall -I${PREFIX}/include -I${X11BASE}/include -+CFLAGS+= -I${X11BASE}/include ++CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)' #EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \ -@@ -25,12 +27,6 @@ + # -DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT +@@ -24,14 +26,8 @@ + ../wmgeneral/list.o \ charutil.o -INSTALL = /usr/bin/install @@ -38,14 +42,18 @@ $NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $ + ${CC} ${CFLAGS} $(EXTRAFLAGS) -c $< -o $*.o all: wmbiff-master.xpm wmbiff -@@ -40,5 +36,5 @@ + +@@ -39,7 +35,7 @@ + ln -s wmbiff-master-led.xpm wmbiff-master.xpm wmbiff: $(OBJS) - $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS) + $(CC) ${CFLAGS} ${LDFLAGS} $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS) clean: -@@ -51,10 +47,9 @@ + for i in $(OBJS) ; do \ +@@ -50,12 +46,11 @@ + distclean: clean install: wmbiff - $(INSTALL_DIR) $(DESTDIR)$(bindir) @@ -61,3 +69,4 @@ $NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $ + ${BSD_INSTALL_DATA} sample.wmbiffrc $(DESTDIR)$(datadir)/ # CODING STYLE AND INDENTATION [2001-Mar-12]: + # |