Index: graphics/libGL/files/patch-src_mesa_Makefile =================================================================== --- graphics/libGL/files/patch-src_mesa_Makefile (revision 0) +++ graphics/libGL/files/patch-src_mesa_Makefile (working copy) @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 ++++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 +@@ -183,10 +183,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL + + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + + install-osmesa: default osmesa.pc Property changes on: graphics/libGL/files/patch-src_mesa_Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/pkg-install.in =================================================================== --- graphics/libGL/files/pkg-install.in (revision 0) +++ graphics/libGL/files/pkg-install.in (working copy) @@ -0,0 +1,23 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + PRE-INSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + ;; + + POST-INSTALL) + if [ -f ${PREFIX}/lib/nvidia/libGL.so.1 ]; then + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + else + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + fi + ;; +esac + Property changes on: graphics/libGL/files/pkg-install.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/pkg-deinstall.in =================================================================== --- graphics/libGL/files/pkg-deinstall.in (revision 0) +++ graphics/libGL/files/pkg-deinstall.in (working copy) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + POST-DEINSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + ;; +esac Property changes on: graphics/libGL/files/pkg-deinstall.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/pkg-plist =================================================================== --- graphics/libGL/pkg-plist (revision 301769) +++ graphics/libGL/pkg-plist (working copy) @@ -14,7 +14,8 @@ include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h -lib/libGL.so -lib/libGL.so.1 +lib/libGL/libGL.so +lib/libGL/libGL.so.1 libdata/pkgconfig/gl.pc +@dirrm lib/libGL @dirrmtry include/GL Index: graphics/libGL/Makefile =================================================================== --- graphics/libGL/Makefile (revision 301769) +++ graphics/libGL/Makefile (working copy) @@ -7,6 +7,7 @@ PORTNAME= libGL PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI @@ -16,10 +17,18 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both +SUB_FILES= pkg-install pkg-deinstall + do-install: ${RM} -f ${WRKSRC}/include/GL/glu*.h cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +pre-install: + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + +post-install: + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include "${.CURDIR}/bsd.mesalib.mk" .include Index: x11/nvidia-driver/files/patch-x11_extension_Makefile =================================================================== --- x11/nvidia-driver/files/patch-x11_extension_Makefile (revision 0) +++ x11/nvidia-driver/files/patch-x11_extension_Makefile (working copy) @@ -0,0 +1,11 @@ +--- x11/extension/Makefile.orig 2012-04-28 17:50:29.000000000 +0200 ++++ x11/extension/Makefile 2012-04-28 17:50:38.000000000 +0200 +@@ -7,7 +7,7 @@ + LIB= glx + SHLIB_MAJOR= 1 + .if exists(${X11BASE}/lib/xorg/modules/extensions) +-LIBDIR= ${X11BASE}/lib/xorg/modules/extensions ++LIBDIR= ${X11BASE}/lib/xorg/modules/extensions/nvidia + .else + LIBDIR= ${X11BASE}/lib/modules/extensions + .endif Property changes on: x11/nvidia-driver/files/patch-x11_extension_Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11/nvidia-driver/files/pkg-deinstall.in =================================================================== --- x11/nvidia-driver/files/pkg-deinstall.in (revision 0) +++ x11/nvidia-driver/files/pkg-deinstall.in (working copy) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + POST-DEINSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + /bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so* + + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/xorg/libglx.so \ + ${PREFIX}/lib/xorg/modules/extensions/libglx.so + ;; +esac Property changes on: x11/nvidia-driver/files/pkg-deinstall.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11/nvidia-driver/files/patch-lib_libGL_Makefile =================================================================== --- x11/nvidia-driver/files/patch-lib_libGL_Makefile (revision 0) +++ x11/nvidia-driver/files/patch-lib_libGL_Makefile (working copy) @@ -0,0 +1,10 @@ +--- lib/libGL/Makefile.orig 2012-04-28 17:21:12.000000000 +0200 ++++ lib/libGL/Makefile 2012-04-28 17:21:53.000000000 +0200 +@@ -5,6 +5,6 @@ + .endif + LIB= GL + SHLIB_MAJOR= 1 +-LIBDIR= ${X11BASE}/lib ++LIBDIR= ${X11BASE}/lib/nvidia + + .include <${NVIDIA_ROOT}/mk/nvidia.lib.mk> Property changes on: x11/nvidia-driver/files/patch-lib_libGL_Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11/nvidia-driver/files/pkg-install.in =================================================================== --- x11/nvidia-driver/files/pkg-install.in (revision 0) +++ x11/nvidia-driver/files/pkg-install.in (working copy) @@ -0,0 +1,22 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in +# Do we need this? + PRE-INSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + /bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so* + ;; + + POST-INSTALL) + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/nvidia/libglx.so.1 \ + ${PREFIX}/lib/xorg/modules/extensions/libglx.so + ;; +esac + Property changes on: x11/nvidia-driver/files/pkg-install.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11/nvidia-driver/pkg-plist =================================================================== --- x11/nvidia-driver/pkg-plist (revision 301769) +++ x11/nvidia-driver/pkg-plist (working copy) @@ -1,11 +1,6 @@ -@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% -@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la -@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% -%%MODULESDIR%%/extensions/libglx.so -@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so -@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% -lib/libGL.so.1 -@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1 +lib/nvidia/libGL.so +lib/nvidia/libGL.so.1 +@dirrm lib/nvidia lib/libnvidia-tls.so.1 lib/libnvidia-tls.so lib/libnvidia-cfg.so.1 @@ -21,8 +16,9 @@ @dirrmtry lib/vdpau %%MODULESDIR%%/libnvidia-wfb.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so -%%MODULESDIR%%/extensions/libglx.so.1 -@exec ln -sf libglx.so.1 %D/%%MODULESDIR%%/extensions/libglx.so +%%MODULESDIR%%/extensions/nvidia/libglx.so +%%MODULESDIR%%/extensions/nvidia/libglx.so.1 +@dirrm %%MODULESDIR%%/extensions/nvidia @dirrmtry %%MODULESDIR%%/drivers @cwd /boot/modules nvidia.ko Index: x11/nvidia-driver/Makefile =================================================================== --- x11/nvidia-driver/Makefile (revision 301769) +++ x11/nvidia-driver/Makefile (working copy) @@ -7,7 +7,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 295.59 -PORTREVISION?= 0 # As a reminder it can be overridden +PORTREVISION?= 1 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION @@ -33,7 +33,7 @@ # hack below to universally set NVIDIA_ROOT. Also provide X11BASE value # since it is going away from `Mk/bsd.port.mk' as deprecated. MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} -SUB_FILES= pkg-message +SUB_FILES= pkg-deinstall pkg-install pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules PORTDOCS= * @@ -72,11 +72,7 @@ .include -XSERVVERSION!= ${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true -LIBGLVERSION!= ${PKG_INFO} -qO graphics/libGL 2>/dev/null || true - -PLIST_SUB+= XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \ - LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ +PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) @@ -150,12 +146,15 @@ .endif # Do not execute afterinstall target (prevent automatic module registration) ${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's/beforeinstall/dontexecute/' \ + ${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile pre-su-install: # While this port silently assumes PREFIX == LOCALBASE, at least try to # pretend we support different paths thereof and make sure these directories # exist @cd ${PREFIX}/${MODULESDIR} && ${MKDIR} drivers extensions + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .SILENT # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's @@ -184,6 +183,7 @@ ${REINPLACE_CMD} -e '26,27d' ${PKGMESSAGE} . endif .endif + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} Index: x11/nvidia-driver-173/Makefile =================================================================== --- x11/nvidia-driver-173/Makefile (revision 301769) +++ x11/nvidia-driver-173/Makefile (working copy) @@ -6,7 +6,7 @@ # DISTVERSION= 173.14.31 -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Index: x11-servers/xorg-server/files/pkg-install.in =================================================================== --- x11-servers/xorg-server/files/pkg-install.in (revision 0) +++ x11-servers/xorg-server/files/pkg-install.in (working copy) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in +# Do we need this? + PRE-INSTALL) + /bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.* + ;; + + POST-INSTALL) + if [ -f ${PREFIX}/lib/xorg/modules/extensions/nvidia/libglx.so.1 ]; then + /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/nvidia/libglx.so.1 \ + ${PREFIX}/lib/xorg/modules/extensions/libglx.so + /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/nvidia/libglx.so.1 \ + ${PREFIX}/lib/xorg/modules/extensions/libglx.so.1 + else + /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/xorg/libglx.so \ + ${PREFIX}/lib/xorg/modules/extensions/libglx.so + fi + ;; +esac + Property changes on: x11-servers/xorg-server/files/pkg-install.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/files/pkg-deinstall.in =================================================================== --- x11-servers/xorg-server/files/pkg-deinstall.in (revision 0) +++ x11-servers/xorg-server/files/pkg-deinstall.in (working copy) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + POST-DEINSTALL) + /bin/rm -rf ${PREFIX}/lib/xorg/modules/extensions/libglx.so* + ;; +esac Property changes on: x11-servers/xorg-server/files/pkg-deinstall.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/pkg-plist =================================================================== --- x11-servers/xorg-server/pkg-plist (revision 301769) +++ x11-servers/xorg-server/pkg-plist (working copy) @@ -180,10 +180,9 @@ lib/xorg/modules/extensions/libdri2.so lib/xorg/modules/extensions/libextmod.la lib/xorg/modules/extensions/libextmod.so -lib/xorg/modules/extensions/libglx.la -lib/xorg/modules/extensions/libglx.so lib/xorg/modules/extensions/librecord.la lib/xorg/modules/extensions/librecord.so +lib/xorg/modules/extensions/xorg/libglx.so lib/xorg/modules/libexa.la lib/xorg/modules/libexa.so lib/xorg/modules/libfb.la @@ -228,18 +227,11 @@ %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d %%NEW%%@dirrm share/doc/xorg-server @dirrm include/xorg +@dirrm lib/xorg/modules/extensions/xorg @dirrm lib/xorg/modules/extensions @dirrm lib/xorg/modules/multimedia %%OLD%%@dirrm lib/xorg/modules/linux -@dirrm lib/xorg/modules -@dirrm lib/xorg -@dirrmtry include/X11/bitmaps -@dirrmtry include/X11/pixmaps -@dirrmtry lib/X11/doc -@dirrmtry lib/X11/etc -@dirrmtry lib/X11/xserver @dirrmtry lib/xorg/modules @dirrmtry lib/xorg %%NEW%%@dirrmtry share/X11/xorg.conf.d -@dirrmtry share/X11/app-defaults @dirrmtry share/X11 Index: x11-servers/xorg-server/Makefile =================================================================== --- x11-servers/xorg-server/Makefile (revision 301769) +++ x11-servers/xorg-server/Makefile (working copy) @@ -22,16 +22,17 @@ xkbcomp:${PORTSDIR}/x11/xkbcomp XORG_CAT= xserver +SLAVE_PORT?= no .if defined(WITH_NEW_XORG) XORG_VERSION= 1.10.6 -XORG_REVISION= 0 +XORG_REVISION= 1 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \ ${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h .else XORG_VERSION= 1.7.7 -XORG_REVISION= 5 +XORG_REVISION= 6 PLIST_SUB+= OLD="" NEW="@comment " EXTRA_PATCHES+= ${FILESDIR}/extra-dix_events.c EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h @@ -56,7 +57,8 @@ --localstatedir=/var --without-dtrace --disable-xephyr \ --enable-record=yes -.if !defined(SLAVE_PORT) +.if ${SLAVE_PORT} == "no" +SUB_FILES= pkg-install pkg-deinstall MAN1= Xorg.1 \ Xserver.1 \ cvt.1 \ @@ -111,10 +113,10 @@ .endif .if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 +PLIST_SUB+= IA64_NA="@comment " +EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 .else -PLIST_SUB+= IA64_NA="" +PLIST_SUB+= IA64_NA="" .endif .if ${ARCH} == powerpc || ${ARCH} == powerpc64 @@ -151,14 +153,23 @@ post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure +# build libglx.so and manualy install it. + @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \ + -e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \ + ${WRKSRC}/hw/xfree86/dixmods/Makefile.in +.if ${SLAVE_PORT} == "no" +pre-install: + ${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/xorg + ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ + ${PREFIX}/lib/xorg/modules/extensions/xorg/ + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + +post-install: .if defined(WITH_NEW_XORG) -post-install: - @${MKDIR} ${PREFIX}/share/X11/xorg.conf.d - -PLIST_SUB+= OLD="@comment " NEW="" -.else -PLIST_SUB+= OLD="" NEW="@comment " + ${MKDIR} ${PREFIX}/share/X11/xorg.conf.d .endif + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif .include