diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-24 22:35:44 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-24 22:35:44 +0000 |
commit | 9b37bbbcc5a641f65ae976831a15ad83bddf6dd3 (patch) | |
tree | 429c886c701e6ffd9a77cb6f55db562913f847c8 /mail | |
parent | add mod_tar (diff) |
* Don't use Gmake (Makefile changed from using $^ to $>).
* Link against libgcc_pic.
Notes
Notes:
svn path=/head/; revision=35396
Diffstat (limited to 'mail')
-rw-r--r-- | mail/muttzilla/Makefile | 2 | ||||
-rw-r--r-- | mail/muttzilla/files/patch-Makefile | 25 |
2 files changed, 8 insertions, 19 deletions
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile index b8a0e3331f29..a1550aa34995 100644 --- a/mail/muttzilla/Makefile +++ b/mail/muttzilla/Makefile @@ -13,8 +13,6 @@ MASTER_SITES= http://www3.bc.sympatico.ca/brian_winters/mutt/ MAINTAINER= obrien@FreeBSD.org -USE_GMAKE= yes - pre-configure: @${PERL} -pi.orig \ -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ diff --git a/mail/muttzilla/files/patch-Makefile b/mail/muttzilla/files/patch-Makefile index b740b321e55a..39bca71404c4 100644 --- a/mail/muttzilla/files/patch-Makefile +++ b/mail/muttzilla/files/patch-Makefile @@ -1,25 +1,19 @@ --- Makefile.orig Wed Jan 26 23:11:08 2000 -+++ Makefile Fri Feb 4 15:52:52 2000 -@@ -1,12 +1,11 @@ ++++ Makefile Fri Nov 24 14:33:13 2000 +@@ -1 +1 @@ -CFLAGS = -O2 -Wall - LDFLAGS = -G -lc - - OBJS = muttzilla.o mzargs.o mzbase.o mzmail.o mznews.o nsapi.o - TARGET = muttzilla.so - ++CFLAGS += -Wall +@@ -7,3 +7,3 @@ -BINDIR = /usr/local/bin -LIBDIR = /usr/local/lib -ETCDIR = /etc +BINDIR = ${PREFIX}/bin +LIBDIR = ${PREFIX}/lib +ETCDIR = ${PREFIX}/etc - - MZLIBDIR = $(LIBDIR)/muttzilla - MAILERLIBS = mutt pine dtmail VM tin -@@ -24,11 +23,11 @@ - rm -f $(TARGET) - - install: $(TARGET) +@@ -18 +18 @@ +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) -o $@ $> /usr/lib/libgcc_pic.a +@@ -27,5 +27,5 @@ - install --mode=0755 muttzilla.so $(LIBDIR) - install --mode=0755 -d $(MZLIBDIR) - install --mode=0755 mzmail.sh mzmail.py mznews.sh mznews.py $(BINDIR) @@ -30,6 +24,3 @@ + install -m 0755 -c mzmail.sh mzmail.py mznews.sh mznews.py $(BINDIR) + install -m 0644 -c $(MAILERLIBS) $(MZLIBDIR) + install -m 0644 -c muttzilla.conf $(ETCDIR) - - muttzilla.o: muttzilla.c - mzargs.o: mzargs.c muttzilla.h |