[pkgsrc/pkgsrc-2008Q4]: pkgsrc/x11/docker Pullup ticket #2662 - requested by ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/271730b43f31
branches:  pkgsrc-2008Q4
changeset: 552270:271730b43f31
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jan 29 13:09:09 2009 +0000

description:
Pullup ticket #2662 - requested by ahoka
docker: build fix

Revisions pulled up:
- x11/docker/Makefile                   1.2
- x11/docker/distinfo                   1.2
- x11/docker/patches/patch-aa           1.2
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Sat Jan 17 19:00:14 UTC 2009

Modified Files:
        pkgsrc/x11/docker: Makefile distinfo
        pkgsrc/x11/docker/patches: patch-aa

Log Message:
Fix linking problems which caused missing rpath with native X11.

diffstat:

 x11/docker/Makefile         |   8 +++++---
 x11/docker/distinfo         |   4 ++--
 x11/docker/patches/patch-aa |  20 ++++++++++++++++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 680eddb427dd -r 271730b43f31 x11/docker/Makefile
--- a/x11/docker/Makefile       Wed Jan 28 21:25:12 2009 +0000
+++ b/x11/docker/Makefile       Thu Jan 29 13:09:09 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $
+# $NetBSD: Makefile,v 1.1.1.1.6.1 2009/01/29 13:09:09 tron Exp $
 #
 
 DISTNAME=      docker-1.5
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  http://offload1.icculus.org/openbox/2/docker/
 
@@ -13,8 +14,9 @@
 
 USE_TOOLS+=    pkg-config gmake
 
-MAKE_ENV+=     PREFIX=${DESTDIR}${PREFIX}
-MAKE_ENV+=     XLIBPATH=${X11BASE}
+MAKE_ENV+=     PREFIX=${${DESTDIR}${PREFIX}:Q}
+MAKE_ENV+=     LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=     CFLAGS=${CFLAGS:Q}
 
 INSTALLATION_DIRS+=    bin
 
diff -r 680eddb427dd -r 271730b43f31 x11/docker/distinfo
--- a/x11/docker/distinfo       Wed Jan 28 21:25:12 2009 +0000
+++ b/x11/docker/distinfo       Thu Jan 29 13:09:09 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $
+$NetBSD: distinfo,v 1.1.1.1.6.1 2009/01/29 13:09:09 tron Exp $
 
 SHA1 (docker-1.5.tar.gz) = aff3e0c6103a7b1f190d4207868ae7c28d267304
 RMD160 (docker-1.5.tar.gz) = d36883acf4de5c2e97d478a7d29cb66645189748
 Size (docker-1.5.tar.gz) = 14863 bytes
-SHA1 (patch-aa) = be91c68b6b9e16434e11b0567338ee9fa2b040eb
+SHA1 (patch-aa) = 7f1a36956fa2302ac22d20ede10a5af5fb9e6cf0
diff -r 680eddb427dd -r 271730b43f31 x11/docker/patches/patch-aa
--- a/x11/docker/patches/patch-aa       Wed Jan 28 21:25:12 2009 +0000
+++ b/x11/docker/patches/patch-aa       Thu Jan 29 13:09:09 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $
+$NetBSD: patch-aa,v 1.1.1.1.6.1 2009/01/29 13:09:09 tron Exp $
 
 --- Makefile.orig      2002-11-20 11:20:49.000000000 +0100
 +++ Makefile
-@@ -5,9 +5,9 @@
+@@ -5,12 +5,9 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  
  # Change this PREFIX to where you want docker to be installed
@@ -10,7 +10,19 @@
 +PREFIX?=/usr/local
  # Change this XLIBPATH to point to your X11 development package's installation
 -XLIBPATH=/usr/X11R6/lib
+-
+-# Sets some flags for stricter compiling
+-CFLAGS=-pedantic -Wall -W -O
 +XLIBPATH?=/usr/X11R6/lib
  
- # Sets some flags for stricter compiling
- CFLAGS=-pedantic -Wall -W -O
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                 #
+@@ -30,7 +27,7 @@ all: $(target) $(sources) $(headers)
+       @echo Build Successful
+ 
+ $(target): $(sources:.c=.o)
+-      $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
++      $(CC) $(CFLAGS) $(LDFLAGS) -lX11 \
+               `pkg-config --libs glib-2.0` $^ -o $@
+ 
+ %.o: %.c