Mon Jan 9 22:32:22 2012 UTC ()
Add missing mk/termcap buildlink.
Fix the -I order on the cc command line.

Bump PKGREVISION


(sbd)
diff -r1.6 -r1.7 pkgsrc/chat/blackened/Makefile
diff -r1.5 -r1.6 pkgsrc/chat/blackened/distinfo
diff -r0 -r1.1 pkgsrc/chat/blackened/patches/patch-source_Makefile.in
cvs diff -r1.6 -r1.7 pkgsrc/chat/blackened/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/blackened/Attic/Makefile 2011/03/11 10:38:14 1.6
+++ pkgsrc/chat/blackened/Attic/Makefile 2012/01/09 22:32:22 1.7
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile,v 1.6 2011/03/11 10:38:14 zafer Exp $ 1# $NetBSD: Makefile,v 1.7 2012/01/09 22:32:22 sbd Exp $
2# 2#
3 3
4DISTNAME= blackened-1.7.1 4DISTNAME= blackened-1.7.1
 5PKGREVISION= 1
5CATEGORIES= chat 6CATEGORIES= chat
6MASTER_SITES= #ftp://ftp.blackened.com/pub/irc/blackened/ 7MASTER_SITES= #ftp://ftp.blackened.com/pub/irc/blackened/
7# newer version at http://freebsd.aeternal.net/ports/blackened-1.8.1.tar.gz 8# newer version at http://freebsd.aeternal.net/ports/blackened-1.8.1.tar.gz
8 9
9MAINTAINER= carneous@carneous.net 10MAINTAINER= carneous@carneous.net
10HOMEPAGE= http://www.blackened.com/blackened/ 11HOMEPAGE= http://www.blackened.com/blackened/
11COMMENT= The Blackened IRC client 12COMMENT= The Blackened IRC client
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15CONFLICTS= ircII-[0-9]* 16CONFLICTS= ircII-[0-9]*
16 17
17GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
18 19
19INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 20INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
20 21
 22.include "../../mk/termcap.buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/chat/blackened/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/blackened/Attic/distinfo 2007/03/17 13:40:00 1.5
+++ pkgsrc/chat/blackened/Attic/distinfo 2012/01/09 22:32:22 1.6
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.5 2007/03/17 13:40:00 rillig Exp $ 1$NetBSD: distinfo,v 1.6 2012/01/09 22:32:22 sbd Exp $
2 2
3SHA1 (blackened-1.7.1.tar.gz) = 2101762d9b78792616e71bfc3b08113a806c088a 3SHA1 (blackened-1.7.1.tar.gz) = 2101762d9b78792616e71bfc3b08113a806c088a
4RMD160 (blackened-1.7.1.tar.gz) = 7a57d36f965e18b42c9c0bcfa52b9a8ba55316f7 4RMD160 (blackened-1.7.1.tar.gz) = 7a57d36f965e18b42c9c0bcfa52b9a8ba55316f7
5Size (blackened-1.7.1.tar.gz) = 675752 bytes 5Size (blackened-1.7.1.tar.gz) = 675752 bytes
6SHA1 (patch-aa) = 8bc21cd2aad84e5007126f53ad5e951e67ab3e03 6SHA1 (patch-aa) = 8bc21cd2aad84e5007126f53ad5e951e67ab3e03
7SHA1 (patch-ab) = a64908228f75aea6053879fdd0d4b9c0195647a1 7SHA1 (patch-ab) = a64908228f75aea6053879fdd0d4b9c0195647a1
8SHA1 (patch-ac) = 5b83317be7adafbc9b98a19012e7495b9c62f06f 8SHA1 (patch-ac) = 5b83317be7adafbc9b98a19012e7495b9c62f06f
 9SHA1 (patch-source_Makefile.in) = cb5dcb3b03a443b709fae9f4373b77f512254417
File Added: pkgsrc/chat/blackened/patches/Attic/patch-source_Makefile.in
$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