aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/docker/Makefile26
-rw-r--r--x11/docker/files/patch-Makefile19
2 files changed, 20 insertions, 25 deletions
diff --git a/x11/docker/Makefile b/x11/docker/Makefile
index 717702a0db85..eb3c0a65edb2 100644
--- a/x11/docker/Makefile
+++ b/x11/docker/Makefile
@@ -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@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 --git a/x11/docker/files/patch-Makefile b/x11/docker/files/patch-Makefile
deleted file mode 100644
index ab9406fa051e..000000000000
--- a/x11/docker/files/patch-Makefile
+++ /dev/null
@@ -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}
-
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #