pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/blackened Add missing mk/termcap buildlink.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fc496e599fa
branches:  trunk
changeset: 597830:5fc496e599fa
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Mon Jan 09 22:32:22 2012 +0000

description:
Add missing mk/termcap buildlink.
Fix the -I order on the cc command line.

Bump PKGREVISION

diffstat:

 chat/blackened/Makefile                         |   4 +-
 chat/blackened/distinfo                         |   3 +-
 chat/blackened/patches/patch-source_Makefile.in |  72 +++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 2 deletions(-)

diffs (109 lines):

diff -r 15de2b0573e7 -r 5fc496e599fa chat/blackened/Makefile
--- a/chat/blackened/Makefile   Mon Jan 09 21:26:53 2012 +0000
+++ b/chat/blackened/Makefile   Mon Jan 09 22:32:22 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/03/11 10:38:14 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2012/01/09 22:32:22 sbd Exp $
 #
 
 DISTNAME=      blackened-1.7.1
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  #ftp://ftp.blackened.com/pub/irc/blackened/
 # newer version at http://freebsd.aeternal.net/ports/blackened-1.8.1.tar.gz
@@ -18,4 +19,5 @@
 
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 15de2b0573e7 -r 5fc496e599fa chat/blackened/distinfo
--- a/chat/blackened/distinfo   Mon Jan 09 21:26:53 2012 +0000
+++ b/chat/blackened/distinfo   Mon Jan 09 22:32:22 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/03/17 13:40:00 rillig Exp $
+$NetBSD: distinfo,v 1.6 2012/01/09 22:32:22 sbd Exp $
 
 SHA1 (blackened-1.7.1.tar.gz) = 2101762d9b78792616e71bfc3b08113a806c088a
 RMD160 (blackened-1.7.1.tar.gz) = 7a57d36f965e18b42c9c0bcfa52b9a8ba55316f7
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 8bc21cd2aad84e5007126f53ad5e951e67ab3e03
 SHA1 (patch-ab) = a64908228f75aea6053879fdd0d4b9c0195647a1
 SHA1 (patch-ac) = 5b83317be7adafbc9b98a19012e7495b9c62f06f
+SHA1 (patch-source_Makefile.in) = cb5dcb3b03a443b709fae9f4373b77f512254417
diff -r 15de2b0573e7 -r 5fc496e599fa chat/blackened/patches/patch-source_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/blackened/patches/patch-source_Makefile.in   Mon Jan 09 22:32:22 2012 +0000
@@ -0,0 +1,72 @@
+$NetBSD: patch-source_Makefile.in,v 1.1 2012/01/09 22:32:22 sbd Exp $
+
+Put $(INCLUDES) before $(CFLAGS) so that -I../include comes before 
+ -I${PREFIX}/include...
+
+--- source/Makefile.in.orig    1999-07-26 06:54:32.000000000 +0000
++++ source/Makefile.in
+@@ -50,7 +50,7 @@ all: blackened
+ irc: blackened
+ 
+ .c.o:
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -c $<
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -c $<
+ 
+ blackened: $(OBJECTS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -o blackened $(OBJECTS) $(LIBS)
+@@ -63,37 +63,37 @@ install: blackened
+ # .o files needing special compilation flags
+ 
+ irc.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DIRCLIB=\"$(IRCLIB)/\" -DIRCPATH=\"$(IRCPATH)\" -c irc.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DIRCLIB=\"$(IRCLIB)/\" -DIRCPATH=\"$(IRCPATH)\" -c irc.c
+ 
+ vars.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DDEFAULT_HELP_FILE=\"$(HELP_FILE)\" -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -c vars.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DDEFAULT_HELP_FILE=\"$(HELP_FILE)\" -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -c vars.c
+ 
+ help.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DDEFAULT_HELP_FILE=\"$(HELP_FILE)\" -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -c help.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DDEFAULT_HELP_FILE=\"$(HELP_FILE)\" -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -c help.c
+ 
+ server.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DIRCSERV_PATH=\"$(INSTALL_IRCSERV)\" -c server.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DIRCSERV_PATH=\"$(INSTALL_IRCSERV)\" -c server.c
+ 
+ translat.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DTRANSLATION_PATH=\"$(TRANS_DIR)/\" -c translat.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DTRANSLATION_PATH=\"$(TRANS_DIR)/\" -c translat.c
+ 
+ screen.o: Makefile ../Makefile
+-      $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DWSERV_PATH=\"$(INSTALL_WSERV)\" -c screen.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(PP_DEFS) -DWSERV_PATH=\"$(INSTALL_WSERV)\" -c screen.c
+ 
+ # auxiliary programs
+ 
+ ircflush: ircflush.o ircsig.o
+-      $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCLUDES) -o ircflush ircflush.o ircsig.o $(LIBS)
++      $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o ircflush ircflush.o ircsig.o $(LIBS)
+ clean::
+       $(RM) ircflush ircflush.o
+ 
+ ircserv: ircserv.o newio.o ircsig.o
+-      $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(PPS_DEFS) $(INCLUDES) -o ircserv ircserv.o newio.o ircsig.o $(LIBS)
++      $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) $(PPS_DEFS) -o ircserv ircserv.o newio.o ircsig.o $(LIBS)
+ clean::
+       $(RM) ircserv ircserv.o newio.o
+ 
+ wserv: $(WSERV_OBJECTS) ircsig.o
+-      $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCLUDES) -o wserv $(WSERV_OBJECTS) ircsig.o $(LIBS)
++      $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o wserv $(WSERV_OBJECTS) ircsig.o $(LIBS)
+ clean::
+       $(RM) wserv wserv.o wterm.o wterm.c
+ 
+@@ -105,7 +105,7 @@ clean::
+ wterm.o: term.c
+       $(RM) wterm.c
+       $(LN) term.c wterm.c
+-      $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -DSTTY_ONLY -c wterm.c
++      $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) -DSTTY_ONLY -c wterm.c
+ 
+ # DO NOT DELETE
+ 



Home | Main Index | Thread Index | Old Index