diff options
-rw-r--r-- | deskutils/etoile-menuserver/Makefile | 4 | ||||
-rw-r--r-- | graphics/gd/Makefile | 14 | ||||
-rw-r--r-- | graphics/gimageview/Makefile | 2 | ||||
-rw-r--r-- | graphics/gtkdps/Makefile | 4 | ||||
-rw-r--r-- | graphics/ruby-gd/Makefile | 4 | ||||
-rw-r--r-- | mail/faces/Makefile | 4 | ||||
-rw-r--r-- | multimedia/etoile-multimediakit/Makefile | 4 | ||||
-rw-r--r-- | net-im/licq-qt-gui/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/gnustep-back/Makefile | 6 | ||||
-rw-r--r-- | x11-toolkits/gnustep-gui/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/lesstif/Makefile | 2 | ||||
-rw-r--r-- | x11/etoile-xwindowserverkit/Makefile | 4 |
12 files changed, 27 insertions, 27 deletions
diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile index cb67073355ea..86d2520dd853 100644 --- a/deskutils/etoile-menuserver/Makefile +++ b/deskutils/etoile-menuserver/Makefile @@ -29,8 +29,8 @@ USE_GNUSTEP_SYSTEM_LIBS+= WorkspaceCommKit:${ETOILE_SYSTEM_PORT} SNAPSHOT= 20061221 WRKSRC= ${WRKDIR}/Etoile/ USE_GNUSTEP_MAKE_DIRS+= Services/Private/MenuServer -ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include -ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib +ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include +ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit ETOILE_SYSTEM_PORT?= sysutils/etoile-system diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 16c635d6a382..faaafd6a967e 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -43,17 +43,17 @@ OPTIONS= X11 "X11 support" off \ .if defined(WITH_XPM) USE_XORG= xpm x11 -CPPFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM -LDFLAGS+= -L${X11BASE}/lib -lXpm -lX11 -LDFLAGS2+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include -DHAVE_LIBXPM +LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lX11 +LDFLAGS2+= -L${LOCALBASE}/lib FEATURES+= GD_XPM .endif .if defined(WITH_FONTCONFIG) LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CPPFLAGS+= -I${X11BASE}/include -DHAVE_LIBFONTCONFIG -DHAVE_PTHREAD ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${X11BASE}/lib -lfontconfig -LDFLAGS2+= ${PTHREAD_LIBS} -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBFONTCONFIG -DHAVE_PTHREAD ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lfontconfig +LDFLAGS2+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib FEATURES+= GD_FONTCONFIG .endif @@ -70,7 +70,7 @@ USE_PERL5_BUILD= yes SCRIPTS_ENV+= GD_FONTS="${GD_FONTS}" .endif -FONTBASE= ${X11BASE}/lib/X11/fonts +FONTBASE= ${LOCALBASE}/lib/X11/fonts pre-extract:: @${ECHO_MSG} "" diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 848c07fed52c..7fdfd2518ccf 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -58,7 +58,7 @@ WITH_LIBMNG= yes WITH_LIBWMF= yes .endif -.if exists(${X11BASE}/lib/librsvg.so.1) +.if exists(${LOCALBASE}/lib/librsvg.so.1) WITH_LIBRSVG= yes .endif diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index 56499466d9ea..663e9e79969d 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -23,8 +23,8 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \ - --with-dps-libraries=${X11BASE}/lib +CONFIGURE_ARGS= --with-dps-includes=${LOCALBASE}/include \ + --with-dps-libraries=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index 682cab9434b4..4eb1fb5e3633 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -46,7 +46,7 @@ WITH_X11_CHECK= # empty .if !empty(WITH_X11_CHECK) USE_XORG= xpm x11 PKGNAMESUFFIX_XPM= +xpm -CONFIGURE_ARGS+= --with-X11-dir="${X11BASE}" --with-xpm +CONFIGURE_ARGS+= --with-X11-dir="${LOCALBASE}" --with-xpm .endif EXAMPLES_EN= example.rb \ @@ -63,7 +63,7 @@ DOCS_JA= readme.ja \ doc/INSTALL.ja post-patch: - ${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${X11BASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb + ${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${LOCALBASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb .if defined(WITH_GD1) ${RUBY} -i -pe 'sub %r:%%GD%%:, "gd1"' ${WRKSRC}/extconf.rb .else diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 5c8b7f53b71d..fde289fc2d1d 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -52,7 +52,7 @@ CONFIGURE_ARGS+=--disable-nls .endif .ifdef WITH_NAS - CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${X11BASE}/bin/auplay + CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${LOCALBASE}/bin/auplay RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas .elifdef WITH_SOX CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${LOCALBASE}/bin/play @@ -103,7 +103,7 @@ do-install: .if !defined(WITHOUT_X11) ${INSTALL_PROGRAM} ${WRKSRC}/faces/faces ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/faces/faces.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/faces/Faces.ad ${X11BASE}/lib/X11/app-defaults/Faces + ${INSTALL_DATA} ${WRKSRC}/faces/Faces.ad ${LOCALBASE}/lib/X11/app-defaults/Faces .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/multimedia/etoile-multimediakit/Makefile b/multimedia/etoile-multimediakit/Makefile index a24f99942949..48be82286a15 100644 --- a/multimedia/etoile-multimediakit/Makefile +++ b/multimedia/etoile-multimediakit/Makefile @@ -31,8 +31,8 @@ USE_XORG= x11 SNAPSHOT= 20061221 WRKSRC= ${WRKDIR}/Etoile/ USE_GNUSTEP_MAKE_DIRS+= Frameworks/MultimediaKit -ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include -ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib +ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include +ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib GNUSTEP_MPLAYER_PORT?= multimedia/gnustep-mplayer diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index 80b8222d2c6e..7b82f44114e1 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -48,7 +48,7 @@ post-patch: post-install: # ${RM} -rf ${PREFIX}/share/licq/qt-gui/locale -.if exists(${X11BASE}/bin/XFree86) +.if exists(${LOCALBASE}/bin/XFree86) @${CAT} ${PKGMESSAGE} .endif diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index 96efec986deb..392b30e1349d 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -37,7 +37,7 @@ USE_XORG= xft xrender xmu xext x11 USE_FREETYPE= yes RESTRICTED= GPL3 -MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${X11BASE}/include" +MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${LOCALBASE}/include" BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} BREAKS_IF_PEDANTIC= yes @@ -51,8 +51,8 @@ PLIST_SUB+= BACK=xdps-${BACKVERSION} PLIST_SUB+= USE_XLIB="@comment " BACK_SUFFIX?= -xdps CONFLICTS?= gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.* -ADDITIONAL_INCLUDE_DIRS+= -I${X11BASE}/include -ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib +ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include +ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib .elif defined(WITH_GNUSTEP_LIBART) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl CONFIGURE_ARGS+= --enable-graphics=art --with-name=art diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index e72fd5cf9e3f..1f24059f1bc7 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --with-x-include=${X11BASE}/include -CONFIGURE_ARGS+= --with-x-include=${X11BASE}/lib +CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include +CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib USE_GNUSTEP= yes USE_GNUSTEP_PREFIX= yes USE_GNUSTEP_CONFIGURE= yes diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index 673fa8e24eb3..efd229367af6 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -27,7 +27,7 @@ USE_LDCONFIG= yes LIBTOOLFILES= aclocal.m4 test/aclocal.m4 CONFIGURE_ARGS+= --enable-static --enable-shared --enable-production CONFIGURE_ARGS+= --disable-maintainer-mode -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include MAN1 = lesstif.1 ltversion.1 mwm.1 uil.1 xmbind.1 diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile index 5303ab399bb8..3e3bc7f64ec1 100644 --- a/x11/etoile-xwindowserverkit/Makefile +++ b/x11/etoile-xwindowserverkit/Makefile @@ -28,8 +28,8 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} SNAPSHOT= 20061221 WRKSRC= ${WRKDIR}/Etoile/ USE_GNUSTEP_MAKE_DIRS+= Frameworks/XWindowServerKit -ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include -ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib +ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include +ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}" .include <bsd.port.mk> |