Sat Jan 17 19:00:14 2009 UTC ()
Fix linking problems which caused missing rpath with native X11.


(ahoka)
diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/docker/Makefile 2008/08/13 11:42:55 1.1.1.1
+++ pkgsrc/x11/docker/Makefile 2009/01/17 19:00:14 1.2
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $ 1# $NetBSD: Makefile,v 1.2 2009/01/17 19:00:14 ahoka Exp $
2# 2#
3 3
4DISTNAME= docker-1.5 4DISTNAME= docker-1.5
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= http://offload1.icculus.org/openbox/2/docker/ 7MASTER_SITES= http://offload1.icculus.org/openbox/2/docker/
7 8
8PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
9 10
10MAINTAINER= ahoka@NetBSD.org 11MAINTAINER= ahoka@NetBSD.org
11HOMEPAGE= http://icculus.org/openbox/2/docker/ 12HOMEPAGE= http://icculus.org/openbox/2/docker/
12COMMENT= WindowMaker dock app which acts as a system tray 13COMMENT= WindowMaker dock app which acts as a system tray
13 14
14USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
15 16
16MAKE_ENV+= PREFIX=${DESTDIR}${PREFIX} 17MAKE_ENV+= PREFIX=${${DESTDIR}${PREFIX}:Q}
17MAKE_ENV+= XLIBPATH=${X11BASE} 18MAKE_ENV+= LDFLAGS=${LDFLAGS:Q}
 19MAKE_ENV+= CFLAGS=${CFLAGS:Q}
18 20
19INSTALLATION_DIRS+= bin 21INSTALLATION_DIRS+= bin
20 22
21do-install: 23do-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/docker ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/docker ${DESTDIR}${PREFIX}/bin
23 25
24.include "../../devel/glib2/buildlink3.mk" 26.include "../../devel/glib2/buildlink3.mk"
25.include "../../x11/libX11/buildlink3.mk" 27.include "../../x11/libX11/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/docker/distinfo 2008/08/13 11:42:55 1.1.1.1
+++ pkgsrc/x11/docker/distinfo 2009/01/17 19:00:14 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $ 1$NetBSD: distinfo,v 1.2 2009/01/17 19:00:14 ahoka Exp $
2 2
3SHA1 (docker-1.5.tar.gz) = aff3e0c6103a7b1f190d4207868ae7c28d267304 3SHA1 (docker-1.5.tar.gz) = aff3e0c6103a7b1f190d4207868ae7c28d267304
4RMD160 (docker-1.5.tar.gz) = d36883acf4de5c2e97d478a7d29cb66645189748 4RMD160 (docker-1.5.tar.gz) = d36883acf4de5c2e97d478a7d29cb66645189748
5Size (docker-1.5.tar.gz) = 14863 bytes 5Size (docker-1.5.tar.gz) = 14863 bytes
6SHA1 (patch-aa) = be91c68b6b9e16434e11b0567338ee9fa2b040eb 6SHA1 (patch-aa) = 7f1a36956fa2302ac22d20ede10a5af5fb9e6cf0
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/docker/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/docker/patches/patch-aa 2008/08/13 11:42:55 1.1.1.1
+++ pkgsrc/x11/docker/patches/patch-aa 2009/01/17 19:00:14 1.2
@@ -1,16 +1,28 @@ @@ -1,16 +1,28 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $ 1$NetBSD: patch-aa,v 1.2 2009/01/17 19:00:14 ahoka Exp $
2 2
3--- Makefile.orig 2002-11-20 11:20:49.000000000 +0100 3--- Makefile.orig 2002-11-20 11:20:49.000000000 +0100
4+++ Makefile 4+++ Makefile
5@@ -5,9 +5,9 @@ 5@@ -5,12 +5,9 @@
6 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# 6 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
7  7
8 # Change this PREFIX to where you want docker to be installed 8 # Change this PREFIX to where you want docker to be installed
9-PREFIX=/usr/local 9-PREFIX=/usr/local
10+PREFIX?=/usr/local 10+PREFIX?=/usr/local
11 # Change this XLIBPATH to point to your X11 development package's installation 11 # Change this XLIBPATH to point to your X11 development package's installation
12-XLIBPATH=/usr/X11R6/lib 12-XLIBPATH=/usr/X11R6/lib
 13-
 14-# Sets some flags for stricter compiling
 15-CFLAGS=-pedantic -Wall -W -O
13+XLIBPATH?=/usr/X11R6/lib 16+XLIBPATH?=/usr/X11R6/lib
14  17
15 # Sets some flags for stricter compiling 18 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
16 CFLAGS=-pedantic -Wall -W -O 19 # #
 20@@ -30,7 +27,7 @@ all: $(target) $(sources) $(headers)
 21 @echo Build Successful
 22
 23 $(target): $(sources:.c=.o)
 24- $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
 25+ $(CC) $(CFLAGS) $(LDFLAGS) -lX11 \
 26 `pkg-config --libs glib-2.0` $^ -o $@
 27
 28 %.o: %.c