diff options
author | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 04:18:50 +0000 |
---|---|---|
committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 04:18:50 +0000 |
commit | 81d9e0e4c2b18230ae0b4da1cf53445136073446 (patch) | |
tree | 6117a878b67570102cbbfd34b809df997b818d49 /mail/coolmail | |
parent | Unbreak. (diff) |
Unbreak for ELF.
Submitted by: steve
Notes
Notes:
svn path=/head/; revision=13944
Diffstat (limited to 'mail/coolmail')
-rw-r--r-- | mail/coolmail/Makefile | 4 | ||||
-rw-r--r-- | mail/coolmail/files/patch-aa | 126 |
2 files changed, 53 insertions, 77 deletions
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile index 3ba26d553f2a..0b3c2c165700 100644 --- a/mail/coolmail/Makefile +++ b/mail/coolmail/Makefile @@ -3,7 +3,7 @@ # Date created: Mon 6 Jul 12:00:06 CEST 1998 # Whom: Udo Schweigert <Udo.Schweigert@mchp.siemens.de> # -# $Id: Makefile,v 1.1.1.1 1998/07/12 23:04:32 steve Exp $ +# $Id: Makefile,v 1.2 1998/10/12 18:38:00 jseger Exp $ # DISTNAME= coolmail-1.3 @@ -14,8 +14,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= Udo.Schweigert@mchp.siemens.de -BROKEN_ELF= yes - PATCH_STRIP= -p1 MAN1= coolmail.1 diff --git a/mail/coolmail/files/patch-aa b/mail/coolmail/files/patch-aa index 85af19d705fa..7d6c667c6d6e 100644 --- a/mail/coolmail/files/patch-aa +++ b/mail/coolmail/files/patch-aa @@ -1,77 +1,55 @@ -diff -rc coolmail-1.3.org/Makefile coolmail-1.3/Makefile -*** coolmail-1.3.org/Makefile Thu Jan 11 18:55:40 1996 ---- coolmail-1.3/Makefile Fri Jul 3 09:02:25 1998 -*************** -*** 22,52 **** - # your linker where to find the libraries it will need, and BINDIR and - # MANDIR specify the places to install the binary executable and manpage - # files for coolmail when you type `make install'. -! CFLAGS = - LINK = $(CC) -! INCLUDES = -I/usr/X11R5/include -! LIB_DIRS = -L/usr/X11R5/lib - BINDIR = /usr/local/bin - MANDIR = /usr/local/man/man1 - - # Comment these out if you can't or don't want to use the digitized audio - # feature. -! AUDIO = -DAUDIO -! AUDIO_MODULE = audio.o - - #### You really don't need to read past this point. #### - - LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext -! COPTS = $(CFLAGS) $(AUDIO) - - all: coolmail - # Done. - -! new: -! rm -f *.o coolmail core - - clean: -! rm -f *.o core - - install: - @if [ -w $(BINDIR) ] ; then \ ---- 22,58 ---- - # your linker where to find the libraries it will need, and BINDIR and - # MANDIR specify the places to install the binary executable and manpage - # files for coolmail when you type `make install'. -! CFLAGS = -DNO_CUSERID - LINK = $(CC) -! INCLUDES = -I/usr/X11R6/include -! LIB_DIRS = -L/usr/X11R6/lib - BINDIR = /usr/local/bin - MANDIR = /usr/local/man/man1 - - # Comment these out if you can't or don't want to use the digitized audio - # feature. -! # AUDIO = -DAUDIO -! # AUDIO_MODULE = audio.o -! -! # Comment these out if you don't want Maildir support -! MAILDIR = -DSUPPORT_MAILDIR -! # for debugging: -! #MAILDIR = $(MAILDIR) -DSUPPORT_MAILDIR_DEBUG -! # normally ignores non-regular files in the Maildir; uncomment to change -! #MAILDIR = $(MAILDIR) -DSUPPORT_MAILDIR_STRICTER - - #### You really don't need to read past this point. #### - - LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext -! COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR) - - all: coolmail - # Done. - -! new: clean all - - clean: -! rm -f *.o core coolmail - - install: - @if [ -w $(BINDIR) ] ; then \ +--- Makefile.orig Thu Jan 11 11:55:40 1996 ++++ Makefile Mon Oct 12 17:55:05 1998 +@@ -22,31 +22,40 @@ + # your linker where to find the libraries it will need, and BINDIR and + # MANDIR specify the places to install the binary executable and manpage + # files for coolmail when you type `make install'. +-CFLAGS = ++CFLAGS = -DNO_CUSERID + LINK = $(CC) +-INCLUDES = -I/usr/X11R5/include +-LIB_DIRS = -L/usr/X11R5/lib ++INCLUDES = -I$(X11BASE)/include ++LIB_DIRS = -L$(X11BASE)/lib + BINDIR = /usr/local/bin + MANDIR = /usr/local/man/man1 + + # Comment these out if you can't or don't want to use the digitized audio + # feature. +-AUDIO = -DAUDIO +-AUDIO_MODULE = audio.o ++# AUDIO = -DAUDIO ++# AUDIO_MODULE = audio.o ++ ++# Comment these out if you don't want Maildir support ++MAILDIR = -DSUPPORT_MAILDIR ++# for debugging: ++#MAILDIR = $(MAILDIR) -DSUPPORT_MAILDIR_DEBUG ++# normally ignores non-regular files in the Maildir; uncomment to change ++#MAILDIR = $(MAILDIR) -DSUPPORT_MAILDIR_STRICTER + + #### You really don't need to read past this point. #### + + LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext +-COPTS = $(CFLAGS) $(AUDIO) ++.if $(PORTOBJFORMAT) == "elf" ++LIBS += -Wl,-rpath,$(X11BASE)/lib ++.endif ++COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR) + + all: coolmail + # Done. + +-new: +- rm -f *.o coolmail core ++new: clean all + + clean: +- rm -f *.o core ++ rm -f *.o core coolmail + + install: + @if [ -w $(BINDIR) ] ; then \ diff -rc coolmail-1.3.org/audio.c coolmail-1.3/audio.c *** coolmail-1.3.org/audio.c Thu Jan 11 18:56:40 1996 --- coolmail-1.3/audio.c Fri Jul 3 08:47:51 1998 |