mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

s/X11BASE/LOCALBASE/, or equivalent.

Browse Source 
The X11BASE variable is long gone, however these ports were not updated.
This commit is contained in:
Doug Barton 2012-06-24 21:53:38 +00:00
parent dfd4a6d526
commit 44fa804810
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=299908
28 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/scripts/mkptools/mkpextr
View File

@ -102,7 +102,7 @@ sub writemk {
"gtk12.2:\${PORTSDIR}/x11-toolkits/gtk12");
$tmp{"GTK_CONFIG"} =
"\${X11BASE}/bin/gtk12-config";
"\${LOCALBASE}/bin/gtk12-config";
appendvar("CONFIGURE_ENV",
"GTK_CONFIG=\"\${GTK_CONFIG}\"");

2
astro/xephem/Makefile
View File

@ -48,7 +48,7 @@ pre-fetch:
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-e 's|/usr/X11R6|${X11BASE}|g' \
-e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/Makefile
@${FIND} ${WRKSRC}/../.. -name Makefile -type f | \
${XARGS} ${REINPLACE_CMD} -e 's|CC =|CC?=|g ; \

2
astro/xmoontool/files/patch-Makefile
View File

@ -2,7 +2,7 @@
+++ ./Makefile Fri Mar 24 10:55:01 2006
@@ -8,9 +8,9 @@
LOCALBASE?= /usr/local
X11BASE?= /usr/X11R6
X11BASE?= /usr/local
-CC= gcc
-CFLAGS= -O2 -Wall

2
audio/timidity++-motif/Makefile
View File

