diff options
author | sbd <sbd@pkgsrc.org> | 2012-01-09 23:08:56 +0000 |
---|---|---|
committer | sbd <sbd@pkgsrc.org> | 2012-01-09 23:08:56 +0000 |
commit | 71e09eae1be17b83d928ff58c53549773471b12c (patch) | |
tree | 09838e41d27b240e553bd6548ac41483b433c3c2 | |
parent | 98102783b75c1be29e39901d104de93cb71303b7 (diff) | |
download | pkgsrc-71e09eae1be17b83d928ff58c53549773471b12c.tar.gz |
Add missing mk/termcap buildlink.
Fix the -I order on the cc command line.
Bump PKGREVISION
-rw-r--r-- | chat/epic4/Makefile | 5 | ||||
-rw-r--r-- | chat/epic4/distinfo | 3 | ||||
-rw-r--r-- | chat/epic4/patches/patch-source_Makefile.in | 44 |
3 files changed, 49 insertions, 3 deletions
diff --git a/chat/epic4/Makefile b/chat/epic4/Makefile index 3e828616e3d..6e4d61664ab 100644 --- a/chat/epic4/Makefile +++ b/chat/epic4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2010/12/29 02:02:02 dholland Exp $ +# $NetBSD: Makefile,v 1.34 2012/01/09 23:08:56 sbd Exp $ # DISTNAME= epic4-2.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= chat MASTER_SITES= ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \ ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \ @@ -26,5 +26,6 @@ INSTALL_MAKE_FLAGS+= IP=${DESTDIR} CFLAGS.OSF1+= -D_SOCKADDR_LEN +.include "../../mk/termcap.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/epic4/distinfo b/chat/epic4/distinfo index 323c473c663..2667159007a 100644 --- a/chat/epic4/distinfo +++ b/chat/epic4/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/03/17 14:19:59 rillig Exp $ +$NetBSD: distinfo,v 1.11 2012/01/09 23:08:56 sbd Exp $ SHA1 (epic4-2.2.tar.bz2) = 88d4140e693b571ceb8148f98d504a5fefa74076 RMD160 (epic4-2.2.tar.bz2) = 8f1f1b446bd3260e665093864f1becc0b625be32 Size (epic4-2.2.tar.bz2) = 623254 bytes SHA1 (patch-aa) = c00699223db490c044d07754d73078c4f768e3a3 +SHA1 (patch-source_Makefile.in) = ea4b6520c228b22b43dc391725f3a0d616aeb729 diff --git a/chat/epic4/patches/patch-source_Makefile.in b/chat/epic4/patches/patch-source_Makefile.in new file mode 100644 index 00000000000..013ae13c222 --- /dev/null +++ b/chat/epic4/patches/patch-source_Makefile.in @@ -0,0 +1,44 @@ +$NetBSD: patch-source_Makefile.in,v 1.1 2012/01/09 23:08:56 sbd Exp $ + +Put $(INCLUDES) before $(CFLAGS) so that -I../include comes before + -I${PREFIX}/include... + +--- source/Makefile.in.orig 2003-07-16 00:56:43.000000000 +0000 ++++ source/Makefile.in +@@ -28,7 +28,7 @@ VPATH=@srcdir@ + all: epic + + .c.o: +- $(CC) $(CFLAGS) $(ANSIFLAGS) $(INCLUDES) -c $< ++ $(CC) $(INCLUDES) $(CFLAGS) $(ANSIFLAGS) -c $< + + # + # The executables +@@ -37,7 +37,7 @@ all: epic + # epic (irc) + epic: $(OBJECTS) + sh info.c.sh +- $(CC) $(CFLAGS) $(INCLUDES) -c info.c ++ $(CC) $(INCLUDES) $(CFLAGS) -c info.c + $(CC) $(CFLAGS) $(LDFLAGS) -o epic $(OBJECTS) info.o $(LIBS) + $(RM) info.c info.o + clean:: +@@ -63,15 +63,15 @@ clean:: + # .o files needing special compilation flags + + irc.o: Makefile ../Makefile +- $(CC) $(CFLAGS) $(ANSIFLAGS) $(INCLUDES) -c @srcdir@/irc.c \ ++ $(CC) $(INCLUDES) $(CFLAGS) $(ANSIFLAGS) -c @srcdir@/irc.c \ + -DIRCLIB=\"$(IRCLIB)/\" + + vars.o: Makefile ../Makefile +- $(CC) $(CFLAGS) $(ANSIFLAGS) $(INCLUDES) -c @srcdir@/vars.c \ ++ $(CC) $(INCLUDES) $(CFLAGS) $(ANSIFLAGS) -c @srcdir@/vars.c \ + -DWSERV_PATH=\"$(INSTALL_WSERV)\" + + perl.o: perl.c Makefile ../Makefile +- $(CC) $(CFLAGS) $(ansiflags) $(INCLUDES) -c @srcdir@/perl.c `perl -MExtUtils::Embed -e ccopts` ++ $(CC) $(INCLUDES) $(CFLAGS) $(ansiflags) -c @srcdir@/perl.c `perl -MExtUtils::Embed -e ccopts` + + + # |