diff options
| author | joerg <joerg@pkgsrc.org> | 2012-03-14 23:11:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-03-14 23:11:58 +0000 |
| commit | 1a9452c4e8b809fc88ba68c7dee0bdd7ce366e7d (patch) | |
| tree | f27ecd4d938717018dc46067ffc5532fd27899f8 /graphics/opencsg | |
| parent | 77e0799dd1783b664b9a68221c8b35f7de589849 (diff) | |
| download | pkgsrc-1a9452c4e8b809fc88ba68c7dee0bdd7ce366e7d.tar.gz | |
Fix linkage for native X11. Still broken for modular Xorg.
Diffstat (limited to 'graphics/opencsg')
| -rw-r--r-- | graphics/opencsg/Makefile | 6 | ||||
| -rw-r--r-- | graphics/opencsg/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencsg/patches/patch-src_Makefile | 15 |
3 files changed, 20 insertions, 4 deletions
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile index a08073003f2..56deff36d6f 100644 --- a/graphics/opencsg/Makefile +++ b/graphics/opencsg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/02/28 10:42:12 reinoud Exp $ +# $NetBSD: Makefile,v 1.3 2012/03/14 23:11:58 joerg Exp $ # PKGNAME= opencsg-1.3.2 @@ -17,9 +17,9 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= pkg-config gmake USE_LANGUAGES= c c++ +INSTALLATION_DIRS= include lib + do-install: - ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/lib - ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/ diff --git a/graphics/opencsg/distinfo b/graphics/opencsg/distinfo index 58e84ae3380..65bf48d8c59 100644 --- a/graphics/opencsg/distinfo +++ b/graphics/opencsg/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2012/02/28 10:42:12 reinoud Exp $ +$NetBSD: distinfo,v 1.3 2012/03/14 23:11:58 joerg Exp $ SHA1 (OpenCSG-1.3.2.tar.gz) = e2b4abf169ae3e319eb5f6d9ae6136fa96710a05 RMD160 (OpenCSG-1.3.2.tar.gz) = 4480778c310a3d5f84933c1b35508dd94adf2332 Size (OpenCSG-1.3.2.tar.gz) = 744712 bytes SHA1 (patch-Makefile) = 13c3cc669156b04b5d09af9587f76d1055629518 SHA1 (patch-RenderTexture.cpp) = 9d65c9928b4f42fde109b5497912e6654b188c69 +SHA1 (patch-src_Makefile) = 7122719be270b183d35c7c0d8b39266dc84df4a7 diff --git a/graphics/opencsg/patches/patch-src_Makefile b/graphics/opencsg/patches/patch-src_Makefile new file mode 100644 index 00000000000..56180633f34 --- /dev/null +++ b/graphics/opencsg/patches/patch-src_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Makefile,v 1.1 2012/03/14 23:11:58 joerg Exp $ + +--- src/Makefile.orig 2012-03-13 15:57:17.000000000 +0000 ++++ src/Makefile +@@ -18,8 +18,8 @@ LEXFLAGS = + YACCFLAGS= -d + INCPATH = -I. -I../include -I../glew/include -I.. -I/usr/X11R6/include + LINK = g++ +-LFLAGS = -shared -Wl,-soname,libopencsg.so.1 -Wl,-rpath,../lib +-LIBS = $(SUBLIBS) -L/usr/X11R6/lib -lGLU -lGL -lXmu ++LFLAGS = -shared -Wl,-soname,libopencsg.so.1 -Wl,-rpath,${X11BASE}/lib ++LIBS = $(SUBLIBS) -lGLU -lGL -lXmu + AR = ar cqs + RANLIB = + QMAKE = qmake |