kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix linking problems which caused missing rpath with native X11.

Browse source
This commit is contained in:
ahoka 2009-01-17 19:00:14 +00:00
parent 50840a1cdc
commit 741d602e03
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x11/docker/Makefile
View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $ # $NetBSD: Makefile,v 1.2 2009/01/17 19:00:14 ahoka Exp $
# #
DISTNAME= docker-1.5 DISTNAME= docker-1.5
PKGREVISION= 1
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= http://offload1.icculus.org/openbox/2/docker/ MASTER_SITES= http://offload1.icculus.org/openbox/2/docker/
@ -13,8 +14,9 @@ COMMENT= WindowMaker dock app which acts as a system tray
USE_TOOLS+= pkg-config gmake USE_TOOLS+= pkg-config gmake
MAKE_ENV+= PREFIX=${DESTDIR}${PREFIX} MAKE_ENV+= PREFIX=${${DESTDIR}${PREFIX}:Q}
MAKE_ENV+= XLIBPATH=${X11BASE} MAKE_ENV+= LDFLAGS=${LDFLAGS:Q}
MAKE_ENV+= CFLAGS=${CFLAGS:Q}
INSTALLATION_DIRS+= bin INSTALLATION_DIRS+= bin

4
x11/docker/distinfo
View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $ $NetBSD: distinfo,v 1.2 2009/01/17 19:00:14 ahoka Exp $
SHA1 (docker-1.5.tar.gz) = aff3e0c6103a7b1f190d4207868ae7c28d267304 SHA1 (docker-1.5.tar.gz) = aff3e0c6103a7b1f190d4207868ae7c28d267304
RMD160 (docker-1.5.tar.gz) = d36883acf4de5c2e97d478a7d29cb66645189748 RMD160 (docker-1.5.tar.gz) = d36883acf4de5c2e97d478a7d29cb66645189748
Size (docker-1.5.tar.gz) = 14863 bytes Size (docker-1.5.tar.gz) = 14863 bytes
SHA1 (patch-aa) = be91c68b6b9e16434e11b0567338ee9fa2b040eb SHA1 (patch-aa) = 7f1a36956fa2302ac22d20ede10a5af5fb9e6cf0

20
x11/docker/patches/patch-aa
View file

@ -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.2 2009/01/17 19:00:14 ahoka Exp $
--- Makefile.orig 2002-11-20 11:20:49.000000000 +0100 --- Makefile.orig 2002-11-20 11:20:49.000000000 +0100
+++ Makefile +++ Makefile
@@ -5,9 +5,9 @@ @@ -5,12 +5,9 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Change this PREFIX to where you want docker to be installed # Change this PREFIX to where you want docker to be installed
@ -10,7 +10,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/08/13 11:42:55 ahoka Exp $
+PREFIX?=/usr/local +PREFIX?=/usr/local
# Change this XLIBPATH to point to your X11 development package's installation # Change this XLIBPATH to point to your X11 development package's installation
-XLIBPATH=/usr/X11R6/lib -XLIBPATH=/usr/X11R6/lib
-
-# Sets some flags for stricter compiling
-CFLAGS=-pedantic -Wall -W -O
+XLIBPATH?=/usr/X11R6/lib +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