diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /devel/root | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'devel/root')
| -rw-r--r-- | devel/root/Makefile | 11 | ||||
| -rw-r--r-- | devel/root/files/patch-asimage-Module.mk | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/devel/root/Makefile b/devel/root/Makefile index 5522b9eb601c..14fe3d99f05b 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -7,7 +7,7 @@ PORTNAME= root PORTVERSION= 5.02.00 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel science math MASTER_SITES= ftp://root.cern.ch/root/ DISTNAME= ${PORTNAME}_v${PORTVERSION}.source @@ -36,9 +36,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 USE_OPENSSL= yes USE_GMAKE= yes -USE_XLIB= yes -USE_XPM= yes -USE_GL= yes +USE_XORG= xpm x11 +USE_GL= gl USE_GNOME= libxml2 # A lot of additional features are most likely used in high energy physics @@ -84,7 +83,7 @@ CONFIGURE_ARGS= ${CONFIGURE_TARGET} \ --enable-xml \ --enable-xrootd -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/root %%PREFIX%%/lib/root/cint MAN1= cint.1 g2root.1 g2rootold.1 h2root.1 hadd.1 makecint.1 MAN1+= memprobe.1 olbd.1 proofd.1 proofserv.1 rlibmap.1 @@ -260,7 +259,7 @@ post-patch: s|auxlibs=\"PTHREAD-LIBS|auxlibs=\"${PTHREAD_LIBS}|' \ ${WRKSRC}/config/root-config.in @${REINPLACE_CMD} -e \ - 's|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/cint/lib/gl/setup \ ${WRKSRC}/cint/lib/xlib/setup \ diff --git a/devel/root/files/patch-asimage-Module.mk b/devel/root/files/patch-asimage-Module.mk index dc39ede59357..41908f0c1900 100644 --- a/devel/root/files/patch-asimage-Module.mk +++ b/devel/root/files/patch-asimage-Module.mk @@ -4,7 +4,7 @@ --with-ttf $$TTFINCDIR \ --with-afterbase=no \ --disable-glx \ -+ --x-libraries=$(X11BASE)/lib --x-includes=$(X11BASE)/include \ ++ --x-libraries=$(LOCALBASE)/lib --x-includes=$(LOCALBASE)/include \ $$MMX \ $(ASTEPDBG) \ --with-builtin-ungif \ |