summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/gcompris/Makefile4
-rw-r--r--security/nss/Makefile4
-rw-r--r--www/mozilla/Makefile.common14
-rw-r--r--x11-wm/sawfish/Makefile4
-rw-r--r--x11/xscreensaver-gnome/Makefile4
-rw-r--r--x11/xscreensaver-gnome/pkg-plist2
6 files changed, 16 insertions, 16 deletions
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 4d3116a93..e31a2076b 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -44,7 +44,7 @@ INFO= gcompris
.if !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+ ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
.if !defined(PACKAGE_BUILDING)
CONFIGURE_ENV+= DISPLAY="localhost:1001"
.endif
@@ -62,7 +62,7 @@ pre-configure:
${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
${RM} -f ${WRKDIR}/.Xvfb.pid ; \
fi
- ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
post-configure:
diff --git a/security/nss/Makefile b/security/nss/Makefile
index a9c78b28c..c11bbb4e1 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/nss/Makefile,v 1.8 2007/07/05 16:50:41 ahze Exp $
+# $MCom: ports/security/nss/Makefile,v 1.9 2007/07/10 14:55:03 ahze Exp $
PORTNAME= nss
DISTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}-1
@@ -68,7 +68,7 @@ test:
post-patch:
@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g ; \
- s|/usr/X11R6|${X11BASE}|g" \
+ s|/usr/X11R6|${LOCALBASE}|g" \
${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
@${SED} -e 's|@exec_prefix@|${PREFIX}|; \
s|@includedir@|${PREFIX}/include/nss|; \
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 31c09bf6f..35c331b6b 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile.common,v 1.47 2007/07/05 17:01:49 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.48 2007/07/30 20:44:28 mezz Exp $
#
# This file contains some reusable components for mozilla ports. It's of
@@ -142,8 +142,8 @@ MOZ_OPTIONS+= --enable-crypto \
--enable-xft \
--with-pthreads
# Configure options for install
-MOZ_OPTIONS+= --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
+MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \
+ --x-libraries=${LOCALBASE}/lib
.if !defined(MOZ_EXTENSIONS)
MOZ_OPTIONS+= --enable-extensions=default
.else
@@ -224,7 +224,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \
-e 's|@CFLAGS@|${CFLAGS}|g' \
-e 's|@LDFLAGS@|${LDFLAGS}|g' \
-e 's|@LIBS@|${LIBS}|g' \
- -e 's|@X11BASE@|${X11BASE}|g' \
+ -e 's|@X11BASE@|${LOCALBASE}|g' \
-e 's|@LOCALBASE@|${LOCALBASE}|g' \
-e 's|@FAKEDIR@|${FAKEDIR}|g' \
-e 's|@PERL@|${PERL5}|g' \
@@ -234,7 +234,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \
-e 's|%%CFLAGS%%|${CFLAGS}|g' \
-e 's|%%LDFLAGS%%|${LDFLAGS}|g' \
-e 's|%%LIBS%%|${LIBS}|g' \
- -e 's|%%X11BASE%%|${X11BASE}|g' \
+ -e 's|%%X11BASE%%|${LOCALBASE}|g' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-e 's|%%FAKEDIR%%|${FAKEDIR}|g' \
-e 's|%%PERL%%|${PERL5}|g' \
@@ -288,7 +288,7 @@ gecko-post-patch:
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
- s|echo aout|echo elf|g ; s|/usr/X11R6|${X11BASE}|g' \
+ s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
@if [ -d ${WRKSRC}/directory/c-sdk ]; then \
@@ -299,7 +299,7 @@ gecko-post-patch:
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
s|echo aout|echo elf|g ; \
- s|/usr/X11R6|${X11BASE}|g' \
+ s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index e1e44729b..ba7231139 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,7 +3,7 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11-wm/sawfish/Makefile,v 1.3 2007/08/07 04:43:15 mezz Exp $
#
PORTNAME= sawfish
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-readline \
--enable-capplet \
--disable-themer \
--with-esd
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index f2bbfbd63..2d63a2ae6 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.4 2007/08/07 03:52:33 mezz Exp $
#
PORTNAME?= xscreensaver-gnome
@@ -97,7 +97,7 @@ post-patch:
@${REINPLACE_CMD} -e 's| ||' \
${WRKSRC}/hacks/glx/klein.c
@${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g ; \
- s|/usr/X11R6|${X11BASE}|g' \
+ s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|<util.h>|<libutil.h>|' \
${WRKSRC}/hacks/phosphor.c ${WRKSRC}/hacks/apple2-main.c
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index d6446c2c6..2113c319c 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -452,5 +452,5 @@ share/xscreensaver/config/zoom.xml
@dirrm share/xscreensaver/glade
@dirrm share/xscreensaver
@dirrm bin/xscreensaver-hacks
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
lib/X11/app-defaults/XScreenSaver
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 02:34:54 +0800