ports/160152: Update port: x11/docker

[KATO Tsuguru]

>Number:         160152
>Category:       ports
>Synopsis:       Update port: x11/docker
>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:   Wed Aug 24 18:50:40 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Support CFLAGS properly

Remove file:
files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/docker/Makefile x11/docker/Makefile
--- /usr/ports/x11/docker/Makefile	2009-08-20 14:00:27.000000000 +0900
+++ x11/docker/Makefile	2011-08-25 00:54:45.000000000 +0900
@@ -7,20 +7,34 @@
 
 PORTNAME=	docker
 PORTVERSION=	1.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11
-MASTER_SITES=	http://www.kerneled.org/files/FreeBSD-ports/ \
-		http://icculus.org/openbox/2/docker/
+MASTER_SITES=	http://offload2.icculus.org:9090/openbox/2/docker/ \
+		http://offload1.icculus.org:9090/openbox/2/docker/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A dockapp with support for GNOME2 and KDE3 tray icons
 
-PLIST_FILES=	bin/docker
-USE_GMAKE=	yes
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_XORG=	x11
 USE_GNOME=	glib20
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+PLIST_FILES=	bin/docker
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^PREFIX=|PREFIX?=| ; \
+		 s|^CFLAGS=|CFLAGS?=| ; \
+		 s|--cflags glib-2.0|--cflags x11 glib-2.0| ; \
+		 s|--libs glib-2.0|--libs x11 glib-2.0| ; \
+		 s|-L$$(XLIBPATH)|| ; \
+		 s|-lX11||' ${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/docker/files/patch-Makefile x11/docker/files/patch-Makefile
--- /usr/ports/x11/docker/files/patch-Makefile	2003-06-06 05:43:07.000000000 +0900
+++ x11/docker/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
---- Makefile.orig	Wed Nov 20 02:20:49 2002
-+++ Makefile	Thu Jun  5 13:30:53 2003
-@@ -4,13 +4,12 @@
- #                                                                       #
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- 
--# Change this PREFIX to where you want docker to be installed
--PREFIX=/usr/local
- # Change this XLIBPATH to point to your X11 development package's installation
--XLIBPATH=/usr/X11R6/lib
-+XLIBPATH=${PREFIX}/lib
-+XINC=${PREFIX}/include
- 
- # Sets some flags for stricter compiling
--CFLAGS=-pedantic -Wall -W -O
-+CFLAGS=-Wall -W -I${XINC}
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                 #
>Release-Note:
>Audit-Trail:
>Unformatted: