Index: head/irc/trickyirc/Makefile
===================================================================
--- head/irc/trickyirc/Makefile	(revision 325096)
+++ head/irc/trickyirc/Makefile	(revision 325097)
@@ -1,37 +1,50 @@
-# New ports collection makefile for:	TrickyIRC
-# Date created:			 	Jun 20th 1999
-# Whom:					troll
-#
+# Created by: Adam Strohl <troll@digitalspark.net>
 # $FreeBSD$
-#
 
 PORTNAME=	trickyirc
 PORTVERSION=	1.1.0
 PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://www.leb.net/~troll/
 DISTNAME=	TrickyIRC-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	Allows client independent detaching and reattaching of IRC sessions
+COMMENT=	Client-independent detaching and reattaching of IRC sessions
 
+USES=		gmake
 MAKEFILE=	GNUmakefile
+MAKE_ARGS=	CC="${CC}" OPTCC_OPTS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/trickyirc
-USE_GMAKE=	YES
 
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+MAKE_ARGS+=	VERBOSE=YES
+.endif
+
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
+# Use better make(1) syntax in attempt to fix parallel (-jX) builds; do not
+# explicitly set MAKE, it's a builtin variable that make(1) must set itself
+post-patch:
+	@${REINPLACE_CMD} -E \
+		's/cd (.+); gmake \$$@; cd \.\./$$(MAKE) -C \1 $$@/' \
+			${WRKSRC}/core/make/project.mk
+	@${REINPLACE_CMD} -e '/MAKE=/d' ${WRKSRC}/core/make/platforms.mk
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@ ${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.sample ${EXAMPLESDIR}
 .endif
 	@${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/irc/trickyirc/files/patch-aa
===================================================================
--- head/irc/trickyirc/files/patch-aa	(revision 325096)
+++ head/irc/trickyirc/files/patch-aa	(nonexistent)
@@ -1,16 +0,0 @@
---- core/make/platforms.mk.orig	Sun Jul  4 07:46:04 1999
-+++ core/make/platforms.mk	Thu Jul  8 18:23:35 1999
-@@ -2,10 +2,10 @@
- #
- 
- ifeq (${OS},UNIX)
--	CC=			gcc
--	MAKE=			gmake
-+	CC?=			gcc
-+	MAKE=			${GMAKE}
- 	SHOWOFFCC_OPTS=		-Wall
--	OPTCC_OPTS=		-O
-+	OPTCC_OPTS=	 	${CFLAGS}	
- 	BASECC_OPTS=		-c -DUNIX
- 	BASELINK_OPTS=		${LIBRARYPATH}
- 	MAKE_OPTS=		

Property changes on: head/irc/trickyirc/files/patch-aa
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property