@ -16,7 +16,7 @@ PLIST_FILES= bin/xmmidi ${TIMID_LIBDIR}/interface_m.so
post-configure:
@${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig
@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
-e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \
${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile

2
biology/njplot/files/patch-makefile
View File

@ -54,7 +54,7 @@
- -L$(MOTIFLIB) -lXm \
- -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
+ $(MOTIFLIB) \
+ -L$(X11BASE)/lib -lXmu -lXt -lX11 -lm
+ -L$(LOCALBASE)/lib -lXmu -lXt -lX11 -lm
unrooted : $(OBJUNROOTED)
$(CC) -g -o unrooted $(OBJUNROOTED) \

2
databases/qt4-pgsql-plugin/files/Makefile.bsd
View File

@ -5,7 +5,7 @@ CXXFLAGS+= -I${DRIVER} \
-I${QT_INCDIR} \
-I${QT_INCDIR}/Qt \
-I${LOCALBASE}/include/postgresql/server \
-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
-D_LARGEFILE_SOURCE -DQT_SHARED

2
devel/plan9port/Makefile
View File

@ -101,7 +101,7 @@ EMPTY_DIRS= plan9/log \
post-patch:
@${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \
| ${XARGS} ${REINPLACE_CMD} -e 's|\\\*9|${PLAN9}|'
@${REINPLACE_CMD} -e 's|X11=/usr/X11R6|X11=${X11BASE}|' \
@${REINPLACE_CMD} -e 's|X11=/usr/X11R6|X11=${LOCALBASE}|' \
${WRKSRC}/bin/9l ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh
@${REINPLACE_CMD} -e 's|/lib/font/bit|${PLAN9}/font|' \
${WRKSRC}/src/cmd/acme/acme.c

2
finance/wmstock/files/patch-ab
View File

@ -13,7 +13,7 @@
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+X11BASE ?= /usr/X11R6
+X11BASE ?= ${LOCALBASE}
+INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
+DESTDIR= ${PREFIX}
+LIBDIR = -L${LOCALBASE}/lib

2
ftp/wmget/files/patch-Makefile
View File

@ -4,7 +4,7 @@
# To specify a different prefix, you can override this on the command line
# make PREFIX=/opt/dockapps install
-PREFIX= /usr/local
+X11BASE?= /usr/X11R6
+X11BASE?= ${LOCALBASE}
+PREFIX?= ${LOCALBASE}
INSTALLDIR= install -d -m 755

2
games/demonquake/files/patch-Makefile
View File

@ -47,7 +47,7 @@
-GAMEBASE= /usr/local
-X11BASE=/usr/X11R6
+LOCALBASE?=/usr/local
+X11BASE?=/usr/X11R6
+X11BASE?=/usr/local
SYSBINDIR=$(LOCALBASE)/bin
-DATADIR= $(GAMEBASE)/games/quake
-

2
games/q2p/files/patch-Makefile
View File

@ -139,7 +139,7 @@
-LOCALBASE= /usr/local
-GAMEBASE= /usr/local
-SYSBINDIR=$(LOCALBASE)/bin
+X11BASE?= /usr/X11R6
+X11BASE?= /usr/local
+LOCALBASE?= /usr/local
+GAMEBASE?= $(PREFIX)
+SYSBINDIR?= $(PREFIX)/bin

4
games/qix/pkg-deinstall
View File

@ -3,7 +3,7 @@
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
X11BASE=/usr/X11R6
X11BASE=/usr/local
FONTDIR=$X11BASE/lib/X11/fonts/local
ALIAS=$FONTDIR/fonts.alias
@ -15,4 +15,4 @@ $X11BASE/bin/mkfontdir $FONTDIR
if [ `ls -l $FONTDIR/fonts.dir|awk '{print $5}'` = 2 ]; then
rm $FONTDIR/fonts.dir
fi
exit 0
exit 0

2
games/qix/pkg-install
View File

@ -4,7 +4,7 @@ if [ "$2" != POST-INSTALL ] ; then
exit 0
fi
X11BASE=/usr/X11R6
X11BASE=/usr/local
FONTDIR=$X11BASE/lib/X11/fonts/local
mkdir -p $X11BASE/share/qix

2
games/tremor/files/patch-Makefile
View File

@ -76,7 +76,7 @@
ifeq ($(strip $(STRIP)),YES)
@@ -102,12 +90,11 @@
X_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \
X_LDFLAGS=-L$(LOCALBASE)/lib$(ARCH_LIBDIR) \
-lX11 -lXext -lXxf86vm -lXxf86dga
-GLX_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \
- -L$(LOCALBASE)/lib$(ARCH_LIBDIR) \

2
japanese/navi2ch-emacs21/Makefile
View File

@ -11,7 +11,7 @@ USE_EMACS= yes
EMACS_PORT_NAME= emacs21
.if !defined(WITHOUT_X11)
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts
.endif
.include "${MASTERDIR}/Makefile"

4
print/ghostscript7/Makefile
View File

@ -128,8 +128,8 @@ LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
. endif
USE_XORG= xt xext
CONFIGURE_ARGS+=--with-x \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
--x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib
CONFLICTS_INSTALL+= ghostscript7-nox11-[0-9]*
.else
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11

4
print/ghostscript8/files/Makefile.drivers_post
View File

@ -76,8 +76,8 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NGS_${D}}
.if defined(_X11_DEVS)
USE_XORG= xt xext
CONFIGURE_ARGS+=--with-x \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
--x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib
CONFLICTS_INSTALL+= ghostscript8-nox11-[0-9]*
.if ${PORT_OPTIONS:MGTK2}
USE_GNOME= atk gdkpixbuf2 glib20 gtk20

2
print/ghostscript8/files/patch-base-devs.mak
View File

@ -18,7 +18,7 @@
$(GLOBJ)X11.so : $(x11alt_) $(x11_)
- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(X11BASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
###### --------------- Memory-buffered printer devices --------------- ######

4
print/ghostscript9/files/Makefile.drivers_post
View File

@ -77,8 +77,8 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NGS_${D}}
USE_XORG= xt xext
X11BITS= ""
CONFIGURE_ARGS+=--with-x \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
--x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib
CONFLICTS_INSTALL+= ghostscript9-nox11-[0-9]*
.if ${PORT_OPTIONS:MGTK2}
USE_GNOME= atk gdkpixbuf2 glib20 gtk20

2
print/ghostscript9/files/patch-base-devs.mak
View File

@ -18,7 +18,7 @@
$(GLOBJ)X11.so : $(x11alt_) $(x11_)
- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(X11BASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
###### --------------- Memory-buffered printer devices --------------- ######

10
science/afni/files/Makefile.FreeBSD_PORT
View File

@ -63,15 +63,15 @@ CCD = ${CC} ${CCDEBS}
CCSVD = ${CC} -O0
CCOLD = ${CC}
IFLAGS = -I. -I${X11BASE}/include -I${LOCALBASE}/include
LFLAGS = -s -L. -L${X11BASE}/lib -L${LOCALBASE}/lib
IFLAGS = -I. -I${LOCALBASE}/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 -L${LOCALBASE}/lib
PLFLAGS = -s -rdynamic -L. -L${LOCALBASE}/lib
AR = /usr/bin/ar
RANLIB = /usr/bin/ranlib
@ -95,8 +95,8 @@ LLIBS = -lmri -lf2c -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${LOCALBASE}/include -I./ -I../ -I../niml/ -Igts/src
SUMA_LINK_PATH = -L/usr/lib -L${X11BASE}/lib -L${LOCALBASE}/lib -L../
SUMA_INCLUDE_PATH = -I${LOCALBASE}/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)

2
textproc/kmflcomp/Makefile
View File

@ -39,7 +39,7 @@ SUB_FILES= pkg-message
post-patch:
@${REINPLACE_CMD} -e 's|^install-data-am: install-kmflcompdocDATA|install-data-am:|' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib|-L${X11BASE}/lib|' \
@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib|-L${LOCALBASE}/lib|' \
${WRKSRC}/kmfl_compiler/Makefile.in
@${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.9",' \
${WRKSRC}/kmfl_compiler/kmfl_compiler.c

4
www/linux-mplayer-plugin/Makefile.npapi
View File

@ -129,9 +129,7 @@ USE_NPAPI_EXP+= ${_TEMP_APP__}
.endfor
NPAPI_APPS?= ${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*} \
${USE_NPAPI_EXP:S.^.${X11BASE}/lib/.:S.$./plugins.:N*opera*} \
${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M*/opera*} \
${USE_NPAPI_EXP:S.^.${X11BASE}/share/.:S.$./plugins.:M*/opera*}
${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M*/opera*}
NPAPI_SLDIRS_ALL= ${NPAPI_APPS_ALL:S.^.${NPAPI_SLDIR}/.}
NPAPI_SLDIRS= ${USE_NPAPI_EXP:S.^.${NPAPI_SLDIR}/.}
NPAPI_LINKFARMS= ${NPAPI_APPS} ${NPAPI_SLDIRS}

14
www/linuxpluginwrapper/Makefile
View File

@ -29,7 +29,7 @@ IGNORE= doesn't support ELF symbol versioning, yet.
# I will remove WITH_PLUGINS knob.
.if defined(WITH_REALPLAYER)
RUN_DEPENDS+= ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
RUN_DEPENDS+= ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
WITH_PLUGINS= 1
.endif
@ -53,7 +53,7 @@ CFLAGS+= -DDEBUG=1
post-build:
@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
-e 's,%%LOCALBASE%%,${LOCALBASE},' \
-e 's,%%X11BASE%%,${X11BASE},' \
-e 's,%%X11BASE%%,${LOCALBASE},' \
-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \
-e 's,%%LIBMAPCONF%%,${LIBMAPCONF},' \
< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
@ -63,12 +63,12 @@ post-build:
.if defined(WITH_PLUGINS)
pre-install:
@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
@${MKDIR} ${LOCALBASE}/lib/browser_linux_plugins
.if defined(WITH_REALPLAYER)
@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
${X11BASE}/lib/browser_linux_plugins/
@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
${X11BASE}/lib/browser_linux_plugins/
@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so \
${LOCALBASE}/lib/browser_linux_plugins/
@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.xpt \
${LOCALBASE}/lib/browser_linux_plugins/
.endif
.endif

12
www/linuxpluginwrapper/pkg-plist
View File

@ -12,11 +12,11 @@ lib/pluginwrapper/realplayer.so
%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
@unexec /bin/rm -f %%X11BASE%%/lib/browser_linux_plugins/nphelix.so
@unexec /bin/rm -f %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
@unexec /bin/rmdir %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
@exec /bin/mkdir -p %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so %%X11BASE%%/lib/browser_linux_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt %%X11BASE%%/lib/browser_linux_plugins/
@unexec /bin/rm -f %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.so
@unexec /bin/rm -f %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.xpt
@unexec /bin/rmdir %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null || true
@exec /bin/mkdir -p %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null || true
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so %%LOCALBASE%%/lib/browser_linux_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt %%LOCALBASE%%/lib/browser_linux_plugins/
@dirrm lib/pluginwrapper
@dirrm %%EXAMPLESDIR%%

2
x11-fm/ezfm/files/patch-aa
View File

@ -6,7 +6,7 @@
#
-DEST_DIR=/usr/local
+LOCALBASE?=/usr/local
+X11BASE?=/usr/X11R6
+X11BASE?=/usr/local
+PREFIX?=${LOCALBASE}
+DEST_DIR=${PREFIX}
#

4
x11-fonts/code2000/pkg-plist
View File

@ -3,7 +3,7 @@
%%FONTSDIR%%/code2000.ttf
%%FONTSDIR%%/fonts.dir
%%FONTSDIR%%/fonts.scale
@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
@unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true
@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || true
@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || true
@dirrm %%FONTSDIR%%

2
x11-fonts/moveable-type-fonts/pkg-plist
View File

@ -25,4 +25,4 @@
%%FONTSDIR%%/raleway_thin.ttf
@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
@dirrm %%FONTSDIR%%
@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true