ports/184875: x11-servers/x2x: Support CC/CFLAGS properly

[KATO Tsuguru]

>Number:         184875
>Category:       ports
>Synopsis:       x11-servers/x2x: Support CC/CFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:20 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
- Update MASTER_SITES

Remove file:
files/patch-aa

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-servers/x2x/Makefile x11-servers/x2x/Makefile
--- /usr/ports/x11-servers/x2x/Makefile	2013-11-06 22:05:31.000000000 +0900
+++ x11-servers/x2x/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,17 +3,31 @@
 
 PORTNAME=	x2x
 PORTVERSION=	1.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://cloud.github.com/downloads/dottedmag/x2x/
+MASTER_SITES=	GHC
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Program to link multiple X servers together
 
+LICENSE=	MIT
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	dottedmag
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 USES=		imake
 USE_XORG=	x11 xext xtst
-MAN1=		x2x.1
-PLIST_FILES=	bin/x2x
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/x2x man/man1/x2x.1.gz
+
+post-extract:
+	@${LN} -sf x2x.1 ${WRKSRC}/x2x.man
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/CC =/s|^|XCOMM| ; \
+		 /CDEBUGFLAGS =/s|^|XCOMM|' ${WRKSRC}/Imakefile
+
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-servers/x2x/files/patch-aa x11-servers/x2x/files/patch-aa
--- /usr/ports/x11-servers/x2x/files/patch-aa	2013-11-06 22:05:31.000000000 +0900
+++ x11-servers/x2x/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- Imakefile~	Thu Aug 21 01:44:52 1997
-+++ Imakefile	Sun Sep  3 16:44:47 2000
-@@ -10,3 +10,7 @@
-     CDEBUGFLAGS = -O
- 
- ComplexProgramTarget(x2x)
-+# Added by Greg Lehey <grog at FreeBSD.org> for FreeBSD port
-+x2x.man:	x2x.1
-+	rm -f x2x.man
-+	ln x2x.1 x2x.man
>Release-Note:
>Audit-Trail:
>Unformatted: