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 /science/afni | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | freebsd-ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'science/afni')
| -rw-r--r-- | science/afni/Makefile | 2 | ||||
| -rw-r--r-- | science/afni/files/Makefile.FreeBSD_PORT | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/science/afni/Makefile b/science/afni/Makefile index d1fef2283320..435110c25e54 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -74,7 +74,7 @@ X11R6_FILES= coxplot/Makefile \ post-extract: @${CP} -f ${FILESDIR}/Makefile.FreeBSD_PORT ${WRKSRC} .for f in ${X11R6_FILES} - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/${f} + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} -e 's|AFNI_2007_05_29_1644|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h @${CP} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${WRKDIR} diff --git a/science/afni/files/Makefile.FreeBSD_PORT b/science/afni/files/Makefile.FreeBSD_PORT index fbd29dd9a198..55f96ce90860 100644 --- a/science/afni/files/Makefile.FreeBSD_PORT +++ b/science/afni/files/Makefile.FreeBSD_PORT @@ -62,15 +62,15 @@ CCMIN = ${CC} CCD = ${CC} ${CCDEBS} CCSVD = ${CC} -O0 -IFLAGS = -I. -I${X11BASE}/include -I/usr/local/include -LFLAGS = -s -L. -L${X11BASE}/lib +IFLAGS = -I. -I${LOCALBASE}/include -I/usr/local/include +LFLAGS = -s -L. -L${LOCALBASE}/lib MAKE = gmake PLUGIN_SUFFIX = so PLUGIN_LFLAGS = -shared PLUGIN_CC = ${CC} -PLFLAGS = -s -rdynamic -L. -L${X11BASE}/lib +PLFLAGS = -s -rdynamic -L. -L${LOCALBASE}/lib AR = /usr/bin/ar RANLIB = /usr/bin/ranlib @@ -94,8 +94,8 @@ LLIBS = -lmri -lXm -lXp -lXpm -lXext -lXmu -lXt -lX11 -lm $(LZLIB) # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv # For suma (NO STATIC LINKING OF GL libs) -SUMA_INCLUDE_PATH = -I${X11BASE}/include -I/usr/local/include -I./ -I../ -I../niml/ -Igts/src -SUMA_LINK_PATH = -L/usr/lib -L${X11BASE}/lib -L../ +SUMA_INCLUDE_PATH = -I${LOCALBASE}/include -I/usr/local/include -I./ -I../ -I../niml/ -Igts/src +SUMA_LINK_PATH = -L/usr/lib -L${LOCALBASE}/lib -L../ #use -lGLw if you have libGLw.a or libGLw.so* or # -lMesaGLw if you have Mesa's version (libMesaGLw*) of libGLw SUMA_LINK_LIB = -lXm -lGLw -lGLU -lGL -lXmu -lXp -lXt -lXext -lX11 -lm $(LZLIB) |