diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz | |
- 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)
3056 files changed, 6226 insertions, 7056 deletions
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk index 78a62e7..7b4162d 100644 --- a/Mk/bsd.efl.mk +++ b/Mk/bsd.efl.mk @@ -512,9 +512,9 @@ LIB_DEPENDS+= ${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY} # # Initialize configure enviropment # -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH} diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index 3ea9c02..644fd65 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -517,7 +517,7 @@ TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V TARGLIB) .for i in ${USE_GNUSTEP_LDCONFIG} LDCONFIG_DIRS+= ${i} .endfor -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .endif # eof diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 2b1e49f..b97852c 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -59,7 +59,7 @@ CATEGORIES+=ipv6 .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --disable-as-needed .endif @@ -83,7 +83,7 @@ IGNORE= cannot install: unsupported value in USE_KDELIBS_VER .if ${USE_QT_VER} == CVS KDE_CVS_PREFIX?= ${LOCALBASE}/kde-cvs -QT_CVS_PREFIX?= ${X11BASE}/qt-cvs +QT_CVS_PREFIX?= ${LOCALBASE}/qt-cvs QTCPPFLAGS?= QTCFGLIBS?= @@ -110,14 +110,14 @@ QTCPPFLAGS?= QTCGFLIBS?= # Qt 3.x common stuff -QT_PREFIX?= ${X11BASE} +QT_PREFIX?= ${LOCALBASE} MOC?= ${QT_PREFIX}/bin/moc #LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -D_GETOPT_H -QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ +QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if defined(PACKAGE_BUILDING) TMPDIR?= /tmp diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 2b1e49f..b97852c 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -59,7 +59,7 @@ CATEGORIES+=ipv6 .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --disable-as-needed .endif @@ -83,7 +83,7 @@ IGNORE= cannot install: unsupported value in USE_KDELIBS_VER .if ${USE_QT_VER} == CVS KDE_CVS_PREFIX?= ${LOCALBASE}/kde-cvs -QT_CVS_PREFIX?= ${X11BASE}/qt-cvs +QT_CVS_PREFIX?= ${LOCALBASE}/qt-cvs QTCPPFLAGS?= QTCFGLIBS?= @@ -110,14 +110,14 @@ QTCPPFLAGS?= QTCGFLIBS?= # Qt 3.x common stuff -QT_PREFIX?= ${X11BASE} +QT_PREFIX?= ${LOCALBASE} MOC?= ${QT_PREFIX}/bin/moc #LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -D_GETOPT_H -QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ +QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if defined(PACKAGE_BUILDING) TMPDIR?= /tmp diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk index 4d9a8fb..5ae0e7a 100644 --- a/Mk/bsd.ocaml.mk +++ b/Mk/bsd.ocaml.mk @@ -1,7 +1,7 @@ # ex:ts=4 # # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $ -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.1 2007-03-14 04:05:25 linimon Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.2 2008-04-19 17:46:02 miwi Exp $ # # bsd.ocaml.mk - Support for the Objective Caml language packages # @@ -177,7 +177,7 @@ ocaml-wash: # .if !target(add-plist-post) add-plist-post: -. if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && \ +. if (${PREFIX} != ${LOCALBASE} && \ ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} . else diff --git a/Mk/bsd.scons.mk b/Mk/bsd.scons.mk index ec31d9c..86e9cfd 100644 --- a/Mk/bsd.scons.mk +++ b/Mk/bsd.scons.mk @@ -37,8 +37,8 @@ SCONS_PORT= ${PORTSDIR}/devel/scons CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig -LIBPATH?= ${LOCALBASE}/lib ${X11BASE}/lib -CPPPATH?= ${LOCALBASE}/include ${X11BASE}/include +LIBPATH?= ${LOCALBASE}/lib +CPPPATH?= ${LOCALBASE}/include # # SCONS_ENV is where we pass all the stuff that should be the diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index c2d799c..e393f0f 100644 --- a/Mk/bsd.wx.mk +++ b/Mk/bsd.wx.mk @@ -48,7 +48,7 @@ # It determines the type of parameters that have to be passed # to the configure script. In the first case it adds # "--with-wx-config=${WX_CONFIG}" (absolute path of -# WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus +# WX_CONFIG), and in second one "--with-wx=${LOCALBASE}" plus # "--with-wx-config=${WX_CONFIG:T} (prefix and name). # WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION # after <bsd.port.pre.mk> (in case the port needs to manually run @@ -189,7 +189,7 @@ _WX_COMP= ${comp} . for ver in ${_WX_VERS_ALL} . if defined(_WX_LIB_${comp}_${ver}) _WX_SHVER_${comp}_${ver}= 0 -_WX_FILE_${comp}_${ver}= ${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}} +_WX_FILE_${comp}_${ver}= ${LOCALBASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}} . endif . if ${_WX_COMP} == "python" _WX_DEPTYPE_${comp}_${ver}= run @@ -494,8 +494,8 @@ _WX_VER= ${ver} # Set variables. # -WX_CONFIG?= ${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config -WXRC_CMD?= ${X11BASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} +WX_CONFIG?= ${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config +WXRC_CMD?= ${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} WX_VERSION?= ${_WX_VER} .endif # _WX_Need_Version @@ -586,7 +586,7 @@ CONFIGURE_ENV+= WX_CONFIG=${WX_CONFIG} . if ${WX_CONF_ARGS:L} == "absolute" CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG} . elif ${WX_CONF_ARGS:L} == "relative" -CONFIGURE_ARGS+= --with-wx=${X11BASE} \ +CONFIGURE_ARGS+= --with-wx=${LOCALBASE} \ --with-wx-config=${WX_CONFIG:T} . else IGNORE?= selected an invalid wxWidgets configure argument type: ${WX_CONF_ARGS} diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index df185e7..973ae8e 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -32,7 +32,6 @@ Xorg_Pre_Include= bsd.xorg.mk .if !defined(USE_TGZ) USE_BZIP2= yes .endif -PREFIX?= ${X11BASE} GNU_CONFIGURE= yes DIST_SUBDIR= xorg/${XORG_CAT} @@ -74,7 +73,7 @@ INSTALLS_TTF?= yes . elif ${PORTNAME:M*encodings*}x != x # This is terrific, we want mkfontscale at build time, but don't use it like for the other ports. NEED_MKFONTFOO= no -BUILD_DEPENDS+= ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale INSTALLS_TTF?= no . else INSTALLS_TTF?= no @@ -85,17 +84,17 @@ USE_GNOME+= gnomehack NEED_MKFONTFOO= no . elif ${INSTALLS_TTF} == "yes" USE_GNOME+= pkgconfig -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig . else -BUILD_DEPENDS+= ${X11BASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +BUILD_DEPENDS+= ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf . endif . if ${NEED_MKFONTFOO} == "yes" -BUILD_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -RUN_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale . endif post-install: @@ -133,7 +132,7 @@ USE_GNOME+= gnomehack DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USE_GNOME+= gnomehack -CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/share/X11/xkb +CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb . endif .endif @@ -149,85 +148,85 @@ Xorg_Post_Include= bsd.xorg.mk XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm -bigreqsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto -compositeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto -damageproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto -dmx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx -dmxproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto -evieproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext -fixesproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto -fontcacheproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto -fontenc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc -fontsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto -fontutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util -glproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto -ice_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE -inputproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto -kbproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto -libfs_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS -oldx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX -pixman_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman -printproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto -randrproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto -recordproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto -renderproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto -resourceproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto -scrnsaverproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto -sm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM -trapproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto -videoproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto -x11_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 -xau_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau +bigreqsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto +compositeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto +damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto +dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx +dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto +evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext +fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto +fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto +fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc +fontsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto +fontutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util +glproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto +ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE +inputproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto +kbproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto +libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS +oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX +pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman +printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto +randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto +recordproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto +renderproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto +resourceproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto +scrnsaverproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto +sm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM +trapproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto +videoproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto +x11_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 +xau_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau xaw_LIB_PC_DEPENDS= ${xaw${XAWVER}_LIB_PC_DEPENDS} -xaw6_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw -xaw7_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw -xaw8_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw -xbitmaps_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps -xcmiscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto -xcomposite_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite -xcursor_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor -xdamage_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage -xdmcp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp -xevie_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie -xext_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext -xextproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto -xf86bigfontproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto -xf86dgaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto -xf86driproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto -xf86miscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto -xf86rushproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto -xf86vidmodeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto -xfixes_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes -xfont_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont -xfontcache_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache -xft_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft -xi_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi -xinerama_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama -xineramaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto -xkbfile_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile -xkbui_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui -xmu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu -xmuu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu -xorg-server_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server -xp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp -xpm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm -xprintapputil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil -xprintutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil -xproto_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto -xproxymngproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol -xrandr_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr -xrender_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender -xres_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres -xscrnsaver_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver -xt_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt -xtrans_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans -xtrap_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap -xtst_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst -xv_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv -xvmc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC -xxf86dga_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga -xxf86misc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc -xxf86vm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm +xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw +xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw +xaw8_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw +xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps +xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto +xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite +xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor +xdamage_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage +xdmcp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp +xevie_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie +xext_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext +xextproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto +xf86bigfontproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto +xf86dgaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto +xf86driproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto +xf86miscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto +xf86rushproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto +xf86vidmodeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto +xfixes_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes +xfont_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont +xfontcache_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache +xft_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft +xi_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi +xinerama_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama +xineramaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto +xkbfile_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile +xkbui_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui +xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu +xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu +xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server +xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp +xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm +xprintapputil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil +xprintutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil +xproto_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto +xproxymngproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol +xrandr_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr +xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender +xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres +xscrnsaver_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver +xt_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt +xtrans_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans +xtrap_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap +xtst_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst +xv_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv +xvmc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC +xxf86dga_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga +xxf86misc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc +xxf86vm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm .for _module in ${USE_XORG:M*\:both:C/\:.*//g} . if ${XORG_MODULES:M${_module}} == "" diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 37821e5..e5fdf79 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -8,7 +8,7 @@ PORTNAME= at-spi PORTVERSION= 1.22.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,7 +25,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomehier intltool gail libbonobo \ intlhack -USE_XLIB= yes +USE_XORG= x11 xtst USE_PYTHON= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index 387d8c3..aef3a86 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -8,7 +8,7 @@ PORTNAME= dasher PORTVERSION= 4.7.3 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= accessibility editors x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,6 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \ libwnck gnomedocutils @@ -30,7 +29,6 @@ WANT_GNOME= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes -USE_GCC= 3.4+ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index c3bc70d..0fcd0f0 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -8,7 +8,7 @@ PORTNAME= gail PORTVERSION= 1.22.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes +USE_XORG= x11 xext USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index be0bfad..5acca7e 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-mag PORTVERSION= 0.14.10 +PORTREVISION= 1 CATEGORIES= accessibility gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen magnifier USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= xfixes xdamage ice xcomposite sm USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack USE_GMAKE= yes USE_GETTEXT= yes diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile index 83347ad..2b54c4f 100644 --- a/accessibility/gnopernicus/Makefile +++ b/accessibility/gnopernicus/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnopernicus PORTVERSION= 1.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= accessibility x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +21,6 @@ LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_LDCONFIG= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index 1bbcb88..cfd2536 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -8,6 +8,7 @@ PORTNAME= gok PORTVERSION= 1.3.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= accessibility sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -19,7 +20,6 @@ COMMENT= GNOME On-Screen Keyboard (GOK) USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \ gnomespeech diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile index aecec4c..3355de3 100644 --- a/accessibility/java-access-bridge/Makefile +++ b/accessibility/java-access-bridge/Makefile @@ -15,8 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome Java Accessibility Bridge -BUILD_DEPENDS= xprop:${X_CLIENTS_PORT} -RUN_DEPENDS= xprop:${X_CLIENTS_PORT} +BUILD_DEPENDS= xprop:${PORTSDIR}/x11/xprop +RUN_DEPENDS= xprop:${PORTSDIR}/x11/xprop USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile index 24dec2c..8186104 100644 --- a/accessibility/linux-atk/Makefile +++ b/accessibility/linux-atk/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= LIBVERSION="901.0" PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile index 24dec2c..8186104 100644 --- a/accessibility/linux-f10-atk/Makefile +++ b/accessibility/linux-f10-atk/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= LIBVERSION="901.0" PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile index 24dec2c..8186104 100644 --- a/accessibility/linux-f8-atk/Makefile +++ b/accessibility/linux-f8-atk/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= LIBVERSION="901.0" PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile index dd713e4..50bce96 100644 --- a/arabic/ae_fonts_mono/Makefile +++ b/arabic/ae_fonts_mono/Makefile @@ -7,18 +7,20 @@ PORTNAME= ae_fonts_mono PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= arabic -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= arabeyes DISTNAME= ae_fonts_mono MAINTAINER= sbahra@gwu.edu COMMENT= A collection of PCF fonts that include Arabic glyphs -BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 USE_BZIP2= yes do-build: @@ -30,7 +32,7 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/lib/X11/fonts/ae_fonts_mono post-install: - @${CAT} ${PKGMESSAGE} | ${SED} "s|X11BASE|${X11BASE}|g" \ + @${CAT} ${PKGMESSAGE} | ${SED} "s|LOCALBASE|${LOCALBASE}|g" \ | ${SED} "s|PORTNAME|${PORTNAME}|g" .include <bsd.port.mk> diff --git a/arabic/ae_fonts_mono/pkg-message b/arabic/ae_fonts_mono/pkg-message index e122b3d..28811cc 100644 --- a/arabic/ae_fonts_mono/pkg-message +++ b/arabic/ae_fonts_mono/pkg-message @@ -5,5 +5,5 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "X11BASE/lib/X11/fonts/PORTNAME" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME" ------------------------------------------------------------------ diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile index 1e225f2..3084969 100644 --- a/arabic/ae_fonts_ttf/Makefile +++ b/arabic/ae_fonts_ttf/Makefile @@ -9,7 +9,7 @@ PORTNAME= ae_fonts1_ttf PORTVERSION= 1.1 PORTREVISION= 2 CATEGORIES= arabic x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= arabeyes DISTNAME= ae_fonts1_ttf_${PORTVERSION} @@ -72,7 +72,7 @@ do-install: .endfor post-install: - @${CAT} ${PKGMESSAGE} | ${SED} "s|X11BASE|${X11BASE}|g" \ + @${CAT} ${PKGMESSAGE} | ${SED} "s|LOCALBASE|${LOCALBASE}|g" \ | ${SED} "s|PORTNAME|ae_fonts1|g" .include <bsd.port.mk> diff --git a/arabic/ae_fonts_ttf/pkg-message b/arabic/ae_fonts_ttf/pkg-message index 2b41375..5f95207 100644 --- a/arabic/ae_fonts_ttf/pkg-message +++ b/arabic/ae_fonts_ttf/pkg-message @@ -5,10 +5,10 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "X11BASE/lib/X11/fonts/PORTNAME/AAHS" - FontPath "X11BASE/lib/X11/fonts/PORTNAME/AGA" - FontPath "X11BASE/lib/X11/fonts/PORTNAME/FS" - FontPath "X11BASE/lib/X11/fonts/PORTNAME/Kasr" - FontPath "X11BASE/lib/X11/fonts/PORTNAME/MCS" - FontPath "X11BASE/lib/X11/fonts/PORTNAME/Shmookh" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/AAHS" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/AGA" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/FS" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/Kasr" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/MCS" + FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/Shmookh" ------------------------------------------------------------------ diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile index 5a7bc29..c8f10ea 100644 --- a/arabic/kacst_fonts/Makefile +++ b/arabic/kacst_fonts/Makefile @@ -9,8 +9,7 @@ PORTNAME= kacst_fonts PORTVERSION= 1.5 PORTREVISION= 2 CATEGORIES= arabic -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= arabeyes +MASTER_SITES= SF/arabeyes DISTNAME= kacst_fonts_${PORTVERSION} MAINTAINER= sbahra@gwu.edu diff --git a/arabic/kacst_fonts/files/pkg-message.in b/arabic/kacst_fonts/files/pkg-message.in index 031ce6a..0c53af56 100644 --- a/arabic/kacst_fonts/files/pkg-message.in +++ b/arabic/kacst_fonts/files/pkg-message.in @@ -5,5 +5,5 @@ Add the following line to the "Files" section and restart XFree86 or Xorg: - FontPath "%%X11BASE%%/lib/X11/fonts/%%PORTNAME%%" + FontPath "%%LOCALBASE%%/lib/X11/fonts/%%PORTNAME%%" ---------------------------------------------------------------------------- diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile index d78f278..0b265a6 100644 --- a/arabic/katoob/Makefile +++ b/arabic/katoob/Makefile @@ -7,10 +7,9 @@ PORTNAME= katoob PORTVERSION= 0.3.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= arabic -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= arabeyes +MASTER_SITES= SF/arabeyes MAINTAINER= sbahra@gwu.edu COMMENT= Light-weight, bidirectional editor for arabic texts @@ -18,7 +17,6 @@ COMMENT= Light-weight, bidirectional editor for arabic texts MAN1= katoob.1 USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack gtk20 WANT_GNOME= yes USE_AUTOTOOLS= libtool:15 diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile index 9c5f422..b9b4212 100644 --- a/arabic/khotot/Makefile +++ b/arabic/khotot/Makefile @@ -7,7 +7,7 @@ PORTNAME= khotot PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= arabic MASTER_SITES= # DISTFILES= # @@ -17,15 +17,15 @@ MAINTAINER= sbahra@gwu.edu COMMENT= A meta-port of the most popular font packages .if !defined(WITHOUT_MONO) -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/ae_fonts_mono/fonts.dir:${PORTSDIR}/arabic/ae_fonts_mono +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/ae_fonts_mono/fonts.dir:${PORTSDIR}/arabic/ae_fonts_mono .endif .if !defined(WITHOUT_AEFONTS) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/ae_fonts1/AAHS/fonts.dir:${PORTSDIR}/arabic/ae_fonts_ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/ae_fonts1/AAHS/fonts.dir:${PORTSDIR}/arabic/ae_fonts_ttf .endif .if !defined(WITHOUT_KACST) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/kacst_fonts/fonts.dir:${PORTSDIR}/arabic/kacst_fonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/kacst_fonts/fonts.dir:${PORTSDIR}/arabic/kacst_fonts .endif NO_BUILD= yes @@ -53,7 +53,7 @@ do-install: # This is a meta-port, the do-install target is not needed post-install: - @${CAT} ${PKGMESSAGE} | ${SED} "s|X11BASE|${X11BASE}|g" \ + @${CAT} ${PKGMESSAGE} | ${SED} "s|LOCALBASE|${LOCALBASE}|g" \ ${PKGDIR}/pkg-message .include <bsd.port.mk> diff --git a/arabic/khotot/pkg-message b/arabic/khotot/pkg-message index a346b28..e4166e8 100644 --- a/arabic/khotot/pkg-message +++ b/arabic/khotot/pkg-message @@ -5,12 +5,12 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "X11BASE/lib/X11/fonts/ae_fonts_mono" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/AAHS" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/AGA" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/FS" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/Kasr" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/MCS" - FontPath "X11BASE/lib/X11/fonts/ae_fonts1/Shmookh" - FontPath "X11BASE/lib/X11/fonts/kacst_fonts" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts_mono" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/AAHS" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/AGA" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/FS" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/Kasr" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/MCS" + FontPath "LOCALBASE/lib/X11/fonts/ae_fonts1/Shmookh" + FontPath "LOCALBASE/lib/X11/fonts/kacst_fonts" ------------------------------------------------------------------ diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile index f218654..bb208e0 100644 --- a/arabic/libitl/Makefile +++ b/arabic/libitl/Makefile @@ -16,7 +16,7 @@ COMMENT= An API abstraction to common Islamic calculations GNU_CONFIGURE= yes USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/itl WRKSRC= ${WRKDIR}/itl/libs-${PORTVERSION} diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 0545626..57e4cfd 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -27,7 +27,7 @@ MAKE_ARGS= CONF=${EXAMPLESDIR}/dact.conf \ TOBUILD="dact libdact.so dact.conf" MAN1= dact.1 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e "s|prefix = @prefix@|prefix = ${PREFIX}|" \ diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 68bafd5..11195ff 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -8,6 +8,7 @@ PORTNAME= file-roller PORTVERSION= 2.22.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -26,7 +27,6 @@ USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \ gnomedocutils diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index b714413..84551e4 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -14,7 +14,7 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= Library to create and read several streaming archive formats GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= BSDCPIO "Enable bsdcpio" on diff --git a/archivers/liblzxcomp/Makefile b/archivers/liblzxcomp/Makefile index 4481edf..3669cf5 100644 --- a/archivers/liblzxcomp/Makefile +++ b/archivers/liblzxcomp/Makefile @@ -16,7 +16,7 @@ COMMENT= LZX compression library MAKE_ENV= PREFIX=${PREFIX} -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES SHLIB_MAJOR= 1 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile index f709c79..eaee5c0 100644 --- a/archivers/libmspack/Makefile +++ b/archivers/libmspack/Makefile @@ -18,7 +18,7 @@ COMMENT= A library for Microsoft compression formats USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,\*this,*self,'\ diff --git a/archivers/linux-f10-ucl/Makefile b/archivers/linux-f10-ucl/Makefile index 2143d1b..b672de7 100644 --- a/archivers/linux-f10-ucl/Makefile +++ b/archivers/linux-f10-ucl/Makefile @@ -17,7 +17,7 @@ COMMENT= RPM of UCL, a lossless data compression library USE_LINUX_RPM= yes RPMVERSION= 3 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/archivers/linux-f8-ucl/Makefile b/archivers/linux-f8-ucl/Makefile index 2143d1b..b672de7 100644 --- a/archivers/linux-f8-ucl/Makefile +++ b/archivers/linux-f8-ucl/Makefile @@ -17,7 +17,7 @@ COMMENT= RPM of UCL, a lossless data compression library USE_LINUX_RPM= yes RPMVERSION= 3 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/archivers/linux-ucl/Makefile b/archivers/linux-ucl/Makefile index 2143d1b..b672de7 100644 --- a/archivers/linux-ucl/Makefile +++ b/archivers/linux-ucl/Makefile @@ -17,7 +17,7 @@ COMMENT= RPM of UCL, a lossless data compression library USE_LINUX_RPM= yes RPMVERSION= 3 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile index a50e6a0..62a939d 100644 --- a/archivers/lzo/Makefile +++ b/archivers/lzo/Makefile @@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-install: .if !defined(NOPORTDOCS) diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile index f4f1a2a..6f78d4f 100644 --- a/archivers/lzo2/Makefile +++ b/archivers/lzo2/Makefile @@ -22,7 +22,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-install: .if !defined(NOPORTDOCS) diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile index 882d0e9..1d2cb9a 100644 --- a/archivers/unshield/Makefile +++ b/archivers/unshield/Makefile @@ -17,7 +17,7 @@ COMMENT= Extract data from InstallShield CAB files USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --program-prefix="" .include <bsd.port.mk> diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile index b9011b3..7c97a31 100644 --- a/archivers/xarchive/Makefile +++ b/archivers/xarchive/Makefile @@ -7,10 +7,9 @@ PORTNAME= xarchive PORTVERSION= 0.2.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-0.2.8-6 MAINTAINER= mark@mkproductions.org @@ -22,7 +21,6 @@ MAN1= xarchive.1 GNU_CONFIGURE= yes USE_GNOME= gtk20 -USE_X_PREFIX= yes OPTIONS= 7ZIP "Support for 7zip archives" off \ ARJ "Support for ARJ archives" off \ diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index 693cda0..0d726cc 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -7,10 +7,9 @@ PORTNAME= celestia PORTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= celestia +MASTER_SITES= SF PKGNAMESUFFIX= -${CELESTIA_UI} MAINTAINER= jylefort@FreeBSD.org @@ -21,14 +20,14 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_GETTEXT= yes WANT_GNOME= yes CONFIGURE_ARGS= --program-prefix="" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${X11BASE}/lib -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} UI_LIST= glut gtk gnome CELESTIA_UI?= glut diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile index ab16473..d5ff16d 100644 --- a/astro/gaia/Makefile +++ b/astro/gaia/Makefile @@ -9,7 +9,7 @@ PORTNAME= gaia PORTVERSION= 0.1.2 PORTREVISION= 3 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gaia-clean MAINTAINER= se@FreeBSD.org @@ -41,7 +41,7 @@ PORTDOCS= README post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/SConstruct + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/SConstruct .if !defined(NOPORTDOCS) post-install: diff --git a/astro/gkrellmoon/Makefile b/astro/gkrellmoon/Makefile index b14b679..9dea449 100644 --- a/astro/gkrellmoon/Makefile +++ b/astro/gkrellmoon/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A moon clock plugin for Gkrellm -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm USE_GNOME= imlib diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile index 05ab4a7..879fc5e 100644 --- a/astro/gkrellmoon2/Makefile +++ b/astro/gkrellmoon2/Makefile @@ -9,14 +9,14 @@ PORTNAME= gkrellmoon2 PORTVERSION= 0.6 PORTREVISION= 4 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gkrellmoon DISTNAME= gkrellmoon-${PORTVERSION} MAINTAINER= w@wrzask.pl COMMENT= A moon clock plugin for Gkrellm2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/astro/gkrellsun/Makefile b/astro/gkrellsun/Makefile index ae9708e..90eb26d 100644 --- a/astro/gkrellsun/Makefile +++ b/astro/gkrellsun/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://nwalsh.com/hacks/gkrellsun/ MAINTAINER= ports@FreeBSD.org COMMENT= A Gkrellm-Plugin that displays the local sun rise and sun set times -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} diff --git a/astro/jday/Makefile b/astro/jday/Makefile index 869b029..ffa9aa8 100644 --- a/astro/jday/Makefile +++ b/astro/jday/Makefile @@ -15,7 +15,7 @@ COMMENT= Astronomical julian date calculator USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index bb1e6a6..74a482d 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -9,8 +9,7 @@ PORTNAME= openuniverse DISTVERSION= 1.0beta3 PORTREVISION= 4 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= openuniverse +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL Solar System simulator for X Window System @@ -26,8 +25,8 @@ USE_GMAKE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/GL -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/GL -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" \ LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/astro/saoimage/files/patch-aa b/astro/saoimage/files/patch-aa index 5cf2b36..d897bf4 100644 --- a/astro/saoimage/files/patch-aa +++ b/astro/saoimage/files/patch-aa @@ -33,7 +33,7 @@ #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... -ADFLAGS = -I/usr/X11R6/include -+ADFLAGS = -I${X11BASE}/include ++ADFLAGS = -I${LOCALBASE}/include # Libraries that move about or may require special specification. # @@ -42,7 +42,7 @@ # to specify its path fully in XLIB. -XLIB = -L/usr/X11R6/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... #F77LIB = -lF77 -lI77 -lU77 F77LIB = -lf2c @@ -51,7 +51,7 @@ -XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h ${LOCALBASE}/include/X11/Xutil.h STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \ hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH) @@ -61,8 +61,8 @@ defs/desktop.def defs/cursor.def -mainkey.o : $(WORKS) /usr/include/X11/keysym.h \ - /usr/include/X11/keysymdef.h -+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \ -+ ${X11BASE}/include/X11/keysymdef.h ++mainkey.o : $(WORKS) ${LOCALBASE}/include/X11/keysym.h \ ++ ${LOCALBASE}/include/X11/keysymdef.h #mainkey.o : $(WORKS) # for OpenWindows mainslct.o : $(WORKS) mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h diff --git a/astro/saoimage/files/patch-ab b/astro/saoimage/files/patch-ab index a2e953f..a556ab3 100644 --- a/astro/saoimage/files/patch-ab +++ b/astro/saoimage/files/patch-ab @@ -5,7 +5,7 @@ # make procedure in the parent SAOimage directory. -CFLAGS = -c -O -+CFLAGS += -c -I${X11BASE}/include ++CFLAGS += -c -I${LOCALBASE}/include LINT = lint RANLIB = ranlib @@ -14,7 +14,7 @@ LIB = libbtn.a -XLIBH = /usr/include/X11/Xlib.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h #XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows all: $(LIB) diff --git a/astro/sattrack/files/patch-aa b/astro/sattrack/files/patch-aa index 66ad920..29d66f9 100644 --- a/astro/sattrack/files/patch-aa +++ b/astro/sattrack/files/patch-aa @@ -223,7 +223,7 @@ #LX11 = -L/usr/openwin/lib -lX11 -lXt #LX11 = -lX11 -lXt -lICE -lSM # X11R6 -+ LX11 = -L$(X11BASE)/lib -lX11 -lXt -lICE -lSM ++ LX11 = -L$(LOCALBASE)/lib -lX11 -lXt -lICE -lSM #LX11 = -L/usr/openwin/lib -lX11 -lXt -lICE -lSM #CC_CXINC = diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile index a964b6c..81d8d74 100644 --- a/astro/sunclock/Makefile +++ b/astro/sunclock/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include MAN1= sunclock.1 diff --git a/astro/sunclock/files/patch-Imakefile b/astro/sunclock/files/patch-Imakefile index 894fa1b..41a15e7 100644 --- a/astro/sunclock/files/patch-Imakefile +++ b/astro/sunclock/files/patch-Imakefile @@ -34,12 +34,12 @@ -#JINC=-I/usr/include - -CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -+XPMLIBDIR=-L${X11BASE}/lib -+XPMINC=-I${X11BASE}/include/X11 ++XPMLIBDIR=-L${LOCALBASE}/lib ++XPMINC=-I${LOCALBASE}/include/X11 +JLIBDIR=-L${LOCALBASE}/lib +ZLIBDIR=-L${LOCALBASE}/lib +JINC=-I${LOCALBASE}/include -+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib ++CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -L${LOCALBASE}/lib #endif SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \ diff --git a/astro/sunclock/files/patch-editkit_Imakefile b/astro/sunclock/files/patch-editkit_Imakefile index 00d1538..a739766 100644 --- a/astro/sunclock/files/patch-editkit_Imakefile +++ b/astro/sunclock/files/patch-editkit_Imakefile @@ -5,7 +5,7 @@ XCOMM -CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -I${X11BASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib ++COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -L${LOCALBASE}/lib + +CCOPTIONS=${COPTS} diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile index 3f13915..ba1568a 100644 --- a/astro/tkgeomap/Makefile +++ b/astro/tkgeomap/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \ --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include CONFIGURE_ENV= TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap USE_TK= 82+ GNU_CONFIGURE= yes diff --git a/astro/wmjupiter/files/patch-Makefile b/astro/wmjupiter/files/patch-Makefile index 114129b..0a1ea2f 100644 --- a/astro/wmjupiter/files/patch-Makefile +++ b/astro/wmjupiter/files/patch-Makefile @@ -4,10 +4,10 @@ -CC = gcc -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext -lm # for Solaris diff --git a/astro/wmmoonclock/files/patch-aa b/astro/wmmoonclock/files/patch-aa index 9e91c10..82c272e 100644 --- a/astro/wmmoonclock/files/patch-aa +++ b/astro/wmmoonclock/files/patch-aa @@ -13,9 +13,9 @@ --- 1,8 ---- ! CC ?= gcc ! CFLAGS ?= -O2 -! INCDIR = -I${X11BASE}/include +! INCDIR = -I${LOCALBASE}/include ! DESTDIR= ${PREFIX} -! LIBDIR = -L${X11BASE}/lib +! LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext diff --git a/astro/wmsolar/files/patch-Makefile b/astro/wmsolar/files/patch-Makefile index 42b43d0..504e257 100644 --- a/astro/wmsolar/files/patch-Makefile +++ b/astro/wmsolar/files/patch-Makefile @@ -4,10 +4,10 @@ -CC = g++ -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext -lm # for Solaris diff --git a/astro/wmspaceweather/files/patch-aa b/astro/wmspaceweather/files/patch-aa index 6074c59..410bf19 100644 --- a/astro/wmspaceweather/files/patch-aa +++ b/astro/wmspaceweather/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext # for Solaris diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index 09e6722..1d1bebc 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/wmSun USE_XORG= xext xpm x11 ALL_TARGET= clean all MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ - INCDIR="-I${X11BASE}/include" LIBDIR="-L${X11BASE}/lib" + INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib" MAN1= wmSun.1 PLIST_FILES= bin/wmSun diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index ca3d9da..f05007b 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -7,6 +7,7 @@ PORTNAME= xephem PORTVERSION= 3.7.3 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ @@ -17,7 +18,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_MOTIF= yes -USE_X_PREFIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index bfba5b8..38d7235 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -14,13 +14,13 @@ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = $(QTDIR)/include -+X11_INCLUDE_DIR = $(X11BASE)/include ++X11_INCLUDE_DIR = $(LOCALBASE)/include +QT_INCLUDE_DIR = $(QT_PREFIX)/include/ -QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib +QT_LIB_DIR = $(QT_PREFIX)/lib -+X11_LIB_DIR = $(X11BASE)/lib ++X11_LIB_DIR = $(LOCALBASE)/lib ####### Compiler and tools diff --git a/astro/xmoontool/files/patch-Makefile b/astro/xmoontool/files/patch-Makefile index df09066..449c937 100644 --- a/astro/xmoontool/files/patch-Makefile +++ b/astro/xmoontool/files/patch-Makefile @@ -11,5 +11,5 @@ +#CFLAGS= -O2 -Wall +LDFLAGS+= -lXm -lXt -lX11 -lm DEFINES?= -DDEFAULT_COLOR - ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(X11BASE)/include -L$(X11BASE)/lib + ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(LOCALBASE)/include -L$(LOCALBASE)/lib diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 82f7796..4b3957f 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -7,20 +7,19 @@ PORTNAME= xplanet PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro geography -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= novel@FreeBSD.org COMMENT= Draw pictures of the earth textured by an image -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= xt xscrnsaver USE_GNOME= # CONFIGURE_ARGS= --with-map-extension=jpg -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lm" OPTIONS= FREETYPE "Enable Freetype support" on \ PANGO "Enable PANGO support" on \ diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile index 0c67ff9..662e059 100644 --- a/astro/xrmap/Makefile +++ b/astro/xrmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrmap PORTVERSION= 2.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src @@ -24,8 +24,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_BZIP2= yes USE_IMAKE= yes MANCOMPRESSED= no -USE_XPM= yes -USE_XLIB= yes +USE_XORG= xpm CIAFILE= CIA_WDB2.jpd.bz2 POPFILE= population.dat.bz2 diff --git a/astro/xrmap/files/patch-earthview_Makefile b/astro/xrmap/files/patch-earthview_Makefile index 95b04ad..672d4ea 100644 --- a/astro/xrmap/files/patch-earthview_Makefile +++ b/astro/xrmap/files/patch-earthview_Makefile @@ -5,7 +5,7 @@ earthview: earthview.c - gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2 -+ $(CC) $(CFLAGS) -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -I$(X11BASE)/include -L$(X11BASE)/lib -lX11 -lm -lz -lbz2 ++ $(CC) $(CFLAGS) -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lX11 -lm -lz -lbz2 install: install -c -s earthview $(BINDIR) diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index 7a6ef1c..9492924 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -7,6 +7,7 @@ PORTNAME= xtide PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.flaterco.com/xtide/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -21,9 +22,8 @@ COMMENT= Harmonic tide clock and tide predictor LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_XORG= xpm +USE_XORG= xpm xaw USE_GNOME= gnometarget -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -44,7 +44,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.3/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure .for file in Global.cc HarmonicsPath.cc wvsrtv.cc @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${file} .endfor diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile index b591e90..b22cfe4 100644 --- a/astro/xworld/Makefile +++ b/astro/xworld/Makefile @@ -20,8 +20,8 @@ USE_XORG= x11 HAS_CONFIGURE= yes CONFIGURE_ENV= CAT=${CAT} \ STRIP=/usr/bin/strip \ - INCLUDES="-I${X11BASE}/include" \ - LDLIBS="-lm -L${X11BASE}/lib -lX11" \ + INCLUDES="-I${LOCALBASE}/include" \ + LDLIBS="-lm -L${LOCALBASE}/lib -lX11" \ MORELIBS="" PLIST_FILES= bin/xworld STRIP= #don't strip out image data on install diff --git a/audio/HVSC-Update/Makefile b/audio/HVSC-Update/Makefile index 5e1a052..db6c6f7 100644 --- a/audio/HVSC-Update/Makefile +++ b/audio/HVSC-Update/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= anders@FreeBSD.org COMMENT= Update program for the HVSC C= 64 SID tune collection -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake WRKSRC= ${WRKDIR}/${PORTNAME:S/-/_/}_Tool_${PORTVERSION:S/.//g} diff --git a/audio/arts/Makefile b/audio/arts/Makefile index c7a0bd9..b0c3d23 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -38,8 +38,7 @@ _NO_KDE_FINAL= yes CFLAGS+= -DHAVE_VASPRINTF CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_TARGET= # empty -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} OPTIONS= ESD "Enable esound support" off \ NAS "Enable NAS support" off diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile index 7791288..2147ba9 100644 --- a/audio/ascd/Makefile +++ b/audio/ascd/Makefile @@ -18,7 +18,7 @@ COMMENT= A dockable cd player for AfterStep or WindowMaker LIB_DEPENDS= workman.1:${PORTSDIR}/audio/libworkman USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm DATAFILES= ascd-0.13pr6-themes.tgz THEMESDIR= ascd-0.13pr6-themes diff --git a/audio/asmix/Makefile b/audio/asmix/Makefile index c4e641f..f9421f9 100644 --- a/audio/asmix/Makefile +++ b/audio/asmix/Makefile @@ -17,8 +17,8 @@ COMMENT= Volume control dock-app for the AfterStep Window Manager USE_XORG= xpm x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm \ - --with-xpm-includes=${X11BASE}/include \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=${LOCALBASE}/include \ + --with-xpm-library=${LOCALBASE}/lib MAN1= ${PORTNAME}.1x PLIST_FILES= bin/asmix diff --git a/audio/asmixer/Makefile b/audio/asmixer/Makefile index 1801440..25b57e7e 100644 --- a/audio/asmixer/Makefile +++ b/audio/asmixer/Makefile @@ -20,8 +20,8 @@ PLIST_FILES= bin/asmixer USE_XORG= xpm x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm \ - --with-xpm-includes=${X11BASE} \ - --with-xpm-library=${X11BASE} + --with-xpm-includes=${LOCALBASE} \ + --with-xpm-library=${LOCALBASE} post-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \ diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile index 006add6..ddf180d 100644 --- a/audio/autozen/Makefile +++ b/audio/autozen/Makefile @@ -7,7 +7,7 @@ PORTNAME= autozen PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ftp://ftp.springdaemons.com/soft/ @@ -18,7 +18,6 @@ MAKE_ENV+= PTHREAD_FLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" \ DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}" USE_GNOME= gtk12 -USE_X_PREFIX= yes USE_PERL5_RUN= yes PORTDOCS= * diff --git a/audio/autozen/files/patch-Makefile b/audio/autozen/files/patch-Makefile index 94857e43..47e2cf0 100644 --- a/audio/autozen/files/patch-Makefile +++ b/audio/autozen/files/patch-Makefile @@ -10,7 +10,7 @@ -PREFIX = /usr -PUBLIC_SEQUENCES = $(PREFIX)/share/AutoZen -+PREFIX = ${X11BASE} ++PREFIX = ${LOCALBASE} +PUBLIC_SEQUENCES = $(PREFIX)/share/autozen # uncomment one of the OS= lines below if you're compiling on one of those OSen. diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile index 61fe0f6..656b9c9 100644 --- a/audio/bmp-faad/Makefile +++ b/audio/bmp-faad/Makefile @@ -7,10 +7,9 @@ PORTNAME= faad2 PORTVERSION= 2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= faac +MASTER_SITES= SF/faac PKGNAMEPREFIX= bmp- MAINTAINER= ahze@FreeBSD.org @@ -26,7 +25,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_AUTOTOOLS= automake:15 autoheader:261 autoconf:261 libtool:15 AUTOMAKE_ARGS= --add-missing -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk20 diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile index 9bf67c6..2711716 100644 --- a/audio/bmp-flac/Makefile +++ b/audio/bmp-flac/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" \ - --with-xmms-prefix="${X11BASE}" + --with-xmms-prefix="${LOCALBASE}" MAKEFILE= ${FILESDIR}/Makefile @@ -38,7 +38,7 @@ post-configure: @${RM} -rf ${WRKSRC}/obj @${RM} -rf ${WRKSRC}/include/FLAC -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/bmp/Input +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input do-install: ${INSTALL_DATA} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${PREFIX}/lib/bmp/Input diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile index 95b88a1..a671f01 100644 --- a/audio/bmp-mac/Makefile +++ b/audio/bmp-mac/Makefile @@ -6,7 +6,7 @@ PORTNAME= mac PORTVERSION= 0.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= CENKES PKGNAMEPREFIX= bmp- @@ -18,7 +18,6 @@ COMMENT= Monkey's Audio Codec non-win32 port LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \ mac.2:${PORTSDIR}/audio/mac -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile index 0d282a7..261fff7 100644 --- a/audio/bmp-modplug/Makefile +++ b/audio/bmp-modplug/Makefile @@ -7,7 +7,7 @@ PORTNAME= modplug PORTVERSION= 2.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= audio MASTER_SITES= ftp://ftp.osuosl.org/pub/FreeBSD/distfiles/ \ http://ftp.osuosl.org/pub/FreeBSD/distfiles/ \ @@ -25,7 +25,6 @@ LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes HAS_CONFIGURE= yes PLUGDIR?= lib/bmp/Input PLIST_FILES= ${PLUGDIR}/libmodplugbmp.so diff --git a/audio/coverhunter/Makefile b/audio/coverhunter/Makefile index 8a3e9ae..364a8ef 100644 --- a/audio/coverhunter/Makefile +++ b/audio/coverhunter/Makefile @@ -9,15 +9,14 @@ PORTNAME= coverhunter PORTVERSION= 0.3 PORTREVISION= 3 CATEGORIES= audio graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A program fetching the covers of your digital music albums RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -USE_X_PREFIX= yes +USE_XORG= x11 USE_GNOME= pygtk2 USE_PYTHON= 2.3+ NO_BUILD= yes diff --git a/audio/dagrab/files/patch-aa b/audio/dagrab/files/patch-aa index 1dc716f..57b9bab 100644 --- a/audio/dagrab/files/patch-aa +++ b/audio/dagrab/files/patch-aa @@ -8,7 +8,7 @@ -PREFIX=/usr/local -CFLAGS=-Wall -g ${UCD} +PREFIX?=/usr/local -+CFLAGS+=${UCD} -DCDDB_PATH=\"${X11BASE}/lib/X11/xmcd/cddb\" ++CFLAGS+=${UCD} -DCDDB_PATH=\"${LOCALBASE}/lib/X11/xmcd/cddb\" all:dagrab dagrab:dagrab.o diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 2abffff..55473bd 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -18,8 +18,7 @@ COMMENT= Audio sample editing and processing suite LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms MAKEFILE= Makefile.linux -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm MAKE_ENV+= OTHER_INCLUDE_DIR=. OTHER_LIBRARY_DIR=. diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad index a003d6b..0ebf7a0 100644 --- a/audio/dap/files/patch-ad +++ b/audio/dap/files/patch-ad @@ -13,7 +13,7 @@ -X11DIR = /usr/X11R6 -INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} +INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) +CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused DEBUG = -g3 diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae index 437f292..1d8ee1e 100644 --- a/audio/dap/files/patch-ae +++ b/audio/dap/files/patch-ae @@ -13,7 +13,7 @@ BACKDIR = ../bak/main HOMEDIR = $(HOME) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused diff --git a/audio/dap/files/patch-tooltips-Makefile.linux b/audio/dap/files/patch-tooltips-Makefile.linux index 74f1bfa..9ae0900 100644 --- a/audio/dap/files/patch-tooltips-Makefile.linux +++ b/audio/dap/files/patch-tooltips-Makefile.linux @@ -5,7 +5,7 @@ # Define where the X11 include files are. -X11_INCLUDE_DIR = /usr/X11R6/include -+X11_INCLUDE_DIR = ${X11BASE}/include ++X11_INCLUDE_DIR = ${LOCALBASE}/include # Uncomment out this line if you do not want debug information included. # DEBUG = -g -Wall -ansi -pedantic diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index c76d4ce..edf0321 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -7,14 +7,13 @@ PORTNAME= denemo PORTVERSION= 0.7.6 +PORTREVISION= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= multimedia@FreeBSD.org COMMENT= Graphical score editor -USE_XLIB= yes USE_GNOME= gnometarget gtk20 libxml2 USE_BISON= build GNU_CONFIGURE= yes diff --git a/audio/dream/Makefile b/audio/dream/Makefile index c5a4414..3e5b630 100644 --- a/audio/dream/Makefile +++ b/audio/dream/Makefile @@ -6,10 +6,9 @@ PORTNAME= dream PORTVERSION= 1.6.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio hamradio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= drm +MASTER_SITES= SF/drm DISTNAME= drm-${PORTVERSION} MAINTAINER= xride@FreeBSD.org @@ -21,7 +20,6 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ BROKEN= Needs DRM enabled in FAAD -USE_X_PREFIX= yes USE_QT_VER= 3 GNU_CONFIGURE= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \ diff --git a/audio/ecawave/Makefile b/audio/ecawave/Makefile index f8701c2..174783c 100644 --- a/audio/ecawave/Makefile +++ b/audio/ecawave/Makefile @@ -7,7 +7,7 @@ PORTNAME= ecawave PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://ecasound.seul.org/download/ @@ -17,7 +17,6 @@ COMMENT= Simple graphical audio file editor BUILD_DEPENDS= ${LOCALBASE}/lib/libecasound.a:${PORTSDIR}/audio/ecasound USE_QT_VER= 3 -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile index c84bb92..5dce6e9 100644 --- a/audio/ermixer/Makefile +++ b/audio/ermixer/Makefile @@ -12,8 +12,8 @@ PORTVERSION= 0.8 PORTREVISION= 2 PORTEPOCH= 0 CATEGORIES= audio kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF + MAINTAINER= ports@FreeBSD.org COMMENT= A command-line, ncurses, and (optional) Qt-GUI OSS audio mixer @@ -27,8 +27,8 @@ USE_PERL5_BUILD= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${X11BASE}/lib" -CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS}" PLIST_FILES= bin/ermixer .include <bsd.port.pre.mk> diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile index 1075fcd..a626e07 100644 --- a/audio/festival+OGI/Makefile +++ b/audio/festival+OGI/Makefile @@ -38,7 +38,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \ PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \ PKG_FESTIVAL_HOME=${FHOME} \ PKG_COMPILER="${CC}" \ - PKG_X11BASE=${X11BASE} \ + PKG_LOCALBASE=${LOCALBASE} \ PKG_PREFIX=${PREFIX} \ GCC27_CC="${CC}" \ GCC27_CXX="${CXX}" \ @@ -77,7 +77,7 @@ post-patch: ${SPEECHTOOLS}/config/systems/${FESTIVAL_ARCH}_FreeBSD${ii}.${jj}.mak .endfor .endfor - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/speech_tools/config/systems/default.mak do-install: diff --git a/audio/festival+OGI/files/FreeBSD.mak b/audio/festival+OGI/files/FreeBSD.mak index 26854d2..9def3f8 100644 --- a/audio/festival+OGI/files/FreeBSD.mak +++ b/audio/festival+OGI/files/FreeBSD.mak @@ -5,11 +5,11 @@ ECHO_N = /usr/bin/printf "%s" NAWK=awk -NAS_LIB=$(PKG_X11BASE)/lib -NAS_INCLUDE=$(PKG_X11BASE)/include +NAS_LIB=$(PKG_LOCALBASE)/lib +NAS_INCLUDE=$(PKG_LOCALBASE)/include -X11_LIB=$(PKG_X11BASE)/lib -X11_INCLUDE=$(PKG_X11BASE)/include +X11_LIB=$(PKG_LOCALBASE)/lib +X11_INCLUDE=$(PKG_LOCALBASE)/include OS_INCLUDES+=-I$(PKG_PREFIX)/include OS_LIBS+=-L$(PKG_PREFIX)/lib diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 1fd9920..00d0fe7 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -50,7 +50,7 @@ post-build test: ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test post-patch:: - ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/*/config/systems/default.mak .include <bsd.port.pre.mk> diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile index aee7328..ccff480 100644 --- a/audio/flac123/Makefile +++ b/audio/flac123/Makefile @@ -9,8 +9,7 @@ PORTNAME= flac123 PORTVERSION= 0.0.11 PORTREVISION= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= flac-tools +MASTER_SITES= SF/flac-tools MAINTAINER= multimedia@FreeBSD.org COMMENT= Command-line player for flac audio files diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index 63b37ad..d88aafc 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/gai-visual-audio/pkg-plist b/audio/gai-visual-audio/pkg-plist index dff446d..7721e81 100644 --- a/audio/gai-visual-audio/pkg-plist +++ b/audio/gai-visual-audio/pkg-plist @@ -3,5 +3,4 @@ libdata/bonobo/servers/GNOME_gai-vaApplet.server share/pixmaps/gai-va-icon.png share/pixmaps/gai-va/va.png @dirrm share/pixmaps/gai-va -@cwd %%X11BASE%% lib/xmms/Visualization/spec_plugin.so diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile index 5f1cd87..9cf249b 100644 --- a/audio/gdam/Makefile +++ b/audio/gdam/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pav@FreeBSD.org COMMENT= DJ mixing software suitable for live performances -BUILD_DEPENDS= ${X11BASE}/include/xmms/plugin.h:${PORTSDIR}/multimedia/xmms +BUILD_DEPENDS= ${LOCALBASE}/include/xmms/plugin.h:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server.1 @@ -23,7 +23,7 @@ MAN1= gdamcli.1 gdamladspapluginscanner.1 gdam123.1 gdam-launcher.1 gdam-server USE_GMAKE= yes USE_GNOME= libglade GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|`$$XMMS_CONFIG --libs`|"`$$XMMS_CONFIG --libs` ${PTHREAD_LIBS}"|' ${WRKSRC}/configure diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile index be25856..5a93733 100644 --- a/audio/gkrellmms/Makefile +++ b/audio/gkrellmms/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ume@FreeBSD.org COMMENT= GKrellM XMMS Plugin LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile index 666acbd..66f3d68 100644 --- a/audio/gkrellmms2/Makefile +++ b/audio/gkrellmms2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ume@FreeBSD.org COMMENT= GKrellM XMMS Plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 LATEST_LINK= gkrellmms2 diff --git a/audio/gkrellmss/Makefile b/audio/gkrellmss/Makefile index 2634734..5e0e9bf 100644 --- a/audio/gkrellmss/Makefile +++ b/audio/gkrellmss/Makefile @@ -14,17 +14,16 @@ MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM with a VU meter showing left/right channel audio -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm LIB_DEPENDS= gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm NO_LATEST_LINK= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= esound imlib -USE_XPM= yes +USE_XORG= xpm DOC_FILES= Changelog README Themes diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile index 6045243..2f6ba15 100644 --- a/audio/gkrellmss2/Makefile +++ b/audio/gkrellmss2/Makefile @@ -7,18 +7,18 @@ PORTNAME= gkrellmss PORTVERSION= 2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellmss/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM with a VU meter showing left/right channel audio -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -USE_X_PREFIX= yes +USE_XORG= x11 USE_GNOME= esound gtk20 USE_GCC= 3.4+ USE_GMAKE= yes diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile index 87cee1f..b23b574 100644 --- a/audio/gkrellmvolume/Makefile +++ b/audio/gkrellmvolume/Makefile @@ -15,7 +15,7 @@ DISTNAME= volume-${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= GKrellM volume plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/volume diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index 2307e58..c62b955 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -16,7 +16,7 @@ DISTNAME= gkrellm-volume-${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= GKrellM volume plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 LATEST_LINK= gkrellmvolume2 diff --git a/audio/glame/Makefile b/audio/glame/Makefile index 9795f9a..6644e58 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -7,10 +7,9 @@ PORTNAME= glame PORTVERSION= 2.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME @@ -21,10 +20,8 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ vorbis.4:${PORTSDIR}/audio/libvorbis \ guile.18:${PORTSDIR}/lang/guile -USE_XORG= xbitmaps -USE_XLIB= yes +USE_XORG= xbitmaps x11 USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui -USE_GCC= 3.4+ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl:15 libtool:15 diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index 0d59475..3b8c46c 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmpc PORTVERSION= 0.15.5.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://download.sarine.nl/gmpc-${PORTVERSION:C/\.0$//}/ \ @@ -19,6 +20,7 @@ LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \ curl.4:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes +USE_XORG= x11 sm USE_GMAKE= yes USE_GNOME= libglade2 gnomevfs2 gnomehack USE_GETTEXT= yes diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index ee1b231..2228558 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -7,22 +7,20 @@ PORTNAME= gnapster PORTVERSION= 1.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnapster +MASTER_SITES= SF/gnapster MAINTAINER= ports@FreeBSD.org COMMENT= GNOME client for the online mp3 community called napster USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= imlib WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 57f9dfb..4fe194c 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-audio PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= GNOME @@ -15,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Sound files for use with GNOME 2 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes USE_GNOME= gnomehack gnomeprefix gnomehier MAKE_ENV= prefix=${PREFIX} diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile index 0cafa57..fbf8c4d 100644 --- a/audio/goobox/Makefile +++ b/audio/goobox/Makefile @@ -8,6 +8,7 @@ PORTNAME= goobox PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +19,7 @@ COMMENT= CD player and ripper for GNOME Desktop environment LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz -USE_XLIB= yes +USE_XORG= x11 USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile index 8d6db65..868cad1 100644 --- a/audio/gqradio/Makefile +++ b/audio/gqradio/Makefile @@ -7,15 +7,13 @@ PORTNAME= gqradio PORTVERSION= 1.9.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=gqmpeg +MASTER_SITES= SF/gqmpeg MAINTAINER= stefan.jahn@nemesis-sektor.de COMMENT= GTK2 based FM tuner -USE_XLIB= yes GNU_CONFIGURE= yes USE_GNOME= gtk20 gnomehack gnomeprefix diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 7979fd2..8a14c90 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -7,10 +7,9 @@ PORTNAME= grip PORTVERSION= 3.2.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= multimedia@FreeBSD.org COMMENT= GTK front-end to external cd rippers and audio encoders @@ -19,7 +18,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ curl.4:${PORTSDIR}/ftp/curl PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv -USE_XLIB= yes +USE_XORG= x11 USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte USE_GMAKE= yes USE_GETTEXT= yes diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile index 6a3e522..1a3d078 100644 --- a/audio/gsm/Makefile +++ b/audio/gsm/Makefile @@ -20,7 +20,7 @@ COMMENT= Audio converter and library for converting u-law to gsm encoding WRKSRC= ${WRKDIR}/gsm-1.0-pl12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= toast.1 MAN3= gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3 diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile index afd7b23..a6d5786 100644 --- a/audio/gspeakers/Makefile +++ b/audio/gspeakers/Makefile @@ -7,18 +7,15 @@ PORTNAME= gspeakers PORTVERSION= 0.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Gnome-based loudspeaker design program LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 -USE_XLIB= yes -USE_GCC= 3.4+ USE_GNOME= gnomeprefix gnometarget libxml2 USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile index 4c2ec7e..6963e30 100644 --- a/audio/hawkvoice/Makefile +++ b/audio/hawkvoice/Makefile @@ -18,10 +18,10 @@ USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes MAKEFILE= makefile.linux -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \ MAKE="${GMAKE}" diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index f632280..6ab9a5a 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -9,8 +9,7 @@ PORTNAME= hydrogen PORTVERSION= 0.9.3 PORTREVISION= 3 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= jylefort@FreeBSD.org COMMENT= An advanced drum machine @@ -20,8 +19,8 @@ LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes USE_QT_VER= 3 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ ac_qmake="${LOCALBASE}/bin/qmake" \ ac_libraries="${LDFLAGS}" diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile index 44c10a5..91d9838 100644 --- a/audio/icegenerator/Makefile +++ b/audio/icegenerator/Makefile @@ -17,7 +17,7 @@ COMMENT= Direct streaming generator for Icecast/Shoutcast LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile index 1d5e106..9a26b4f 100644 --- a/audio/jack-rack/Makefile +++ b/audio/jack-rack/Makefile @@ -9,8 +9,7 @@ PORTNAME= jack-rack PORTVERSION= 1.4.5 PORTREVISION= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= jack-rack +MASTER_SITES= SF/jack-rack MAINTAINER= jylefort@FreeBSD.org COMMENT= A LADSPA effects rack for the JACK audio server @@ -23,8 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa USE_BZIP2= yes USE_GNOME= libgnomeui libxml2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-ladcca --disable-lash post-patch: diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index 428e080..95f6e27 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -23,8 +23,6 @@ QT_COMPONENTS= gui imageformats_run moc_build network qmake_build rcc_build \ sql uic_build xml HAS_CONFIGURE= yes -CONFIGURE_ENV+= X11BASE=${X11BASE} - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.pre.mk> diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 914db5c..c9feadb 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-oss --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if !defined(WITHOUT_DJBFFT) && !defined(PACKAGE_BUILDING) BUILD_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft diff --git a/audio/libao/Makefile b/audio/libao/Makefile index afab0b6..8b16634 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15 WANT_GNOME= yes USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(NOPORTDOCS) MAKE_ENV= DOC="" diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile index d175f5d..0bd3791 100644 --- a/audio/libcdaudio/Makefile +++ b/audio/libcdaudio/Makefile @@ -18,6 +18,6 @@ COMMENT= A library for playing audio CDs USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 5e0c44e..a5cd103 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -17,7 +17,7 @@ COMMENT= Ogg bitstream library USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GNOME= gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(NOPORTDOCS) MAKE_ENV= DOC="" diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile index febd999e..12d8d92 100644 --- a/audio/libshout/Makefile +++ b/audio/libshout/Makefile @@ -17,7 +17,7 @@ CONFLICTS= libshout2-* USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile index 6a2f27e..ad10c53 100644 --- a/audio/libshout2/Makefile +++ b/audio/libshout2/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME+= pkgconfig GNU_CONFIGURE= yes diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile index c417a73..9e4dcd3 100644 --- a/audio/libsidplay/Makefile +++ b/audio/libsidplay/Makefile @@ -15,7 +15,7 @@ MAINTAINER= sec@42.org COMMENT= A Commodore SID-chip emulator library to play SID music files USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile index 03f583b..ce671e2 100644 --- a/audio/libsidplay2/Makefile +++ b/audio/libsidplay2/Makefile @@ -24,7 +24,7 @@ LIBTOOLFILES= builders/hardsid-builder/configure \ libsidplay/configure \ libsidutils/configure \ resid/configure -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \ diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index 329aff5..fe8df30 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -33,7 +33,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/tunepimp-0.4 USE_LDCONFIG= ${PREFIX}/lib/tunepimp-0.4 diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index 2f4852e..e358204 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -32,7 +32,7 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \ diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile index 3fdff0b..866bafb 100644 --- a/audio/linux-alsa-lib/Makefile +++ b/audio/linux-alsa-lib/Makefile @@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes BRANDELF_DIRS= usr/bin diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile index dc6c9be..e3f47be 100644 --- a/audio/linux-arts/Makefile +++ b/audio/linux-arts/Makefile @@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile index 317e55b..0eb54ae 100644 --- a/audio/linux-esound/Makefile +++ b/audio/linux-esound/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}" diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile index 3fdff0b..866bafb 100644 --- a/audio/linux-f10-alsa-lib/Makefile +++ b/audio/linux-f10-alsa-lib/Makefile @@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes BRANDELF_DIRS= usr/bin diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile index dc6c9be..e3f47be 100644 --- a/audio/linux-f10-arts/Makefile +++ b/audio/linux-f10-arts/Makefile @@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile index 317e55b..0eb54ae 100644 --- a/audio/linux-f10-esound/Makefile +++ b/audio/linux-f10-esound/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}" diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile index 40d7d76..2ae7123 100644 --- a/audio/linux-f10-freealut/Makefile +++ b/audio/linux-f10-freealut/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALL_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm AUTOMATIC_PLIST=yes diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile index 6d86912..afcbcbf7 100644 --- a/audio/linux-f10-libaudiofile/Makefile +++ b/audio/linux-f10-libaudiofile/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of audiofile USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}" diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile index 6498543..8733606 100644 --- a/audio/linux-f10-libogg/Makefile +++ b/audio/linux-f10-libogg/Makefile @@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile index 10c99cb..df3c7fd 100644 --- a/audio/linux-f10-libvorbis/Makefile +++ b/audio/linux-f10-libvorbis/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile index 054a9f7..961205c 100644 --- a/audio/linux-f10-openal/Makefile +++ b/audio/linux-f10-openal/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f8-alsa-lib/Makefile b/audio/linux-f8-alsa-lib/Makefile index 3fdff0b..866bafb 100644 --- a/audio/linux-f8-alsa-lib/Makefile +++ b/audio/linux-f8-alsa-lib/Makefile @@ -16,7 +16,7 @@ COMMENT= The Advanced Linux Sound Architecture libraries ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes BRANDELF_DIRS= usr/bin diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile index dc6c9be..e3f47be 100644 --- a/audio/linux-f8-arts/Makefile +++ b/audio/linux-f8-arts/Makefile @@ -15,7 +15,7 @@ COMMENT= Audio system for the KDE integrated X11 desktop (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile index 317e55b..0eb54ae 100644 --- a/audio/linux-f8-esound/Makefile +++ b/audio/linux-f8-esound/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-liba USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}" diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile index 40d7d76..2ae7123 100644 --- a/audio/linux-f8-freealut/Makefile +++ b/audio/linux-f8-freealut/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALL_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm AUTOMATIC_PLIST=yes diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile index 6d86912..afcbcbf7 100644 --- a/audio/linux-f8-libaudiofile/Makefile +++ b/audio/linux-f8-libaudiofile/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of audiofile USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}" diff --git a/audio/linux-f8-libogg/Makefile b/audio/linux-f8-libogg/Makefile index 6498543..8733606 100644 --- a/audio/linux-f8-libogg/Makefile +++ b/audio/linux-f8-libogg/Makefile @@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile index 10c99cb..df3c7fd 100644 --- a/audio/linux-f8-libvorbis/Makefile +++ b/audio/linux-f8-libvorbis/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile index 054a9f7..961205c 100644 --- a/audio/linux-f8-openal/Makefile +++ b/audio/linux-f8-openal/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile index 40d7d76..2ae7123 100644 --- a/audio/linux-freealut/Makefile +++ b/audio/linux-freealut/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALL_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm AUTOMATIC_PLIST=yes diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile index 6d86912..afcbcbf7 100644 --- a/audio/linux-libaudiofile/Makefile +++ b/audio/linux-libaudiofile/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of audiofile USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}" diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile index 6498543..8733606 100644 --- a/audio/linux-libogg/Makefile +++ b/audio/linux-libogg/Makefile @@ -16,7 +16,7 @@ COMMENT= Ogg bitstream library (Linux version) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile index 10c99cb..df3c7fd 100644 --- a/audio/linux-libvorbis/Makefile +++ b/audio/linux-libvorbis/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile index 054a9f7..961205c 100644 --- a/audio/linux-openal/Makefile +++ b/audio/linux-openal/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index f7c444d..78c3259 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -31,8 +31,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 autoheader:261 automake:19 aclocal:19 libtool:15 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-vst --without-stk diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile index 8fa65b9..b66321a 100644 --- a/audio/lplayer/Makefile +++ b/audio/lplayer/Makefile @@ -9,10 +9,9 @@ PORTNAME= lplayer PORTVERSION= 1.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -23,12 +22,12 @@ LIB_DEPENDS= db_cxx-4.3.0:${PORTSDIR}/databases/db43 \ WRKSRC= ${WRKDIR}/${PORTNAME} +USE_XORG= x11 xinerama USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-xmms-prefix=${X11BASE} --with-xinerama \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --with-xmms-prefix=${LOCALBASE} --with-xinerama MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile index 31efd39..a8573ea 100644 --- a/audio/mixer.app/Makefile +++ b/audio/mixer.app/Makefile @@ -7,7 +7,7 @@ PORTNAME= mixer.app PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -17,11 +17,11 @@ COMMENT= Another mixer intended for the windowmaker dockapp PLIST_FILES= bin/Mixer.app WRKSRC= ${WRKDIR}/Mixer.app-${PORTVERSION} -CXXFLAGS+= -fno-rtti -fno-exceptions -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib -lXpm -lXext -lX11 +CXXFLAGS+= -fno-rtti -fno-exceptions -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lXext -lX11 MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" -USE_XPM= yes +USE_XORG= xpm xext x11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${PREFIX}/bin diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index ec84de7..b4b0003 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -48,10 +48,10 @@ post-patch: s|$$QTDIR/bin/qmake|${LOCALBASE}/bin/qmake|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} \ - -e 's|system( ld|& -shared -L${LOCALBASE}/lib -L${X11BASE}/lib|' \ + -e 's|system( ld|& -shared -L${LOCALBASE}/lib|' \ ${CONFIGURE_WRKSRC}/check.qbas @${REINPLACE_CMD} \ - -e 's|/usr/local|${LOCALBASE}|; s|/opt|${X11BASE}|' \ + -e 's|/usr/local|${LOCALBASE}|; s|/opt|${LOCALBASE}|' \ ${CONFIGURE_WRKSRC}/paths.qbas .if !defined(NOPORTDOCS) diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa index c5f2305..52d06c4 100644 --- a/audio/mpg123/files/patch-aa +++ b/audio/mpg123/files/patch-aa @@ -67,8 +67,8 @@ +CFLAGS +=-I${LOCALBASE}/include +LDFLAGS+=-L${LOCALBASE}/lib +.elif defined(HAVE_NAS) -+CFLAGS +=-I${X11BASE}/include -DNAS -+LDFLAGS+=-L${X11BASE}/lib ++CFLAGS +=-I${LOCALBASE}/include -DNAS ++LDFLAGS+=-L${LOCALBASE}/lib +.endif + freebsd: diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index ad7be61..329def8 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -8,8 +8,7 @@ PORTNAME= mpiosh PORTVERSION= 0.7.1.p2 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mpio +MASTER_SITES= SF/mpio DISTNAME= mpio-${PORTVERSION:S|.p|_pre|} MAINTAINER= ports@FreeBSD.org @@ -20,7 +19,7 @@ LIB_DEPENDS= usb-0.1:${PORTSDIR}/devel/libusb USE_AUTOTOOLS= libtool:15 USE_ICONV= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile index 13b6395..10be765 100644 --- a/audio/musicbox-tag-editor/Makefile +++ b/audio/musicbox-tag-editor/Makefile @@ -8,10 +8,9 @@ PORTNAME= musicbox-tag-editor PORTVERSION= 0.2.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= musicbox +MASTER_SITES= SF/musicbox DISTNAME= musicbox-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -19,7 +18,6 @@ COMMENT= A simple GTK+ audio tag editor LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib -USE_XLIB= yes USE_GNOME= gnomehack gnomeprefix libglade2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile index 1d4b30a..f12f6fd 100644 --- a/audio/normalize/Makefile +++ b/audio/normalize/Makefile @@ -36,7 +36,6 @@ OPTIONS= XMMS "Build XMMS plugin" off \ .if defined(WITH_XMMS) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms PLIST_SUB+= XMMS="" -PLIST_SUB+= X11BASE="${X11BASE}" .else CONFIGURE_ARGS+=--disable-xmms PLIST_SUB+= XMMS="@comment " diff --git a/audio/normalize/pkg-plist b/audio/normalize/pkg-plist index 203d150..2fa30b9 100644 --- a/audio/normalize/pkg-plist +++ b/audio/normalize/pkg-plist @@ -3,6 +3,5 @@ bin/normalize-mp3 bin/normalize-ogg %%NLS%%share/locale/en_GB/LC_MESSAGES/normalize.mo %%NLS%%share/locale/fr/LC_MESSAGES/normalize.mo -@cwd %%X11BASE%% %%XMMS%%lib/xmms/Effect/librva.la %%XMMS%%lib/xmms/Effect/librva.so diff --git a/audio/openal/Makefile b/audio/openal/Makefile index cbf029f..993f7c0 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --enable-capture USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack WANT_SDL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= ARTS "aRts backend" off \ ESD "esd backend" off \ diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile index bf9cedd..f7f314b 100644 --- a/audio/opmixer/Makefile +++ b/audio/opmixer/Makefile @@ -7,10 +7,9 @@ PORTNAME= opmixer PORTVERSION= 0.75 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= optronic +MASTER_SITES= SF/optronic DISTNAME= opMixer-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -19,7 +18,6 @@ COMMENT= Adjusts a mixer LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gtk12 gnometarget GNU_CONFIGURE= yes diff --git a/audio/pd/Makefile b/audio/pd/Makefile index 8f43e72..546061d 100644 --- a/audio/pd/Makefile +++ b/audio/pd/Makefile @@ -17,7 +17,7 @@ COMMENT= MIDI-capable real-time audio processor/synthesizer WRKSRC= ${WRKDIR}/${DISTNAME:S;.src;/src;} GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include \ +CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" MAKEFILE= makefile diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile index f6ffb9d..6836093 100644 --- a/audio/phatbeat/Makefile +++ b/audio/phatbeat/Makefile @@ -7,7 +7,7 @@ PORTNAME= phatbeat PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.postreal.org/files/ DISTNAME= PhatBeat-${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= PhatBeat-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A beat counter -USE_X_PREFIX= yes USE_SDL= sdl image MAN1= phatbeat.1 diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile index e0d84a7..a0f19f5 100644 --- a/audio/portaudio/Makefile +++ b/audio/portaudio/Makefile @@ -18,7 +18,7 @@ COMMENT= Portable cross-platform Audio API USE_ZIP= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION= 0 diff --git a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic index d69aee4..489ded2 100644 --- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic +++ b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic @@ -5,10 +5,10 @@ # Paul Boersma, January 31, 2007 -CC = gcc -std=gnu99 -DUNIX -Dlinux -I /usr/X11R6/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O -+CC += -std=gnu99 -DUNIX -Dlinux -I${X11BASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized ++CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -+LIBS = ${X11BASE}/lib/libXm.a -L${X11BASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm ++LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm RANLIB = ls ICON = diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile index 647dc71..ea2e96f 100644 --- a/audio/prokyon3/Makefile +++ b/audio/prokyon3/Makefile @@ -7,30 +7,29 @@ PORTNAME= prokyon3 PORTVERSION= 0.9.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Prokyon3 is a multithreaded MP3 manager and tag editor -BUILD_DEPENDS= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +BUILD_DEPENDS= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin LIB_DEPENDS= id3-3.8:${PORTSDIR}/audio/id3lib \ vorbis.4:${PORTSDIR}/audio/libvorbis RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms +USE_XORG= x11 xft USE_QT_VER= 3 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes USE_MYSQL= yes USE_PERL5_BUILD=yes -CONFIGURE_ARGS+=--with-qtdir=${X11BASE} --with-id3-libs=${LOCALBASE}\ - --with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS+=--with-qtdir=${LOCALBASE} --with-id3-libs=${LOCALBASE}\ + --with-ogg-libs=${LOCALBASE} --with-vorbis-libs=${LOCALBASE} QT_NONSTANDARD= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ -I${QT_PREFIX}/include" LDFLAGS="${LDFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 930d76e..1685737 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -8,6 +8,7 @@ PORTNAME= pulseaudio PORTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -18,7 +19,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ oil-0.3.0:${PORTSDIR}/devel/liboil USE_GNOME= gnometarget gnomehack glib20 ltverhack -USE_XLIB= yes +USE_XORG= x11 sm USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl:15 libtool:15 diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile index a696af7..46e8bc5 100644 --- a/audio/py-sdl_mixer/Makefile +++ b/audio/py-sdl_mixer/Makefile @@ -30,8 +30,6 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-sdl-mixer post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) diff --git a/audio/py-sdl_mixer/files/patch-setup.py b/audio/py-sdl_mixer/files/patch-setup.py index 2825bbe..a199e85 100644 --- a/audio/py-sdl_mixer/files/patch-setup.py +++ b/audio/py-sdl_mixer/files/patch-setup.py @@ -1,19 +1,17 @@ ---- setup.py.orig Fri Oct 28 00:13:10 2005 -+++ setup.py Fri Oct 28 00:14:18 2005 -@@ -17,12 +17,14 @@ +--- ./setup.py.orig 2005-07-29 16:16:50.000000000 +0200 ++++ ./setup.py 2008-04-13 21:35:05.000000000 +0200 +@@ -17,12 +17,12 @@ INCDIR = [ "/usr/include", - "/usr/local/include", + "%%LOCALBASE%%/include", -+ "%%X11BASE%%/include", "/sw/include", # For Mac OS X ] LIBDIR = [ "/usr/lib", - "/usr/local/lib", + "%%LOCALBASE%%/lib", -+ "%%X11BASE%%/lib", "/sw/lib/", # For Mac OS X ] diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile index a5d1ed2..9579ad0 100644 --- a/audio/py-taglib/Makefile +++ b/audio/py-taglib/Makefile @@ -24,6 +24,6 @@ USE_PYTHON= -2.4 USE_PYTHON_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile index e474d50..f593be8 100644 --- a/audio/py-xmms/Makefile +++ b/audio/py-xmms/Makefile @@ -24,7 +24,7 @@ USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pyxmms USE_BZIP2= yes USE_GNOME= glib12 -XMMS_CONFIG?= ${X11BASE}/bin/xmms-config +XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}" .include <bsd.port.mk> diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile index 1937301..12b8394 100644 --- a/audio/raop_play/Makefile +++ b/audio/raop_play/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 \ flac:${PORTSDIR}/audio/flac GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_GNOME= glib20 diff --git a/audio/rat/Makefile b/audio/rat/Makefile index 70db2f2..b750d98 100644 --- a/audio/rat/Makefile +++ b/audio/rat/Makefile @@ -19,8 +19,7 @@ USE_TK= yes USE_XORG= x11 xext sm ice USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ - --enable-ipv6 +CONFIGURE_ARGS= --enable-ipv6 MAN1= rat.1 MANCOMPRESSED= no diff --git a/audio/rat30/files/patch-Makefile_FreeBSD_4 b/audio/rat30/files/patch-Makefile_FreeBSD_4 index 61d2025..d4a838d 100644 --- a/audio/rat30/files/patch-Makefile_FreeBSD_4 +++ b/audio/rat30/files/patch-Makefile_FreeBSD_4 @@ -3,7 +3,7 @@ @@ -0,0 +1,6 @@ +TCL_INC = ${LOCALBASE}/include/tcl8.2 +TK_INC = ${LOCALBASE}/include/tk8.2 -+INCS = -I${X11BASE}/include \ ++INCS = -I${LOCALBASE}/include \ + -I$(TCL_INC)/generic -I$(TK_INC)/generic +LDLIBS = -L${LOCALBASE}/lib \ -+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm ++ -L${LOCALBASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index f355553..d840a9e 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.11.5 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 @@ -27,7 +28,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ NO_LATEST_LINK= yes USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_GMAKE= yes diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index fa03846..bcfdeeb 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -8,7 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.10.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -26,7 +26,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_GMAKE= yes diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index d0f6b20..d82e6bc 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -7,7 +7,7 @@ PORTNAME= rosegarden PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/ DISTNAME= ${PORTNAME}-2.1pl2 @@ -18,7 +18,7 @@ COMMENT= The Rosegarden Editor and Sequencer suite BUILD_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi -USE_X_PREFIX= yes +USE_XORG= xaw USE_AUTOTOOLS= autoconf:213 CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2 diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile index 77a4759..fdc6635 100644 --- a/audio/rsynth/Makefile +++ b/audio/rsynth/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm \ audio:${PORTSDIR}/audio/nas GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib pre-configure: @${CP} ${FILESDIR}/freebsdplay.c ${WRKSRC}/config/freebsdplay.c diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 08619b5..3566369 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -20,8 +20,8 @@ USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\" USE_LDCONFIG= yes diff --git a/audio/snd/Makefile b/audio/snd/Makefile index 09213a7..6ec9ab7 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -7,10 +7,9 @@ PORTNAME= snd PORTVERSION= 7.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Multitracking sound editor and utilities @@ -54,8 +53,7 @@ CONFIGURE_ARGS+= --with-gtk \ --with-gtkrc-colors \ --with-float-samples USE_GNOME= gtk20 -USE_X_PREFIX= yes -USE_XLIB= yes +USE_XORG= x11 .endif .include <bsd.port.pre.mk> diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 0f1b7ae..f3fdfea 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -8,7 +8,7 @@ PORTNAME= sound-juicer PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +23,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \ diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index 33e56e0..28f0ffe 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -7,7 +7,7 @@ PORTNAME= spiralloops PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/ DISTNAME= SpiralLoops-${PORTVERSION} @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PLIST= ${WRKDIR}/pkg-plist -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.pre.mk> @@ -33,12 +32,11 @@ post-patch: ${SED} -E "s:-ldl::g; \ s:^CFLAGS:XCFLAGS:g; \ s:^CXXFLAGS:XCXXFLAGS:g; \ - s:usr/X11R6:${PREFIX}:g; \ s:-O3:${PTHREAD_CFLAGS}:g; \ s:CFLAGS =:CFLAGS +=:g; \ s:CXXFLAGS=:CXXFLAGS+=:g; \ s:-lm:${PTHREAD_LIBS} -lm:g; \ - s:/usr/X11R6:${X11BASE}:g" \ + s:/usr/X11R6:${LOCALBASE}:g" \ < ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in pre-install: diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 99931cc..f8b0189 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -7,7 +7,7 @@ PORTNAME= spiralsynth PORTVERSION= 0.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/ DISTNAME= SpiralSynth-${PORTVERSION} @@ -21,7 +21,6 @@ GNU_CONFIGURE= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PLIST= ${WRKDIR}/pkg-plist -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${DISTNAME} @@ -47,7 +46,7 @@ post-patch: s|CXXFLAGS=|CXXFLAGS+=|g ; \ s|LINK = g++|LINK = ${CXX}|g ; \ s|-lm|${PTHREAD_LIBS} -lm|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|iostream.h|iostream|g ;\ s|<strstream>|<sstream>|g ;\ s|machine/soundcard|sys/soundcard|g' \ diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index b81c6af..33f34b8 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -55,7 +55,7 @@ post-patch: s|MidiPlugin||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include -I${X11BASE}/include|' \ + @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \ ${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in @${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \ @@ -83,7 +83,7 @@ post-patch: s|^CC[[:space:]]*=.+$$|CC=${CC}|; \ s|^CXX[[:space:]]*=.+$$|CXX=${CXX}|; \ s|g\+\+|${CXX}|; \ - s,@FLTK_(C|CXX)FLAGS@,-I${X11BASE}/include -I${LOCALBASE}/include,; \ + s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \ s|-lpthread|${PTHREAD_LIBS}|g' .include <bsd.port.post.mk> diff --git a/audio/swami/Makefile b/audio/swami/Makefile index 7fcc2db..e3efd58 100644 --- a/audio/swami/Makefile +++ b/audio/swami/Makefile @@ -7,10 +7,9 @@ PORTNAME= swami PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An advanced instrument editor @@ -22,7 +21,6 @@ LIB_DEPENDS= fluidsynth.2:${PORTSDIR}/audio/fluidsynth \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnometarget gtk12 WANT_GNOME= yes USE_LDCONFIG= yes diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 85a8e96..4392104 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -17,7 +17,7 @@ COMMENT= Library for manipulating ID3 tags and Ogg comments USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile index ddb97db..f83ac94 100644 --- a/audio/tagtool/Makefile +++ b/audio/tagtool/Makefile @@ -7,10 +7,9 @@ PORTNAME= tagtool PORTVERSION= 0.12.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A GNOME MP3/Ogg file tagger @@ -20,7 +19,6 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ USE_BZIP2= yes USE_GNOME= gnomehack intlhack libglade2 -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile index ab5fe98..dc2c5b6 100644 --- a/audio/teamspeak_client/Makefile +++ b/audio/teamspeak_client/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes TSIMG= ${WRKSRC}/setup.data/image diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index f985ef1..3bf391c 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -7,7 +7,7 @@ PORTNAME= terminatorx PORTVERSION= 3.82 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://terminatorx.org/dist/ DISTNAME= terminatorX-${PORTVERSION} @@ -22,8 +22,8 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ jack.0:${PORTSDIR}/audio/jack USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes +USE_XORG= x11 xext xi xxf86dga USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/ufmcontrol-i18n/Makefile b/audio/ufmcontrol-i18n/Makefile index 375f085..93071c3 100644 --- a/audio/ufmcontrol-i18n/Makefile +++ b/audio/ufmcontrol-i18n/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:C/-i18n$//1} MAINTAINER= nivit@FreeBSD.org COMMENT= USB radio control utility -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= NOPROFILE=yes MAN1= ufmcontrol.1 diff --git a/audio/vat/Makefile b/audio/vat/Makefile index ebffe32..d1026e0 100644 --- a/audio/vat/Makefile +++ b/audio/vat/Makefile @@ -7,7 +7,7 @@ PORTNAME= vat PORTVERSION= 4.0b2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mbone tk MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ DISTFILES= vatsrc-4.0b2.tar.gz @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ gsm.1:${GSM_DIR} -USE_X_PREFIX= yes +USE_XORG= x11 USE_AUTOTOOLS= autoconf:213 CONFIGURE_ARGS= --with-gsm=${GSM_WORK} INSTALL_TARGET= install install-man diff --git a/audio/wavplay/files/patch-aa b/audio/wavplay/files/patch-aa index 5132232..15edb22 100644 --- a/audio/wavplay/files/patch-aa +++ b/audio/wavplay/files/patch-aa @@ -75,7 +75,7 @@ # installed). # -#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm -+#CUSTINCL= -I${X11BASE}/include/X11 -I${X11BASE}/include/Xm -I/${X11BASE}/include ++#CUSTINCL= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include/Xm -I/${LOCALBASE}/include #---------------------------------------------------------------------- # Normally, you shouldn't need to change anything beyond this point: diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile index aea500a..77b913e 100644 --- a/audio/wmcdplay/Makefile +++ b/audio/wmcdplay/Makefile @@ -20,6 +20,6 @@ PLIST_FILES= bin/wmcdplay WRKSRC= ${WRKDIR}/wmcdplay USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm .include <bsd.port.mk> diff --git a/audio/wmfmixer/Makefile b/audio/wmfmixer/Makefile index 70ae7f3..3a02d7b 100644 --- a/audio/wmfmixer/Makefile +++ b/audio/wmfmixer/Makefile @@ -17,8 +17,7 @@ COMMENT= An audio mixer for the WindowMaker dock PLIST_FILES= bin/wmfmixer USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/audio/wmfmixer/files/patch-Makefile b/audio/wmfmixer/files/patch-Makefile index f02dd59..1e0641a 100644 --- a/audio/wmfmixer/files/patch-Makefile +++ b/audio/wmfmixer/files/patch-Makefile @@ -4,8 +4,8 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS += -c -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -CFLAGS = -O2 -OBJS = wmfmixer.o wmgeneral.o diff --git a/audio/wmix/Makefile b/audio/wmix/Makefile index 17daabb..5f73c50 100644 --- a/audio/wmix/Makefile +++ b/audio/wmix/Makefile @@ -17,8 +17,8 @@ COMMENT= An audio mixer for the WindowMaker dock with TV-like OSD PLIST_FILES= bin/wmix ALL_TARGET= ${PORTNAME} USE_XORG= xpm -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" PORTDOCS= AUTHORS BUGS INSTALL NEWS README diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile index 2de918f..65f080e 100644 --- a/audio/wmmixer/Makefile +++ b/audio/wmmixer/Makefile @@ -19,7 +19,7 @@ COMMENT= An audio mixer for the WindowMaker dock PLIST_FILES= bin/wmmixer WRKSRC= ${WRKDIR}/wmmixer USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile index 00283aa..41e1800 100644 --- a/audio/wmmp3/Makefile +++ b/audio/wmmp3/Makefile @@ -6,7 +6,7 @@ PORTNAME= wmmp3 PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio windowmaker MASTER_SITES= http://www.dotfiles.com/software/wmmp3/ @@ -16,8 +16,7 @@ COMMENT= A front-end for mpg123 in a Window Maker dockapp RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 GNU_CONFIGURE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xpm post-install: @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples/wmmp3" diff --git a/audio/wmrecord/Makefile b/audio/wmrecord/Makefile index 9bbd060..aa381e8 100644 --- a/audio/wmrecord/Makefile +++ b/audio/wmrecord/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmrecord PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio windowmaker MASTER_SITES= http://linkinnovations.linux.tucows.com/files/x11/dock/ \ http://www.bsd-geek.de/FreeBSD/distfiles/ @@ -15,10 +15,9 @@ MASTER_SITES= http://linkinnovations.linux.tucows.com/files/x11/dock/ \ MAINTAINER= ports@FreeBSD.org COMMENT= General purpose audio recording utility for the WindowMaker dock -USE_XPM= yes -USE_X_PREFIX= yes -MAKE_ARGS= LIBS="-L${X11BASE}/lib -lXpm -lX11 -lXext" \ - CFLAGS="${CFLAGS} -I${X11BASE}/include" LIBDIR="" +USE_XORG= xpm x11 xext +MAKE_ARGS= LIBS="-L${LOCALBASE}/lib -lXpm -lX11 -lXext" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR="" MAN1= wmrecord.1 PLIST_FILES= bin/wmrecord diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile index 0a148d8..1fdd83a 100644 --- a/audio/wmsmixer/Makefile +++ b/audio/wmsmixer/Makefile @@ -15,7 +15,7 @@ MAINTAINER= lx@redundancy.redundancy.org COMMENT= An audio mixer for the WindowMaker dock PLIST_FILES= bin/wmsmixer -USE_XPM= YES +USE_XORG= xpm USE_IMAKE= YES MAKE_ARGS= CC="${CXX}" CFLAGS="${CXXFLAGS}" diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile index a70d757..7288729 100644 --- a/audio/wmusic/Makefile +++ b/audio/wmusic/Makefile @@ -16,8 +16,7 @@ COMMENT= A remote control dockapp for xmms LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/workman/Makefile b/audio/workman/Makefile index 6412d8f..5656e10 100644 --- a/audio/workman/Makefile +++ b/audio/workman/Makefile @@ -27,6 +27,6 @@ PLIST_FILES= bin/workman lib/help/workman.info .include <bsd.port.pre.mk> post-install: - ${GZIP_CMD} ${X11BASE}/man/man5/workmandb.5 + ${GZIP_CMD} ${PREFIX}/man/man5/workmandb.5 .include <bsd.port.post.mk> diff --git a/audio/wsoundprefs/files/patch-ab b/audio/wsoundprefs/files/patch-ab index 1f12b64..1b6f7ca 100644 --- a/audio/wsoundprefs/files/patch-ab +++ b/audio/wsoundprefs/files/patch-ab @@ -21,7 +21,7 @@ -STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS) +WINGSLIBS = -lWINGs -L/$(LOCALBASE)/lib -lPropList + -+STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs ++STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs DEPLIBS = $(DEPXLIB) -LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB) diff --git a/audio/wsoundprefs/pkg-descr b/audio/wsoundprefs/pkg-descr index dac5058..c9f6345 100644 --- a/audio/wsoundprefs/pkg-descr +++ b/audio/wsoundprefs/pkg-descr @@ -1,13 +1,13 @@ -This utility allows you to configure wsoundserver for Window Maker. It provides -a browse list for selecting the SoundSets and the Sounds that are installed. -It allows you to save your own SoundSets and load them or other preconfigured +This utility allows you to configure wsoundserver for Window Maker. It provides +a browse list for selecting the SoundSets and the Sounds that are installed. +It allows you to save your own SoundSets and load them or other preconfigured SoundSets. -It is similar in form and function to WPrefs that is installed with -Window Maker. +It is similar in form and function to WPrefs that is installed with +Window Maker. To run it, enter the following command: -${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs +${LOCALBASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs The following icon is recommended for the dock or clip of Window Maker: -${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff +${LOCALBASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 041699e..508921f 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= wsoundserver PORTVERSION= 0.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio windowmaker MASTER_SITES= ${MASTER_SITE_NETBSD} DISTNAME= WSoundServer-${PORTVERSION} @@ -22,11 +22,10 @@ LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/WINGs" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WINGs" MAN1= get-wsound-flags.1x getsoundset.1x setsoundset.1x \ wsoundplay.1x wsoundserver.1x diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index 2e2d4a1..2c1e18d 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= bin/xanalyser \ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|-lXm |${MOTIFLIB} |g' ${WRKSRC}/src/Makefile.in .include <bsd.port.mk> diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile index 02e936c..11ca463 100644 --- a/audio/xmixer/Makefile +++ b/audio/xmixer/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmixer PORTVERSION= 0.9.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://mpx.freeshell.net/ @@ -32,7 +32,7 @@ PROGRAMS= xmixer xgmixer MLINKS+= xmixer.1 xgmixer.1 PLIST_FILES+= bin/xgmixer .else -USE_XLIB= yes +USE_XORG= x11 xt ice xaw PROGRAMS= xmixer .endif diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile index e71969b..9daef35 100644 --- a/audio/xmms-a52dec/Makefile +++ b/audio/xmms-a52dec/Makefile @@ -17,7 +17,7 @@ COMMENT= A52 (aka AC3) decoder plugin for XMMS LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ a52.0:${PORTSDIR}/audio/liba52 -RUN_DEPENDS= ${X11BASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround +RUN_DEPENDS= ${LOCALBASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround USE_BZIP2= yes USE_GNOME= gtk12 diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile index 37ad947..c6e8bbe 100644 --- a/audio/xmms-arts_output/Makefile +++ b/audio/xmms-arts_output/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ USE_GNOME= gtk12 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_FILES= lib/xmms/Output/libarts.a \ lib/xmms/Output/libarts.la \ diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile index 53c5c85..2b2e44d 100644 --- a/audio/xmms-crystality/Makefile +++ b/audio/xmms-crystality/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 0.92 PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://ftp.ussg.iu.edu/FreeBSD/distfiles/ \ - http://T32.TecNik93.com/FreeBSD/others_ports/xmms-crystality/sources/ \ + http://T32.TecNik93.com/FreeBSD/others_ports/xmms-crystality/sources/ PKGNAMEPREFIX= xmms- DISTNAME= ${PORTNAME}-plugin-${PORTVERSION} diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index f3b2b44..6567f82 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -8,8 +8,7 @@ PORTNAME= xmms-flac PORTVERSION= 1.2.1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= flac +MASTER_SITES= SF/flac DISTNAME= flac-${PORTVERSION} MAINTAINER= naddy@FreeBSD.org @@ -22,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" \ - --with-xmms-prefix="${X11BASE}" + --with-xmms-prefix="${LOCALBASE}" MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static" MAKE_ENV= MAKEOBJDIR=/nonexistent # ignore ${WRKSRC}/obj MAKEFILE= ${FILESDIR}/Makefile diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile index 8d10863..4ff1676 100644 --- a/audio/xmms-imms/Makefile +++ b/audio/xmms-imms/Makefile @@ -7,10 +7,9 @@ PORTNAME= imms PORTVERSION= 1.2a -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMEPREFIX= xmms- MAINTAINER= ports@FreeBSD.org @@ -25,7 +24,6 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ tag.5:${PORTSDIR}/audio/taglib USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gtk12 USE_GMAKE= yes USE_AUTOTOOLS= autoheader:261 autoconf:261 diff --git a/audio/xmms-infopipe/Makefile b/audio/xmms-infopipe/Makefile index d6654d8..1f0af91 100644 --- a/audio/xmms-infopipe/Makefile +++ b/audio/xmms-infopipe/Makefile @@ -26,7 +26,7 @@ USE_LDCONFIG= yes LIBDIR?= ${PREFIX}/lib/xmms/General SRCLIBDIR?= src/.libs -LDCONFIG_DIRS= %%X11BASE%%/lib/xmms/General +LDCONFIG_DIRS= %%LOCALBASE%%/lib/xmms/General PLIST_FILES= lib/xmms/General/libinfopipe.so post-patch: diff --git a/audio/xmms-jackasyn/Makefile b/audio/xmms-jackasyn/Makefile index b732791..44ed24d 100644 --- a/audio/xmms-jackasyn/Makefile +++ b/audio/xmms-jackasyn/Makefile @@ -23,8 +23,8 @@ USE_GNOME= gtk12 gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CXXFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CXXFLAGS}" diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile index a2ef6a9..420b234 100644 --- a/audio/xmms-mailnotify/Makefile +++ b/audio/xmms-mailnotify/Makefile @@ -19,12 +19,12 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= lib/xmms/General/libmailnotify.so \ lib/xmms/General/alert.wav post-patch: - ${REINPLACE_CMD} -e "s,/usr/lib,${X11BASE}/lib," ${WRKSRC}/mailnotify.c + ${REINPLACE_CMD} -e "s,/usr/lib,${LOCALBASE}/lib," ${WRKSRC}/mailnotify.c .include <bsd.port.mk> diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile index 2a58997..cfaefd2 100644 --- a/audio/xmms-modplug/Makefile +++ b/audio/xmms-modplug/Makefile @@ -7,7 +7,7 @@ PORTNAME= modplug PORTVERSION= 2.0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= audio MASTER_SITES= SFE MASTER_SITE_SUBDIR= ${PORTNAME}-${PKGNAMEPREFIX:S/-//} @@ -20,7 +20,6 @@ COMMENT= A modplug-based plugin for XMMS LIB_DEPENDS?= xmms.4:${PORTSDIR}/multimedia/xmms LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug -USE_X_PREFIX= yes USE_LDCONFIG= yes HAS_CONFIGURE= yes PLUGDIR?= lib/xmms/Input diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile index e33632f..fbd3bdf 100644 --- a/audio/xmradio/Makefile +++ b/audio/xmradio/Makefile @@ -19,7 +19,7 @@ COMMENT= Motif based FM tuner (for use with bt848 driver) #RUN_DEPENDS= sox:${PORTSDIR}/audio/sox USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm USE_MOTIF= yes ONLY_FOR_ARCHS= i386 ia64 diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 2aa433f..ec5ce2c 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -7,7 +7,7 @@ PORTNAME= xsidplay PORTVERSION= 1.6.5.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= audio emulators MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ @@ -16,13 +16,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Graphical front end for libsidplay -USE_X_PREFIX= yes USE_QT_VER= 3 USE_GNOME= gnometarget WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt3 --with-qt-binaries=${X11BASE}/bin +CONFIGURE_ARGS= --with-qt3 --with-qt-binaries=${LOCALBASE}/bin MAN1= xsidplay.1 PLIST_FILES= bin/xsidplay diff --git a/audio/xspeakfree/Makefile b/audio/xspeakfree/Makefile index d52027c..963575b 100644 --- a/audio/xspeakfree/Makefile +++ b/audio/xspeakfree/Makefile @@ -7,7 +7,7 @@ PORTNAME= xspeakfree PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone net audio MASTER_SITES= http://www.liquidx.org/distfiles/ @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ ${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely \ NO_BUILD= yes -USE_X_PREFIX= yes PORTDOCS= BUGS HISTORY INSTALL LICENSE README TODO diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile index bbf847e..a8db77a 100644 --- a/audio/xtuner/Makefile +++ b/audio/xtuner/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms PLIST_FILES= bin/xtuner USE_IMAKE= YES -USE_XPM= YES +USE_XORG= xpm .include <bsd.port.pre.mk> diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile index 40e83c69..66f34f7 100644 --- a/audio/xvmixer/Makefile +++ b/audio/xvmixer/Makefile @@ -16,8 +16,8 @@ COMMENT= Open Look-based audio mixer LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include -DUSE_XBM_ICON" \ - LDFLAGS="-L${X11BASE}/lib" LIBRARIES="-lxview -lolgx -lX11" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DUSE_XBM_ICON" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBRARIES="-lxview -lolgx -lX11" PLIST_FILES= bin/xvmixer do-install: diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile index f174477..f18f908 100644 --- a/audio/xwave/Makefile +++ b/audio/xwave/Makefile @@ -18,7 +18,7 @@ COMMENT= Audio player/recorder/editor for the X Window System WRKSRC= ${WRKDIR}/${PORTNAME}2-981109 USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm DOC_FILES= README README-XWAVE2 README.v06 INSTALL diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile index bd74798..470b3da 100644 --- a/audio/zinf/Makefile +++ b/audio/zinf/Makefile @@ -7,10 +7,9 @@ PORTNAME= zinf PORTVERSION= 2.2.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= GTK-based MP3 player @@ -19,7 +18,6 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ gdbm.3:${PORTSDIR}/databases/gdbm -USE_X_PREFIX= yes USE_GNOME= gnomehack gnometarget gtk20 lthack WANT_GNOME= yes USE_PERL5= yes diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile index 5b1546a..dfdbda6 100644 --- a/benchmarks/gtkperf/Makefile +++ b/benchmarks/gtkperf/Makefile @@ -7,21 +7,18 @@ PORTNAME= gtkperf PORTVERSION= 0.40 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= benchmarks -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Measure your system's GTK+ performance WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GCC= 3.4+ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk20 gnomeprefix -USE_X_PREFIX= yes .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile index 6cda206..9af46ce 100644 --- a/benchmarks/hpl/Makefile +++ b/benchmarks/hpl/Makefile @@ -41,7 +41,7 @@ LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas .endif -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes HPL_ARCH?= FreeBSD_PIV_CBLAS ALL_TARGET= arch=${HPL_ARCH} MAN3= HPL_abort.3 HPL_all_reduce.3 HPL_barrier.3 HPL_bcast.3 \ diff --git a/biology/L-Breeder/Makefile b/biology/L-Breeder/Makefile index e83e6a0..c13374d 100644 --- a/biology/L-Breeder/Makefile +++ b/biology/L-Breeder/Makefile @@ -8,7 +8,7 @@ PORTNAME= LBreeder PORTVERSION= 1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= biology MASTER_SITES= http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/ DISTNAME= ${PORTNAME}-source @@ -16,13 +16,11 @@ DISTNAME= ${PORTNAME}-source MAINTAINER= dyeske@gmail.com COMMENT= Allows you to display and breed L-system forms -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/Unix USE_ZIP= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_WX= 2.4 diff --git a/biology/L-Breeder/files/patch-Unix-Makefile b/biology/L-Breeder/files/patch-Unix-Makefile index de7b0dd..2c59818 100644 --- a/biology/L-Breeder/files/patch-Unix-Makefile +++ b/biology/L-Breeder/files/patch-Unix-Makefile @@ -2,13 +2,13 @@ +++ Unix/Makefile Wed Dec 7 07:46:56 2005 @@ -1,9 +1,10 @@ src=../src/ -+C_FLAGS= -I$(X11BASE)/include -I$(LOCALBASE)/include ++C_FLAGS= -I$(LOCALBASE)/include .PHONY : clean all all : probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o - g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -lGL -lGLU -lglut -o LBreeder-${OSTYPE} -+ g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lGL -lGLU -lglut -o LBreeder ++ g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -L$(LOCALBASE)/lib -lGL -lGLU -lglut -o LBreeder GLUT_LBreeder.o : ${src}GLUT_LBreeder.cpp ${src}GLUT_LBreeder.h g++ -c ${src}GLUT_LBreeder.cpp ${C_FLAGS} diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile index 497c008..b3e2654 100644 --- a/biology/garlic/Makefile +++ b/biology/garlic/Makefile @@ -31,8 +31,7 @@ CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 .endif post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ;\ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;\ s|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g' ${WRKSRC}/Makefile .if !defined(WITH_OPTIMIZED_FLAGS) diff --git a/biology/garlic/files/patch-Makefile b/biology/garlic/files/patch-Makefile index 63eb7c7..b4d5e99 100644 --- a/biology/garlic/files/patch-Makefile +++ b/biology/garlic/files/patch-Makefile @@ -6,7 +6,7 @@ #CCOPT = -O -CCOPT = -O3 -+CCOPT = %%CFLAGS%% -I%%LOCALBASE%%/include -I%%X11BASE%%/include ++CCOPT = %%CFLAGS%% -I%%LOCALBASE%%/include #CCOPT = -O3 -g3 #CCOPT = -ansi -pedantic -g3 #CCOPT = -ansi -pedantic -O -Wall -Wstrict-prototypes -g3 @@ -14,7 +14,7 @@ HEADERS = defines.h typedefs.h -LIBPATH = -L/usr/X11R6/lib -+LIBPATH = -L%%X11BASE%%/lib ++LIBPATH = -L%%LOCALBASE%%/lib LINKOPT = -lX11 -lm diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile index 792bfed..51777aa 100644 --- a/biology/gperiodic/Makefile +++ b/biology/gperiodic/Makefile @@ -7,13 +7,13 @@ PORTNAME= gperiodic PORTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES= biology MASTER_SITES= http://www.frantz.fi/software/ MAINTAINER= ports@FreeBSD.org COMMENT= Displays a periodic table of the elements -USE_XLIB= yes USE_GNOME= gtk20 USE_GETTEXT= yes diff --git a/biology/kinemage/files/patch-Makefile b/biology/kinemage/files/patch-Makefile index 4a4b60d..deb8db2 100644 --- a/biology/kinemage/files/patch-Makefile +++ b/biology/kinemage/files/patch-Makefile @@ -5,7 +5,7 @@ # for Linux, try: # CFLAGS = -I/usr/X11R6/LessTif/Motif2.0/include -CFLAGS = -g -I/usr/X11R6/LessTif/Motif2.0/include -+CFLAGS += -I$(X11BASE)/include ++CFLAGS += -I$(LOCALBASE)/include # for SGI use: # CFLAGS = -I/usr/include/X11 # CFLAGS = -g -I/usr/include/X11 @@ -16,7 +16,7 @@ -LIBS = -L/usr/X11R6/LessTif/Motif2.0/lib -L/usr/X11R6/lib -lXm -lXt -lX11 +# LIBS = -L/usr/X11R6/LessTif/Motif2.0/lib -L/usr/X11R6/lib -lXm -lXt -lX11 +# For FreeBSD: -+LIBS = -L$(X11BASE)/lib -lXm -lXt -lX11 ++LIBS = -L$(LOCALBASE)/lib -lXm -lXt -lX11 # ------------------------------------------------------------------------ diff --git a/biology/molden/Makefile b/biology/molden/Makefile index d3ae859..137ecf3 100644 --- a/biology/molden/Makefile +++ b/biology/molden/Makefile @@ -7,7 +7,7 @@ PORTNAME= molden PORTVERSION= 4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -18,9 +18,8 @@ EXTRACT_ONLY= ${PORTNAME}${PORTVERSION}.tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Display molecular orbitals and electron densities in 2D and 3D -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_XLIB= yes +USE_XORG= x11 xmu +USE_GL= glut RESTRICTED= free for academic, non profit usage; do not re-distribute source and executable. MAKEFILE= ${WRKSRC}/makefile diff --git a/biology/molden/distinfo b/biology/molden/distinfo index 7268a4f..3a06d43 100644 --- a/biology/molden/distinfo +++ b/biology/molden/distinfo @@ -1,3 +1,3 @@ -MD5 (molden-4.5_1/molden4.5.tar.Z) = 2706a205de011f2dca042f8c7fe95834 -SHA256 (molden-4.5_1/molden4.5.tar.Z) = 84b6905ec786bde9af8bfa6439b0c066b65a98028ffaf1ebc543e58b31fe2ca7 -SIZE (molden-4.5_1/molden4.5.tar.Z) = 3605279 +MD5 (molden-4.5_2/molden4.5.tar.Z) = 2706a205de011f2dca042f8c7fe95834 +SHA256 (molden-4.5_2/molden4.5.tar.Z) = 84b6905ec786bde9af8bfa6439b0c066b65a98028ffaf1ebc543e58b31fe2ca7 +SIZE (molden-4.5_2/molden4.5.tar.Z) = 3605279 diff --git a/biology/molden/files/patch-aa b/biology/molden/files/patch-aa index d8a7295..82a56ab 100644 --- a/biology/molden/files/patch-aa +++ b/biology/molden/files/patch-aa @@ -8,12 +8,12 @@ +#CC = cc LIBS = -lX11 -lm -LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm -+LIBSG = -L${X11BASE}/lib -lGLU -lGL -lXmu -lX11 -lm ++LIBSG = -L${LOCALBASE}/lib -lGLU -lGL -lXmu -lX11 -lm + +### +# FreeBSD +#CC = gcc -+CFLAGS += -c -DDOBACK -DHASTIMER -I${X11BASE}/include ++CFLAGS += -c -DDOBACK -DHASTIMER -I${LOCALBASE}/include +#FC = f77 +.if ${MACHINE_ARCH} == i386 +FFLAGS += -malign-double @@ -24,7 +24,7 @@ +.else +FFLAGS += #-Wno-globals -fno-globals +.endif -+LIBS = -L${X11BASE}/lib -lX11 -lm ++LIBS = -L${LOCALBASE}/lib -lX11 -lm +LDR = ${FC} +### @@ -52,7 +52,7 @@ # (make gmolden) # -LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm -+LIBSOGL = -L${X11BASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm ++LIBSOGL = -L${LOCALBASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm # # on linux : # diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile index ba50ca9..b21507f 100644 --- a/biology/ncbi-toolkit/Makefile +++ b/biology/ncbi-toolkit/Makefile @@ -53,7 +53,7 @@ MLINKS= blast.1 bl2seq.1 blast.1 blastall.1 blast.1 blastcl3.1 \ blast.1 seedtop.1 post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/make/makedis.csh \ ${WRKSRC}/platform/freebsd.ncbi.mk diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile index 39b8b35..5741bd7 100644 --- a/biology/ortep3/Makefile +++ b/biology/ortep3/Makefile @@ -27,7 +27,7 @@ MAKE_ARGS= LFLAGS="${LFLAGS}" .if defined(WITH_PGPLOT) EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa -LFLAGS= -L${LOCALBASE}/lib -lpgplot -L${X11BASE}/lib -lX11 +LFLAGS= -L${LOCALBASE}/lib -lpgplot -lX11 .endif post-extract: diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile index 9e21481..15794e1 100644 --- a/biology/phylip/Makefile +++ b/biology/phylip/Makefile @@ -7,7 +7,7 @@ PORTNAME= phylip PORTVERSION= 3.66 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= biology MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/phylip/ \ @@ -19,12 +19,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Phylogeny Inference Package WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 xaw xt BUILD_WRKSRC= ${WRKSRC}/src MAKE_ARGS= CC="${CC} ${CFLAGS}" \ - DC="${CC} -DX -I${X11BASE}/include ${CFLAGS}" \ - DLIBS="-L${X11BASE}/lib -lX11 -lXaw -lXt" + DC="${CC} -DX -I${LOCALBASE}/include ${CFLAGS}" \ + DLIBS="-L${LOCALBASE}/lib -lX11 -lXaw -lXt" PORTDOCS= * diff --git a/biology/platon/Makefile b/biology/platon/Makefile index 6f6cd35..97aa9f5 100644 --- a/biology/platon/Makefile +++ b/biology/platon/Makefile @@ -7,7 +7,7 @@ PORTNAME= platon PORTVERSION= 2007.01.09 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://xraysoft.chem.uu.nl/pub/unix/ DISTNAME= platon @@ -20,7 +20,7 @@ COMMENT= Tool for viewing molecular/crystallographic structures # There is a charge of US$ 5000 for commercial users. RESTRICTED= free for academic, US$ 5000 for commercial users -USE_XLIB= yes +USE_XORG= x11 USE_FORTRAN= yes # This port only has snapshot archive @@ -43,7 +43,7 @@ pre-patch: post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e "s+%%X11BASE%%+${X11BASE}+" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s+%%LOCALBASE%%+${LOCALBASE}+" ${WRKSRC}/Makefile pre-install: ${STRIP_CMD} ${WRKDIR}/${DISTNAME}/platon diff --git a/biology/platon/files/Makefile b/biology/platon/files/Makefile index 4f6ca0b..2cda199 100644 --- a/biology/platon/files/Makefile +++ b/biology/platon/files/Makefile @@ -9,8 +9,8 @@ FOPT= ${FFLAGS} .else FOPT= ${FFLAGS} -Nx800 -NL400 -Nn802 .endif -COPT= ${CFLAGS} -I%%X11BASE%%/include -LOPT= -L%%X11BASE%%/lib -lX11 +COPT= ${CFLAGS} -I%%LOCALBASE%%/include +LOPT= -L%%LOCALBASE%%/lib -lX11 all: ${OBJS} ${FC} -o ${TARGET} ${OBJS} ${LOPT} diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile index 45c82c0..d32a151 100644 --- a/biology/protomol/Makefile +++ b/biology/protomol/Makefile @@ -26,8 +26,8 @@ USE_GCC= 3.4+ # Hack to cure a misbehavior of the configure script CONFIGURE_ARGS+= --without-irix_mipspro_mpi -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CXXFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index bea4f4e..40d7d25 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -7,7 +7,7 @@ PORTNAME= rasmol PORTVERSION= 2.7.2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://ftp.bernstein-plus-sons.com/software/ DISTNAME= RasMol_${PORTVERSION} @@ -17,7 +17,6 @@ COMMENT= Fast Molecular Visualization Program WRKSRC= ${WRKDIR}/RasMol_${PORTVERSION}/src -USE_X_PREFIX= yes USE_IMAKE= yes MANCOMPRESSED= no XFREE86_HTML_MAN= no diff --git a/biology/seaview/files/patch-Makefile b/biology/seaview/files/patch-Makefile index a51cd4c..78eec35 100644 --- a/biology/seaview/files/patch-Makefile +++ b/biology/seaview/files/patch-Makefile @@ -7,7 +7,7 @@ CXX = g++ -CFLAGS = -Dunix -U__APPLE__ -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include -+CFLAGS+= -Dunix -U__APPLE__ -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include ++CFLAGS+= -Dunix -U__APPLE__ -c $(OPT) -I$(LOCALBASE)/include OBJECTS = seaview.o pdf.o custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o @@ -19,7 +19,7 @@ - -L$(X11)/lib -lX11 -lm + $(CXX) -o $@ $(OBJECTS) -L$(LOCALBASE)/lib -lfltk \ + -Xlinker -Bstatic -lpdf -Xlinker -Bdynamic \ -+ -L$(X11BASE)/lib -lX11 -lm ++ -L$(LOCALBASE)/lib -lX11 -lm strip $@ diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile index 5b94878..c08697f 100644 --- a/biology/tinker/Makefile +++ b/biology/tinker/Makefile @@ -7,7 +7,7 @@ PORTNAME= tinker PORTVERSION= 4.2.20040908 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ${MASTER_SITE_GENTOO} \ ftp://dasher.wustl.edu/pub/ @@ -18,8 +18,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A general purpose molecular modelling package -BUILD_DEPENDS= imake:${X_IMAKE_PORT} - MAKE_ENV+= HAVE_G2C=yes INSTALL_PROGRAM="${INSTALL_PROGRAM}" WRKSRC= ${WRKDIR}/tinker/source @@ -46,7 +44,8 @@ FFLAGS+= -mfancy-math-387 -malign-double .endif .if defined(WITH_VIEWER) -USE_XLIB= yes +BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake +USE_XORG= x11 xext xi PLIST_SUB+= WITH_VIEWER="" post-build: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build_viewer diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile index cff472c..a69783b 100644 --- a/biology/xdrawchem/Makefile +++ b/biology/xdrawchem/Makefile @@ -9,8 +9,7 @@ PORTNAME= xdrawchem PORTVERSION= 1.9.9 PORTREVISION= 4 CATEGORIES= biology -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xdrawchem +MASTER_SITES= SF MAINTAINER= hemi@puresimplicity.net COMMENT= Chemical drawing program @@ -23,9 +22,9 @@ USE_QT_VER= 3 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTINCDIR="${X11BASE}/include" \ - QTLIBDIR="${X11BASE}/lib" \ - LDFLAGS="${LDFLAGS} -lm" +CONFIGURE_ENV= QTINCDIR="${LOCALBASE}/include" \ + QTLIBDIR="${LOCALBASE}/lib" \ + LDFLAGS="${LDFLAGS} -lm" MAKE_ARGS+= LDFLAGS+="-lqt-mt ${PTHREAD_LIBS}" diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index a35bebc..7395740 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -28,8 +28,6 @@ USE_MOTIF= yes HAS_CONFIGURE= yes CONFIGURE_ENV+= ALLIANCE_TOP=${ALLIANCE_TOP} CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ - --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include \ --prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET} SUB_FILES= pkg-message diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 0cebc04..b5c91ee 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -108,9 +108,9 @@ SHIA= zsh SHIADEP= ${SHIA} .if !defined(WITH_ED) -. if exists(${X11BASE}/bin/nedit) +. if exists(${LOCALBASE}/bin/nedit) WITH_ED= nedit -RUN_DEPENDS+= ${X11BASE}/bin/nedit:${PORTSDIR}/editors/nedit +RUN_DEPENDS+= ${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit . elif exists(${LOCALBASE}/bin/gvim) WITH_ED= gvim RUN_DEPENDS+= ${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim @@ -125,10 +125,10 @@ WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit . elif exists(${LOCALBASE}/bin/kwrite) WITH_ED= kwrite -RUN_DEPENDS+= ${X11BASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 +RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 . elif exists(${LOCALBASE}/bin/xedit) WITH_ED= xedit -RUN_DEPENDS+= ${X11BASE}/bin/xedit:${PORTSDIR}/x11/xedit +RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit . else WITH_ED= vi . endif @@ -206,12 +206,12 @@ do-configure: -e "s#?vaster?#${vaster}#" \ -e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils ${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#" \ - -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ + -e "s#?XTERM?#${LOCALBASE}/bin/xterm#" \ -e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#" \ -e "s#?SERVER_NAME?#${HOST_NAME}#" \ -e "s#?ASTER_ROOT?#${PREFIX}/aster#" \ -e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs - ${REINPLACE_CMD} -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ + ${REINPLACE_CMD} -e "s#?XTERM?#${LOCALBASE}/bin/xterm#" \ -e "s#?ASTER_VERSION?#${ASTER_VER}#" \ -e "s#langue : ENG#langue : ${ASTK_LANG}#" \ -e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#" \ diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index b827986..c652d59 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -7,7 +7,7 @@ PORTNAME= brlcad PORTVERSION= 7.10.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF @@ -20,9 +20,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_GL= yes +USE_GL= gl +USE_ORG= x11 xt USE_GMAKE= yes -USE_XLIB= yes USE_TK= 85 PREFIX?= ${LOCALBASE}/${PORTNAME} diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index 8dc41e4..3b12877 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -28,8 +28,7 @@ EXTRACT_ONLY+= ${DIST_EXAMPLES} MAINTAINER= maho@FreeBSD.org COMMENT= A Three-Dimensional Structural Finite Element Program -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - arpack.1:${PORTSDIR}/math/arpack \ +LIB_DEPENDS= arpack.1:${PORTSDIR}/math/arpack \ spooles.1:${PORTSDIR}/math/spooles \ metis.1:${PORTSDIR}/math/metis \ taucs.1:${PORTSDIR}/math/taucs @@ -47,7 +46,7 @@ DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX} \ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes -USE_GL= yes +USE_GL= glut BROWSER?= mozilla PSVIEWER?= gv @@ -97,8 +96,7 @@ pre-build: s+%%LAPACK_LIBS%%+${LAPACK_LIBS}+ ; \ s+%%LOCALBASE%%+${LOCALBASE}+g;' \ ${WRKSRC}/ccx_${PORTVERSION}/src/Makefile - @${REINPLACE_CMD} -e 's+%%X11BASE%%+${X11BASE}+g; \ - s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g; \ + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g; \ s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' \ ${WRKSRC}/cgx_${PORTVERSION}/src/Makefile @${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \ diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile index 0ec0b69..d93c74c 100644 --- a/cad/calculix/files/patch-cgx_VER+src+Makefile +++ b/cad/calculix/files/patch-cgx_VER+src+Makefile @@ -6,17 +6,17 @@ -I./ \ -I/usr/include \ - -I/usr/include/GL \ -+ -I%%X11BASE%%/include/GL \ ++ -I$(LOCALBASE)/include/GL \ -I../../libSNL/src \ - -I/usr/X11/include -+ -I%%X11BASE%%/include ++ -I$(LOCALBASE)/include -LFLAGS = \ - -L/usr/lib -lGL -lGLU -lglut \ - -L/usr/X11/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ +LFLAGS += \ -+ -L%%X11BASE%%/lib -lGL -lGLU -lglut \ -+ -L%%X11BASE%%/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ ++ -L$(LOCALBASE)/lib -lGL -lGLU -lglut \ ++ -L$(LOCALBASE)/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ -lm # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile index 2a52744..7d14ce3 100644 --- a/cad/chipmunk/Makefile +++ b/cad/chipmunk/Makefile @@ -7,7 +7,7 @@ PORTNAME= chipmunk PORTVERSION= 5.64 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/ DISTFILES= psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \ @@ -23,7 +23,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An electronic CAD system NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes .include <bsd.port.pre.mk> diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad index e817242..2da2708 100644 --- a/cad/chipmunk/files/patch-ad +++ b/cad/chipmunk/files/patch-ad @@ -16,7 +16,7 @@ ## first one for OS X. -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include -BINDIR = ../../bin +BINDIR = ${PREFIX}/bin @@ -28,7 +28,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib ## ## (2) Library additions diff --git a/cad/chipmunk/files/patch-ae b/cad/chipmunk/files/patch-ae index 1f3c9cf..daad308 100644 --- a/cad/chipmunk/files/patch-ae +++ b/cad/chipmunk/files/patch-ae @@ -5,7 +5,7 @@ LOCINC = ../../../psys/include -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## (1) Choosing your compiler diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af index 42cb565..ae3b823 100644 --- a/cad/chipmunk/files/patch-af +++ b/cad/chipmunk/files/patch-af @@ -23,7 +23,7 @@ ## first one for OS X. -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -32,7 +32,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib ## ## (3) Adding appropriate flags diff --git a/cad/chipmunk/files/patch-ah b/cad/chipmunk/files/patch-ah index 927e879..c505043 100644 --- a/cad/chipmunk/files/patch-ah +++ b/cad/chipmunk/files/patch-ah @@ -16,7 +16,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## (1) Choosing your compiler diff --git a/cad/chipmunk/files/patch-aj b/cad/chipmunk/files/patch-aj index 0bf1295..9560ddc 100644 --- a/cad/chipmunk/files/patch-aj +++ b/cad/chipmunk/files/patch-aj @@ -5,7 +5,7 @@ -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib LIBP2C = ../../psys/src/libp2c.a diff --git a/cad/chipmunk/files/patch-au b/cad/chipmunk/files/patch-au index e941961..5a382b4 100644 --- a/cad/chipmunk/files/patch-au +++ b/cad/chipmunk/files/patch-au @@ -5,7 +5,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib LIBP2C = ../psys/src/libp2c.a diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay index 23aed95..8957470 100644 --- a/cad/chipmunk/files/patch-ay +++ b/cad/chipmunk/files/patch-ay @@ -5,7 +5,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib diff --git a/cad/chipmunk/files/patch-az b/cad/chipmunk/files/patch-az index 2bd2b0f..9e62e23 100644 --- a/cad/chipmunk/files/patch-az +++ b/cad/chipmunk/files/patch-az @@ -14,7 +14,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## diff --git a/cad/cider/Makefile b/cad/cider/Makefile index 58bd9aa..726fdda 100644 --- a/cad/cider/Makefile +++ b/cad/cider/Makefile @@ -7,7 +7,7 @@ PORTNAME= cider PORTVERSION= 1.b1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mita @@ -18,11 +18,11 @@ COMMENT= A mixed-level circuit and device simulator (includes SPICE3) CONFLICTS= spice-[0-9]* WRKSRC= ${WRKDIR}/sim -USE_XLIB= yes MAN1= sconvert.1 nutmeg.1 spice.1 cider.1 MAN3= mfb.3 MAN5= mfbcap.5 MLINKS= spice.1 spice3.1 +USE_XORG= xt xaw xmu MAKE_ENV+= CC="${CC}" diff --git a/cad/cider/files/FreeBSD b/cad/cider/files/FreeBSD index a0906fa..340d053 100644 --- a/cad/cider/files/FreeBSD +++ b/cad/cider/files/FreeBSD @@ -4,7 +4,7 @@ MAKE = /usr/bin/make INTERFACE_OPTS = -DWANT_X11 CC_OPT = $(CFLAGS) #CC_OPT_SAFE = $(CFLAGS) -fno-strength-reduce -X_DIR = $(X11BASE) -LDFLAGS = -L$(X11BASE)/lib -lm -ltermcap +X_DIR = $(LOCALBASE) +LDFLAGS = -L$(LOCALBASE)/lib -lm -ltermcap ASM_HACK = < /dev/null SYS_CFLAGS = -Dbsd diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 862b754..8c604b2 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -7,7 +7,7 @@ PORTNAME= dinotrace DISTVERSION= 9.3b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.veripool.com/ftp/ EXTRACT_SUFX= .tgz @@ -19,7 +19,7 @@ USE_GNOME= gnometarget GNU_CONFIGURE= yes USE_MOTIF= yes USE_PERL5_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 sm ice xmu xt USE_GMAKE= yes INFO= dinotrace diff --git a/cad/electric/Makefile b/cad/electric/Makefile index 52abcdf..854642e 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -58,7 +58,7 @@ post-patch: s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|@PTHREAD_LIBS@|${PTHREAD_LIBS:S/"//g}|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/configure .for FEATURE in ${FEATURES} @${REINPLACE_CMD} -e 's|#%%${FEATURE}%%||g' ${WRKSRC}/Makefile.in .endfor diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile index fcb35f7..02c0d70 100644 --- a/cad/feappv/Makefile +++ b/cad/feappv/Makefile @@ -7,7 +7,7 @@ PORTNAME= feappv PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MASTER_SITES= http://www.ce.berkeley.edu/~rlt/feappv/ MASTER_SITE_SUBDIR= feap @@ -25,7 +25,7 @@ USE_ZIP= yes EXTRACT_BEFORE_ARGS= -L WRKSRC= ${WRKDIR}/ver20 -USE_XLIB= yes +USE_XORG= x11 USE_FORTRAN= yes FFLAGS+= -O2 MAKEFILE= makefile @@ -34,7 +34,7 @@ ALL_TARGET= install post-patch: @${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g; s+%%CC%%+${CC}+g; \ s+%%FFLAGS%%+${FFLAGS}+g; s+%%CFLAGS%%+${CFLAGS}+g; \ - s+/usr/X11R6+${X11BASE}+g; s+%%WRKSRC%%+${WRKSRC}+;' \ + s+/usr/X11R6+${LOCALBASE}+g; s+%%WRKSRC%%+${WRKSRC}+;' \ ${WRKSRC}/makefile.in do-install: diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile index 8199fb0..fda08c1 100644 --- a/cad/freehdl/Makefile +++ b/cad/freehdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= freehdl PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= http://www.home.hs-karlsruhe.de/~fado0011/ \ http://cran.mit.edu/~enaroska/ @@ -19,10 +19,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \ - --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/info +CONFIGURE_ARGS= --infodir=${PREFIX}/info \ + --mandir=${MANPREFIX}/man MAN1= freehdl-config.1 \ freehdl-gennodes.1 \ diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 8bab0a0..2f4848c 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -28,7 +28,7 @@ TETGEN_SRC= predicates.cxx tetgen.cxx tetgen.h GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-fltk-prefix=${X11BASE} \ +CONFIGURE_ARGS= --with-fltk-prefix=${LOCALBASE} \ --with-gsl-prefix=${LOCALBASE} \ --with-jpeg-prefix=${LOCALBASE} \ --with-png-prefix=${LOCALBASE} diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile index 1b813dc..e53a6a5 100644 --- a/cad/gspiceui/files/patch-src_Makefile +++ b/cad/gspiceui/files/patch-src_Makefile @@ -25,7 +25,7 @@ # Includes -INCLUDES = -I/usr/include -I/usr/X11R6/include -I. -+INCLUDES = -I/usr/include -I${X11BASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags) ++INCLUDES = -I/usr/include -I${LOCALBASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags) # Libraries # (The pkg-config stuff was requested by a user, somehow pangox was missing) diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 7afb580..8b3b19e 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave DOCS= doc/*.html doc/*.png doc/*.ps diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile index 8729cee..e688337 100644 --- a/cad/gwave/Makefile +++ b/cad/gwave/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \ USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" OPTIONS= PLOTUTILS "Use GNU plotutils for plotting" off \ GNUPLOT "Use gnuplot for plotting" on \ diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile index db778e9..5890dd2 100644 --- a/cad/irsim/Makefile +++ b/cad/irsim/Makefile @@ -7,7 +7,7 @@ PORTNAME= irsim PORTVERSION= 9.7.64 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/irsim/archive/ EXTRACT_SUFX= .tgz @@ -15,13 +15,13 @@ EXTRACT_SUFX= .tgz MAINTAINER= stas@FreeBSD.org COMMENT= An event-driven logic-level simulator for MOS circuis -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/scripts/ -CFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= PIC_CFLAGS="-fpic" LDFLAGS="${LDFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile index 4383654..d2ed545 100644 --- a/cad/jspice3/Makefile +++ b/cad/jspice3/Makefile @@ -7,7 +7,7 @@ PORTNAME= jspice3 PORTVERSION= 2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://www.wrcad.com/ftp/pub/ \ ftp://ftp.srware.com/pub/ @@ -22,7 +22,7 @@ OPTIONS= X "Use X window system" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_X) -USE_XLIB= yes +USE_XORG= x11 xaw xt .endif pre-configure: diff --git a/cad/jspice3/files/patch-build b/cad/jspice3/files/patch-build index 23dd41e..9fd79ec 100644 --- a/cad/jspice3/files/patch-build +++ b/cad/jspice3/files/patch-build @@ -14,7 +14,7 @@ if [ -f conf/util/configure ]; then cd conf - util/configure -srcdir . -+ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${X11BASE}/include" -x-libraries="${X11BASE}/lib" ++ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${LOCALBASE}/include" -x-libraries="${LOCALBASE}/lib" if [ ! -f ../src/include/config.h ] || \ [ "`diff config.h ../src/include/config.h |head`" ]; then echo Installing config.h diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 050d793..902c2be 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -74,16 +74,16 @@ pre-configure: ${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|' \ -e 's|LD = gcc|LD = ${CC}|' \ -e 's|LD = g++|LD = ${CXX}|' \ - -e 's|-O2|${CFLAGS} -I${X11BASE}/include|' \ + -e 's|-O2|${CFLAGS} -I${LOCALBASE}/include|' \ -e 's|wx-config|${WX_CONFIG}|' \ - -e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|' \ + -e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|' \ -e 's|libs.linux|libs.${OPSYS}|' \ -e 's|gcc -D|${CC} -D|' $$f ; \ done ${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \ -e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \ -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp - ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|' \ + ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \ -e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \ ${WRKSRC}/common/eda_doc.cpp diff --git a/cad/kicad-devel/files/patch-3d-viewer_makefile.include b/cad/kicad-devel/files/patch-3d-viewer_makefile.include index 4afef4e..e0ae0ad 100644 --- a/cad/kicad-devel/files/patch-3d-viewer_makefile.include +++ b/cad/kicad-devel/files/patch-3d-viewer_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = -EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include ++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include CPPFLAGS += $(EXTRACPPFLAGS) diff --git a/cad/kicad-devel/files/patch-cvpcb_makefile.include b/cad/kicad-devel/files/patch-cvpcb_makefile.include index abe33ee..89f4e6c 100644 --- a/cad/kicad-devel/files/patch-cvpcb_makefile.include +++ b/cad/kicad-devel/files/patch-cvpcb_makefile.include @@ -5,7 +5,7 @@ OBJSUFF = o -EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include EXTRALIBS = ../common/common.a LIBVIEWER3D = ../3d-viewer/3d-viewer.a diff --git a/cad/kicad-devel/files/patch-gerbview_makefile.include b/cad/kicad-devel/files/patch-gerbview_makefile.include index 0479d92..72f76b6 100644 --- a/cad/kicad-devel/files/patch-gerbview_makefile.include +++ b/cad/kicad-devel/files/patch-gerbview_makefile.include @@ -4,7 +4,7 @@ EXTRALIBS = ../common/common.a EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\ - -I../share -I../pcbnew -I../3d-viewer -+ -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD index ceff283..faea1d4 100644 --- a/cad/kicad-devel/files/patch-libs.FreeBSD +++ b/cad/kicad-devel/files/patch-libs.FreeBSD @@ -116,7 +116,7 @@ + -lz\ $(LIBREGEX)\ - /usr/X11R6/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -133,8 +133,8 @@ $(LIBS3D)\ - /usr/X11R6/lib/libXinerama.a \ - /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXxf86vm.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -162,11 +162,11 @@ # attention à l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) $(PYLIBS) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS_WITH_GL = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) $(PYLIBS) diff --git a/cad/kicad-devel/files/patch-pcbnew_makefile.include b/cad/kicad-devel/files/patch-pcbnew_makefile.include index 69b12eb..d680604 100644 --- a/cad/kicad-devel/files/patch-pcbnew_makefile.include +++ b/cad/kicad-devel/files/patch-pcbnew_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = ../common/common.a -EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \ # class_edge_mod.h class_equipot.h diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 050d793..902c2be 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -74,16 +74,16 @@ pre-configure: ${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|' \ -e 's|LD = gcc|LD = ${CC}|' \ -e 's|LD = g++|LD = ${CXX}|' \ - -e 's|-O2|${CFLAGS} -I${X11BASE}/include|' \ + -e 's|-O2|${CFLAGS} -I${LOCALBASE}/include|' \ -e 's|wx-config|${WX_CONFIG}|' \ - -e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|' \ + -e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|' \ -e 's|libs.linux|libs.${OPSYS}|' \ -e 's|gcc -D|${CC} -D|' $$f ; \ done ${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \ -e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \ -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp - ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|' \ + ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \ -e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \ ${WRKSRC}/common/eda_doc.cpp diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include index 4afef4e..e0ae0ad 100644 --- a/cad/kicad/files/patch-3d-viewer_makefile.include +++ b/cad/kicad/files/patch-3d-viewer_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = -EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include ++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include CPPFLAGS += $(EXTRACPPFLAGS) diff --git a/cad/kicad/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include index abe33ee..89f4e6c 100644 --- a/cad/kicad/files/patch-cvpcb_makefile.include +++ b/cad/kicad/files/patch-cvpcb_makefile.include @@ -5,7 +5,7 @@ OBJSUFF = o -EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include EXTRALIBS = ../common/common.a LIBVIEWER3D = ../3d-viewer/3d-viewer.a diff --git a/cad/kicad/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include index 0479d92..72f76b6 100644 --- a/cad/kicad/files/patch-gerbview_makefile.include +++ b/cad/kicad/files/patch-gerbview_makefile.include @@ -4,7 +4,7 @@ EXTRALIBS = ../common/common.a EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\ - -I../share -I../pcbnew -I../3d-viewer -+ -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD index ceff283..faea1d4 100644 --- a/cad/kicad/files/patch-libs.FreeBSD +++ b/cad/kicad/files/patch-libs.FreeBSD @@ -116,7 +116,7 @@ + -lz\ $(LIBREGEX)\ - /usr/X11R6/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -133,8 +133,8 @@ $(LIBS3D)\ - /usr/X11R6/lib/libXinerama.a \ - /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXxf86vm.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -162,11 +162,11 @@ # attention à l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) $(PYLIBS) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS_WITH_GL = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) $(PYLIBS) diff --git a/cad/kicad/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include index 69b12eb..d680604 100644 --- a/cad/kicad/files/patch-pcbnew_makefile.include +++ b/cad/kicad/files/patch-pcbnew_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = ../common/common.a -EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \ # class_edge_mod.h class_equipot.h diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index bf612471..85acf2e 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -39,8 +39,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e \ - 's|%%X11BASE%%|${X11BASE}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ + 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/config.mk diff --git a/cad/leocad/files/patch-config.mk b/cad/leocad/files/patch-config.mk index 8f9dc51..262869e 100644 --- a/cad/leocad/files/patch-config.mk +++ b/cad/leocad/files/patch-config.mk @@ -22,7 +22,7 @@ $FreeBSD$ OS := -DLC_LINUX OSDIR := linux -PREFIX := /usr/local -+PREFIX := %%X11BASE%% ++PREFIX := %%LOCALBASE%% GTK_CONFIG := gtk12-config -CPPFLAGS += -L/usr/local/lib +CPPFLAGS += ${CFLAGS} -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%% diff --git a/cad/linux-gid/Makefile b/cad/linux-gid/Makefile index 03d2d9d..3723dfa 100644 --- a/cad/linux-gid/Makefile +++ b/cad/linux-gid/Makefile @@ -20,7 +20,7 @@ CONFLICTS= id-utils-[0-9]* coreutils-[0-9]* ONLY_FOR_ARCHS= i386 USE_LINUX= yes -#USE_X_PREFIX= yes +USE_XLIB= yes REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 0055457..5b0e758 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -7,16 +7,16 @@ PORTNAME= magic PORTVERSION= 7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= http://vlsi.cornell.edu/magic/ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive editor for VLSI layouts -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes -MAKE_ENV= CADDIR="${PREFIX}" X11BASE="${X11BASE}" +MAKE_ENV= CADDIR="${PREFIX}" ALL_TARGET= mains BINS= XHelper7 ext2sim ext2spice extcheck magic magicusage net2ir diff --git a/cad/magic/files/defs.mak b/cad/magic/files/defs.mak index fd1f5c3..3082889 100644 --- a/cad/magic/files/defs.mak +++ b/cad/magic/files/defs.mak @@ -28,9 +28,9 @@ READLINE_LIBS = -lreadline -ltermcap DEPEND_FLAG = -MM DEPEND_FILE = Depend -GR_CFLAGS = -I${X11BASE}/include +GR_CFLAGS = -I${LOCALBASE}/include GR_DFLAGS = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\" -GR_LIBS = -L${X11BASE}/lib -lX11 +GR_LIBS = -L${LOCALBASE}/lib -lX11 GR_SRCS = ${X11_SRCS} GR_HELPER_SRCS = ${X11HELPER_SRCS} GR_HELPER_PROG = ${X11HELP_PROG} diff --git a/cad/mars/files/patch-01 b/cad/mars/files/patch-01 index ac8f7e7..899605d 100644 --- a/cad/mars/files/patch-01 +++ b/cad/mars/files/patch-01 @@ -6,8 +6,8 @@ # only if they are not in a standard directory. -LIBDIRS = -INCDIRS = -+LIBDIRS = -L${X11BASE}/lib -+INCDIRS = -I${X11BASE}/include ++LIBDIRS = -L${LOCALBASE}/lib ++INCDIRS = -I${LOCALBASE}/include #LIBDIRS = -L/usr/imports/lib/X11R5 #INCDIRS = -I/usr/imports/include diff --git a/cad/mars/files/patch-08 b/cad/mars/files/patch-08 index e30b943..ffb4e6c 100644 --- a/cad/mars/files/patch-08 +++ b/cad/mars/files/patch-08 @@ -6,8 +6,8 @@ # only if they are not in a standard directory. -LIBDIRS = -INCDIRS = -+LIBDIRS = -L$(X11BASE)/lib -+INCDIRS = -I$(X11BASE)/include ++LIBDIRS = -L$(LOCALBASE)/lib ++INCDIRS = -I$(LOCALBASE)/include #LIBDIRS = -L/usr/imports/lib/X11R5 #INCDIRS = -I/usr/imports/include/X11R5 -I/usr/imports/include diff --git a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD index 5632330..a42eb4c8 100644 --- a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD +++ b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD @@ -6,13 +6,13 @@ CFLAGS2 = -CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL -CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)` -+CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DFREEBSD -DOPENGL -DNGSOLVE \ ++CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(LOCALBASE)/include -DFREEBSD -DOPENGL -DNGSOLVE \ + -ftemplate-depth-99 -finline-limit=20000 \ + -funroll-loops + +CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step -I$(TCL_INCLUDEDIR) -I$(TK_INCLUDEDIR) # - LINKFLAGS2 = -L$(LOCALBASE)/lib -L$(X11BASE)/lib + LINKFLAGS2 = -L$(LOCALBASE)/lib SYSLIB2 = -lstdc++ + diff --git a/cad/netgen/files/patch-togl::Makefile b/cad/netgen/files/patch-togl::Makefile index 6a7bf9b..c714582 100644 --- a/cad/netgen/files/patch-togl::Makefile +++ b/cad/netgen/files/patch-togl::Makefile @@ -29,7 +29,7 @@ # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: -INCLUDES = -I/usr/local/include -I/usr/include/tcl -I/usr/freeware/include -+INCLUDES = -I$(X11BASE)/include $(CPLUSPLUSFLAGS3) ++INCLUDES = -I$(LOCALBASE)/include $(CPLUSPLUSFLAGS3) # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: -LIBDIRS = -L/usr/local/lib diff --git a/cad/opencascade-tutorial/Makefile b/cad/opencascade-tutorial/Makefile index 2c8b16f..ff4f889 100644 --- a/cad/opencascade-tutorial/Makefile +++ b/cad/opencascade-tutorial/Makefile @@ -22,8 +22,8 @@ USE_BZIP2= yes USE_GL= yes USE_QT_VER= 3 HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-gl-include=${X11BASE}/include \ - --with-gl-library=${X11BASE}/lib \ +CONFIGURE_ARGS= --with-gl-include=${LOCALBASE}/include \ + --with-gl-library=${LOCALBASE}/lib \ --with-qt-dir=${QTDIR} \ --enable-qt-mt \ --with-cascade-dir=${CASROOT} @@ -48,7 +48,7 @@ PLIST_SUB= INSTDIR=${LINSTDIR} pre-configure: ${CHMOD} a+x ${WRKSRC}/${CONFIGURE_SCRIPT} ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b4130e0..06549b8 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -56,17 +56,17 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ --with-java-include=${JAVA_HOME}/include \ - --with-dps-include=${X11BASE}/include \ - --with-dps-library=${X11BASE}/lib \ - --with-gl-include=${X11BASE}/include \ - --with-gl-library=${X11BASE}/lib \ - --with-xmu-include=${X11BASE}/include/X11 \ - --with-xmu-library=${X11BASE}/lib \ + --with-dps-include=${LOCALBASE}/include \ + --with-dps-library=${LOCALBASE}/lib \ + --with-gl-include=${LOCALBASE}/include \ + --with-gl-library=${LOCALBASE}/lib \ + --with-xmu-include=${LOCALBASE}/include/X11 \ + --with-xmu-library=${LOCALBASE}/lib \ --with-stlport-include=${LOCALBASE}/include/stlport \ --with-stlport-libname=stlport_${STL_COMPILER} \ --with-stlport-library=${LOCALBASE}/lib \ --enable-production=yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include \ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH} # We strip the libs MAKE_ENV= INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}" \ @@ -177,12 +177,12 @@ pre-configure: -e 's|/usr/bin/gcc|${CC}|' \ -e 's|%%JAVAHOME%%|${JAVA_HOME}|' \ -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/src/OS/Draw.tcl \ ${WRKSRC}/src/OS/Visualization.tcl \ ${WRKSRC}/src/OS/ApplicationFramework.tcl ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|'\ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|/usr/local/bin/tclsh8.4|${TCLSH}|'\ ${PATCH_WRKSRC}/wok/site/wokinit.csh \ ${WRKSRC}/src/WOKsite/wokinit.csh \ diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 71b4f4b..3bfc376 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -9,8 +9,7 @@ PORTNAME= pcb PORTVERSION= 20060822 PORTREVISION= 1 CATEGORIES= cad -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hrs@FreeBSD.org COMMENT= X11 interactive printed circuit board layout system @@ -28,8 +27,8 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes USE_TK_RUN= 83 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" .if !defined(NOPORTDOCS) INFO= pcb diff --git a/cad/qcad-partslib/Makefile b/cad/qcad-partslib/Makefile index a33e302c..0fe884e 100644 --- a/cad/qcad-partslib/Makefile +++ b/cad/qcad-partslib/Makefile @@ -7,7 +7,7 @@ PORTNAME= qcad-partslib PORTVERSION= 2.1.2.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://www.ribbonsoft.com/archives/partlibrary/ DISTNAME= partlibrary-${PORTVERSION:S/.1$/-1/} @@ -20,7 +20,6 @@ BUILD_DEPENDS= qcad:${PORTSDIR}/cad/qcad WRKSRC= ${WRKDIR}/partlibrary-${PORTVERSION:S/.1$/-1/} DATADIR= ${PREFIX}/share/qcad/library -USE_X_PREFIX= yes USE_ZIP= yes NO_BUILD= yes PLIST= ${WRKDIR}/pkg-plist diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 167d194..2180de4 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -7,8 +7,7 @@ PORTNAME= qcad PORTVERSION= 2.0.5.0.1 -PORTREVISION= 1 -#PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://www.ribbonsoft.com/archives/qcad/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src @@ -23,7 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src QTDIR?= ${QT_PREFIX} -USE_X_PREFIX= yes USE_QT_VER= 3 USE_GMAKE= yes PLIST= ${WRKDIR}/pkg-plist diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile index 2ad219d..955bab8 100644 --- a/cad/slffea/Makefile +++ b/cad/slffea/Makefile @@ -10,8 +10,7 @@ PORTNAME= slffea PORTVERSION= 1.3 PORTREVISION= 4 CATEGORIES= cad -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}13 EXTRACT_SUFX= .tgz @@ -22,7 +21,7 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut CONFLICTS= swi-pl-[0-9]* TenDRA-[0-9]* -CFLAGS+= -I${X11BASE}/include ${PTHREAD_CFLAGS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} WRKSRC= ${WRKDIR}/${PORTNAME}-1.3 ALL_TARGET= everything @@ -39,9 +38,9 @@ post-patch: ${REINPLACE_CMD} -E -e "s|^CC = .*|CC = ${CC} ${CFLAGS}|g" \ -e "s|-lglut|-lglut ${PTHREAD_LIBS}|g" \ -e "s|/usr/local|${LOCALBASE}|g" \ - -e "s|/usr/X/|${X11BASE}/|g" \ - -e "s|/usr/X11/|${X11BASE}/|g" \ - -e "s|/usr/X11R6/|${X11BASE}/|g") + -e "s|/usr/X/|${LOCALBASE}/|g" \ + -e "s|/usr/X11/|${LOCALBASE}/|g" \ + -e "s|/usr/X11R6/|${LOCALBASE}/|g") do-install: .for file in ${EXEC} diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 3a14cea..ada632a 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -7,7 +7,7 @@ PORTNAME= spice PORTVERSION= 3f5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources DISTFILES= spice3f5${EXTRACT_SUFX}:sources \ @@ -31,7 +31,7 @@ PKGNAMESUFFIX= -without-x11 COMMENT= A general-purpose circuit simulation program (non-X11 version) MAKE_ARGS+= -DWITHOUT_X11 .else -USE_XLIB= yes +USE_XORG= x11 xaw xext xmu xt .endif .include <bsd.port.pre.mk> @@ -43,7 +43,7 @@ do-configure: @${CP} ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD @${CP} ${FILESDIR}/FreeBSD.without_x11 ${WRKSRC}/conf/FreeBSD.without_x11 @${REINPLACE_CMD} -e 's+@CC@+${CC}+ ; s+@CFLAGS@+${CFLAGS}+ ; \ - s+@X11BASE@+${X11BASE}+;' \ + s+@X11BASE@+${LOCALBASE}+;' \ ${WRKSRC}/conf/FreeBSD ${WRKSRC}/conf/FreeBSD.without_x11 post-install: diff --git a/cad/spice/files/patch-conf_defaults b/cad/spice/files/patch-conf_defaults index 2260890..c5d6e9b 100644 --- a/cad/spice/files/patch-conf_defaults +++ b/cad/spice/files/patch-conf_defaults @@ -39,7 +39,7 @@ # a convenience that is used in the following definitions. -X_DIR = /usr -+X_DIR = ${X11BASE} ++X_DIR = ${LOCALBASE} # INCX lists the X include directories. This may be different between # MIT X11r5, X11r4, and your vendor's version of X11, though listing diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile index 8b443e7..9548281 100644 --- a/cad/tclspice/Makefile +++ b/cad/tclspice/Makefile @@ -25,7 +25,7 @@ AUTOMAKE_ARGS= -c -a USE_GMAKE= yes ALL_TARGET= tcl INSTALL_TARGET= install-tcl -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_FILES= pkg-message diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index d6770f4..cff9278 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -7,7 +7,7 @@ PORTNAME= tkgate PORTVERSION= 1.8.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= ftp://gadoid.ices.cmu.edu/pub/tkgate/ EXTRACT_SUFX= .tgz @@ -17,16 +17,16 @@ COMMENT= A Tcl/Tk based digital circuit editor and simulator LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 RUN_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake HAS_CONFIGURE= yes USE_BISON= build -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= VERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/Imakefile ${WRKSRC}/config.h .include <bsd.port.mk> diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile index df54601..5d31eda 100644 --- a/cad/varkon/Makefile +++ b/cad/varkon/Makefile @@ -45,7 +45,7 @@ post-patch: @${REINPLACE_CMD} -e 's+%%VARKON_PREFIX%%+${VARKON_PREFIX}+ ; s+%%DOCSDIR%%+${DOCSDIR}+g ' \ ${VARKON_ROOT}/com/english/varkon @${FIND} ${WRKSRC} -name 'Makefile.FreeBSD' -print0 | ${XARGS} -0 \ - ${REINPLACE_CMD} -e 's+/usr/X11R6+${X11BASE}+g' + ${REINPLACE_CMD} -e 's+/usr/X11R6+${LOCALBASE}+g' do-build: @(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} make_varkon ) diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 0fa3438..57be451 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcircuit PORTVERSION= 3.4.22 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ \ @@ -17,8 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= shaun@FreeBSD.org COMMENT= An X11 drawing program [especially for circuit schematics] -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xt USE_TCL= 84 USE_TCL_BUILD= 84 USE_TK= 84 diff --git a/cad/z88/Makefile b/cad/z88/Makefile index 5cad487..b8c2e83 100644 --- a/cad/z88/Makefile +++ b/cad/z88/Makefile @@ -42,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g' \ ${WRKSRC}/z88kernel.mk @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g ; \ - s+%%X11BASE%%+${X11BASE}+g;' \ + s+%%LOCALBASE%%+${LOCALBASE}+g;' \ ${WRKSRC}/z88other.mk @${REINPLACE_CMD} -e 's+%%PREFIX%%+${PREFIX}+g; ' \ ${WRKSRC}/z88.sh diff --git a/cad/z88/files/patch-z88.mk.other b/cad/z88/files/patch-z88.mk.other index 7e5cb21..cf925d8 100644 --- a/cad/z88/files/patch-z88.mk.other +++ b/cad/z88/files/patch-z88.mk.other @@ -8,16 +8,16 @@ -CFLAGS = -mcpu=i486 -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG -O3\ - -fomit-frame-pointer +CC = %%CC%% -+CFLAGS =%%CFLAGS%% -I. -I%%X11BASE%%/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG ++CFLAGS =%%CFLAGS%% -I. -I%%LOCALBASE%%/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG LDLIBSOM = -lc LDLIBSOX = -lm -lc -LDLIBSNX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc -LDLIBSMX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -LDLIBSMO = -L/usr/X11R6/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -+LDLIBSNX = -L%%X11BASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc -+LDLIBSMX = -L%%X11BASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -+LDLIBSMO = -L%%X11BASE%%/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc ++LDLIBSNX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc ++LDLIBSMX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc ++LDLIBSMO = -L%%LOCALBASE%%/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc OBJECTSE = z88e.o ale88e.o dyn88e.o clr88.o m1.o m2.o stop88e.o cshe88.o\ hexa88.o lqua88.o qshe88.o isod88.o tetr88.o spur88.o spla88.o hpla88.o\ diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile index 8abfdc7..d5cf7fe 100644 --- a/chinese/BBMan/Makefile +++ b/chinese/BBMan/Makefile @@ -7,9 +7,9 @@ PORTNAME= BBMan PORTVERSION= 1.7.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:L} DISTNAME= ${PORTNAME}-src-v${PORTVERSION:S,.,-,g} @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= BBMan is a BBS client for X Window System WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes USE_ZIP= yes USE_WX= 2.4 USE_GCC= 3.3 diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile index d881e13..0ff5bb0 100644 --- a/chinese/auto-cn-l10n/Makefile +++ b/chinese/auto-cn-l10n/Makefile @@ -27,7 +27,7 @@ OPTIONS= WQY "WenQuanYi Bitmap Song Font" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_WQY) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy .endif .if defined(WITH_FIREFLYTTF) @@ -52,7 +52,7 @@ RUN_DEPENDS+= relaxconf:${PORTSDIR}/sysutils/relaxconf .endif post-patch: - @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g; \ + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc do-install: diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile index 449c46d..0dd7e79 100644 --- a/chinese/chinput3/Makefile +++ b/chinese/chinput3/Makefile @@ -7,7 +7,7 @@ PORTNAME= chinput PORTVERSION= 3.0.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese x11 MASTER_SITES= http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/ \ http://www.gtlib.gatech.edu/pub/FreeBSD/distfiles/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Chinese GB2312,BIG5 code input server LATEST_LINK= zh-chinput3 -USE_XLIB= yes +USE_XORG= x11 xt USE_GETTEXT= yes USE_GNOME= gtk12 imlib USE_LDCONFIG= ${PREFIX}/lib/Chinput/im/ @@ -42,7 +42,7 @@ pre-build: s|-I/usr/include|-I${LOCALBASE}/include|; \ s|-L/usr/lib|-L${LOCALBASE}/lib|; \ s|-L/usr/X11R6|-L${LOCALBASE}/lib -L/usr/X11R6|; \ - s|/usr/X11R6|${X11BASE}|' + s|/usr/X11R6|${LOCALBASE}|' post-install: @${CAT} ${PKGMESSAGE} diff --git a/chinese/chinput3/files/pkg-message.in b/chinese/chinput3/files/pkg-message.in index eb3bb5e..7d5d416 100644 --- a/chinese/chinput3/files/pkg-message.in +++ b/chinese/chinput3/files/pkg-message.in @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- Please check the following files: - %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS -If not exist, copy %%X11BASE%%/lib/X11/locale/zh/XI18N_OBJS to it. + %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +If not exist, copy %%LOCALBASE%%/lib/X11/locale/zh/XI18N_OBJS to it. Remember to set environment varible XMODIFIERS: csh/tcsh: setenv XMODIFIERS @im=Chinput diff --git a/chinese/cmexfonts/Makefile b/chinese/cmexfonts/Makefile index 6b0b172..fd3c2ef 100644 --- a/chinese/cmexfonts/Makefile +++ b/chinese/cmexfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= cmexfonts PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/fonts @@ -15,10 +15,11 @@ MASTER_SITE_SUBDIR= X11/fonts MAINTAINER= ports@FreeBSD.org COMMENT= Big5+ Chinese Mingti bitmap font (by CMEX & DynaLab) for X11 -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes WRKSRC= ${WRKDIR}/cmexfonts diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile index 651bae8..e0a23bf 100644 --- a/chinese/cxterm/Makefile +++ b/chinese/cxterm/Makefile @@ -8,7 +8,7 @@ PORTNAME= cxterm PORTVERSION= 5.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11 MASTER_SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/ \ http://www.525183.com/freebsd/cxterm/ \ @@ -23,8 +23,10 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= sunrychen@gmail.com COMMENT= An xterm that speaks Chinese -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/cxterm-5.0 USE_IMAKE= yes diff --git a/chinese/cxterm/scripts/pre-install b/chinese/cxterm/scripts/pre-install index a03377b..8526701 100644 --- a/chinese/cxterm/scripts/pre-install +++ b/chinese/cxterm/scripts/pre-install @@ -22,7 +22,7 @@ echo "" >> $CXTERM_SH # look for Simple fonts from the X11R6 misc fonts collection -if [ ! -f ${X11BASE}/lib/X11/fonts/misc/gb16st.pcf.Z ]; then +if [ ! -f ${LOCALBASE}/lib/X11/fonts/misc/gb16st.pcf.Z ]; then echo "" echo "You need to install the X11R6 misc fonts in order to get the" echo "Simple Chinese fonts." diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile index 710480d..dfe5304 100644 --- a/chinese/eterm/Makefile +++ b/chinese/eterm/Makefile @@ -20,6 +20,6 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts .include "${MASTERDIR}/Makefile" diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index b7aa813..d565667 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -54,7 +54,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR} .if !defined(WITHOUT_X11) - ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf + ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf .endif .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" diff --git a/chinese/fireflyttf/pkg-plist b/chinese/fireflyttf/pkg-plist index 51ad1eb..7fa95af 100644 --- a/chinese/fireflyttf/pkg-plist +++ b/chinese/fireflyttf/pkg-plist @@ -1,3 +1,3 @@ -%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi +%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi %%FONTSDIR%%/local.conf-sung -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%X11BASE%%/etc/fonts/local.conf +%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%LOCALBASE%%/etc/fonts/local.conf diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile index f78021f..f1a33dd 100644 --- a/chinese/gcin-devel/Makefile +++ b/chinese/gcin-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.3.9 +PORTREVISION= 1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ @@ -22,7 +23,7 @@ USE_BZIP2= YES HAS_CONFIGURE= YES USE_GNOME= gtk20 USE_GMAKE= YES -USE_GCC= 3.4+ +USE_XORG= xtst INSTALLS_ICONS= YES USE_LDCONFIG= YES OPTIONS= BOSHIAMY "enable Boshiamy Input Method" off @@ -58,17 +59,17 @@ pre-patch: @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \ - s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ + s,/usr/include,${LOCALBASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ ${WRKSRC}/qt-im/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile - @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \ + @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare @${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ ${WRKSRC}/gtk-im/gtkimcontextgcin.c - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index f78021f..f1a33dd 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.3.9 +PORTREVISION= 1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ @@ -22,7 +23,7 @@ USE_BZIP2= YES HAS_CONFIGURE= YES USE_GNOME= gtk20 USE_GMAKE= YES -USE_GCC= 3.4+ +USE_XORG= xtst INSTALLS_ICONS= YES USE_LDCONFIG= YES OPTIONS= BOSHIAMY "enable Boshiamy Input Method" off @@ -58,17 +59,17 @@ pre-patch: @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \ - s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ + s,/usr/include,${LOCALBASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ ${WRKSRC}/qt-im/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile - @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \ + @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare @${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ ${WRKSRC}/gtk-im/gtkimcontextgcin.c - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile index baee248..b36705e 100644 --- a/chinese/gugod-clean/Makefile +++ b/chinese/gugod-clean/Makefile @@ -5,23 +5,23 @@ PORTNAME= gugod-clean PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/gugod/ MAINTAINER= gugod@gugod.org COMMENT= A pretty font modifyed from X11 schumacher-clean that match kcfonts -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale FONTFILES= gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf WRKSRC= ${WRKDIR} NO_BUILD= yes SHAREMODE= 644 -XFONTDIR= ${X11BASE}/lib/X11/fonts/local +XFONTDIR= ${LOCALBASE}/lib/X11/fonts/local do-install: @${MKDIR} ${XFONTDIR} diff --git a/chinese/hanzim/files/patch-Makefile b/chinese/hanzim/files/patch-Makefile index 8234eae..49b7177 100644 --- a/chinese/hanzim/files/patch-Makefile +++ b/chinese/hanzim/files/patch-Makefile @@ -32,7 +32,7 @@ # location of x library -LIBXDIR = -L /usr/X11/lib -+LIBXDIR = -L${X11BASE}/lib ++LIBXDIR = -L${LOCALBASE}/lib # you might need to change "libtcl" and "libtk" to "libtcl8.x" and "libtk8.x" -LIBS = $(LIBXDIR) $(LIBTCLDIR) -ltk -ltcl -lX11 -lm -ldl @@ -47,7 +47,7 @@ -CC = cc -DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -CFLAGS = -O2 $(DEFINES) -+DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${X11BASE}/include ++DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include +CFLAGS += $(DEFINES) #CFLAGS = -O2 -Wall -pedantic -ansi $(DEFINES) LFLAGS = $(LIBS) -s diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index 53d7657..3e451f0 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -32,8 +32,8 @@ LE_TARGETS= newpy .if !defined(WITHOUT_XAUX) LE_TARGETS+= newpy/xaux USE_MOTIF= yes -CFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WANT_XAUX="" .else PLIST_SUB+= WANT_XAUX="@comment " diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile index 7b39edb..43a6c85 100644 --- a/chinese/iiimf-le-xcin/Makefile +++ b/chinese/iiimf-le-xcin/Makefile @@ -7,7 +7,7 @@ PORTNAME= iiimf-le-xcin PORTVERSION= 0.1.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese textproc MASTER_SITES= http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/ EXTRACT_SUFX= -11.src.rpm @@ -20,7 +20,6 @@ RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server WRKSRC= ${WRKDIR}/iiimf-xcin USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= libxml2 USE_AUTOTOOLS= automake:19 autoheader:261 autoconf:261 libtool:15 AUTOMAKE_ARGS= --add-missing diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile index 4f33536..8475264 100644 --- a/chinese/libtabe/Makefile +++ b/chinese/libtabe/Makefile @@ -7,7 +7,7 @@ PORTNAME= libtabe PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 PLIST_SUB+= X11="" .else CONFIGURE_ARGS+=--without-x diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile index 94d12a7..16e845c 100644 --- a/chinese/miniChinput/Makefile +++ b/chinese/miniChinput/Makefile @@ -7,10 +7,9 @@ PORTNAME= miniChinput PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= minichinput +MASTER_SITES= SF/minichinput MAINTAINER= ports@FreeBSD.org COMMENT= A tiny version of Chinput @@ -18,7 +17,7 @@ COMMENT= A tiny version of Chinput GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes -USE_XLIB= yes +USE_XORG= x11 xt USE_LDCONFIG= yes ALL_TARGET= all data INSTALL_TARGET= install data-install @@ -37,7 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's#$$(prefix)$$(imdir)/{gb,gbk,big5}#$$(prefix)$$(imdir)/gb $$(prefix)$$(imdir)/gbk $$(prefix)$$(imdir)/big5#g' ${WRKSRC}/ImmModules/turbo/Makefile.in @${REINPLACE_CMD} -e 's,-@PACKAGE_VERSION@,,g' ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e 's,/share/man,/man,g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/IMdkit/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/IMdkit/Makefile post-install: @${CAT} ${PKGMESSAGE} diff --git a/chinese/moettf/pkg-plist b/chinese/moettf/pkg-plist index 08da29a..afbfc80 100644 --- a/chinese/moettf/pkg-plist +++ b/chinese/moettf/pkg-plist @@ -1,2 +1,2 @@ -@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.dir > %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.dir -@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.alias > %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.alias +@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir > %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir.tmp && mv %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir.tmp %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir +@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias > %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias.tmp && mv %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias.tmp %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias diff --git a/chinese/mplayer-fonts/Makefile b/chinese/mplayer-fonts/Makefile index 557b51b..2ba64d2 100644 --- a/chinese/mplayer-fonts/Makefile +++ b/chinese/mplayer-fonts/Makefile @@ -32,7 +32,7 @@ SUBFONT_DISTNAME= subfont-c-0.90pre6 MPLAYER_FONTDIR= ${LOCALBASE}/share/mplayer/fonts/chinese FREETYPE_CONFIG= ${LOCALBASE}/bin/freetype-config -ARPHIC_FONTDIR= ${X11BASE}/lib/X11/fonts/TrueType +ARPHIC_FONTDIR= ${LOCALBASE}/lib/X11/fonts/TrueType ARPHIC_FONTS_BIG5= bkai00mp bsmi00lp ARPHIC_FONTS_GB2312= gbsn00lp gkai00mp ALL_FONTS= ${ARPHIC_FONTS_BIG5} ${ARPHIC_FONTS_GB2312} diff --git a/chinese/msttf/Makefile b/chinese/msttf/Makefile index ff6fbdd..0887324 100644 --- a/chinese/msttf/Makefile +++ b/chinese/msttf/Makefile @@ -7,7 +7,7 @@ PORTNAME= msttf PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= # DISTFILES= ${MSTTF_SIMHEI} ${MSTTF_SIMSUN} ${MSTTF_TAHOMA} @@ -29,9 +29,9 @@ RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_BUILD= yes SHAREMODE= 644 NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 FONTDIR= ${PREFIX}/share/fonts/TrueType -XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType +XFONTDIR= ${LOCALBASE}/lib/X11/fonts/TrueType INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X} diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index 1ee9179..be4c0b5 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -45,7 +45,7 @@ do-install: .endfor ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${FONTSDIR} .if !defined(WITHOUT_X11) - ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${X11BASE}/etc/fonts/local.conf + ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${LOCALBASE}/etc/fonts/local.conf .endif .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist index a965e94..5fd370c 100644 --- a/chinese/opendesktop-fonts/pkg-plist +++ b/chinese/opendesktop-fonts/pkg-plist @@ -1,3 +1,3 @@ -%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi +%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi %%FONTSDIR%%/local.conf-odo -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%X11BASE%%/etc/fonts/local.conf +%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index 1770810..99cfbeb 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -32,7 +32,7 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" diff --git a/chinese/pyDict/Makefile b/chinese/pyDict/Makefile index 19b400e..6010f4c 100644 --- a/chinese/pyDict/Makefile +++ b/chinese/pyDict/Makefile @@ -18,7 +18,7 @@ MAINTAINER= sunrychen@gmail.com COMMENT= A Chinese <-> English dictionary, under both console and X11 RUN_DEPENDS= ${LOCALBASE}/include/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk \ - ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf + ${LOCALBASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf WRKSRC= ${WRKDIR}/dict NO_BUILD= yes diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile index 4893096..998bbd8 100644 --- a/chinese/qterm/Makefile +++ b/chinese/qterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= qterm PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.yuanjue.net/download/ @@ -16,13 +17,14 @@ PKGNAMEPREFIX= zh- MAINTAINER= yuanjue@yuanjue.net COMMENT= QTerm is a BBS client for BSD/Linux +USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto USE_BZIP2= yes USE_PERL5_BUILD=yes USE_QT_VER= 3 HAS_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX} +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_PYTHON) USE_PYTHON= 2.3+ diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile index 36bbc3d..04850b1 100644 --- a/chinese/srecite/Makefile +++ b/chinese/srecite/Makefile @@ -7,7 +7,7 @@ PORTNAME= srecite PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese textproc MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ @@ -22,7 +22,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libgnomeui WORDBOOKS_PATH= ${PREFIX}/share/${PORTNAME}/wordbooks diff --git a/chinese/tcl83/Makefile b/chinese/tcl83/Makefile index abb6f5c..d7feffc 100644 --- a/chinese/tcl83/Makefile +++ b/chinese/tcl83/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ENV= PORTSDIR=${PORTSDIR} CONFIGURE_ARGS= --enable-shared --enable-i18nImprove -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken MAKE_ENV= SHORT_TCL_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.tclsh diff --git a/chinese/tk83/Makefile b/chinese/tk83/Makefile index 5f50ad0..c321b46 100644 --- a/chinese/tk83/Makefile +++ b/chinese/tk83/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-toolkits tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_3 @@ -18,7 +18,7 @@ COMMENT= Graphical toolkit for TCL which supports Chinese LIB_DEPENDS= tcl83.1:${PORTSDIR}/chinese/tcl83 -USE_XLIB= yes +USE_XORG= xt WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf index 47b0c07..efaaf28 100644 --- a/chinese/ttfm/Makefile.ttf +++ b/chinese/ttfm/Makefile.ttf @@ -16,12 +16,12 @@ FONTSDIR?= ${PREFIX}/share/fonts/TrueType FONTSDIR_REL= ${FONTSDIR:S,^${PREFIX}/,,} PLIST_SUB+= FONTSDIR=${FONTSDIR_REL} -XFONTSDIR?= ${X11BASE}/lib/X11/fonts/TrueType -XFONTSDIR_REL= ${XFONTSDIR:S,${X11BASE}/,,} +XFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType +XFONTSDIR_REL= ${XFONTSDIR:S,${LOCALBASE}/,,} PLIST_SUB+= XFONTSDIR=${XFONTSDIR_REL} .if !defined(WITHOUT_X11) -RUN_DEPENDS+= ${X11BASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS+= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig _TTF_MODULES= xttfm .endif @@ -62,7 +62,7 @@ do-install-ttf: .endfor .if !defined(WITHOUT_X11) @${ECHO_MSG} "===> Running fc-cache" - -@${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} + -@${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} .endif add-plist-post: add-plist-ttf @@ -81,8 +81,8 @@ add-plist-ttf: . endfor .endfor .if !defined(WITHOUT_X11) - @${ECHO_CMD} "@unexec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir ${XFONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} .endif diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile index 8ca3658..aff90e7 100644 --- a/chinese/vflib/Makefile +++ b/chinese/vflib/Makefile @@ -7,7 +7,7 @@ PORTNAME= vflib PORTVERSION= ${VFLIB_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese print MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/VFlib2/ \ ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/ @@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= Vector font library with free vector font, BIG5 and GB supported -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} @@ -33,14 +33,14 @@ CONFIGURE_ARGS= --with-freetype \ --with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \ --with-freetype-libdir=${LOCALBASE}/lib USE_FREETYPE= yes -USE_XLIB= yes +USE_XORG= x11 xext USE_LDCONFIG= yes USE_GETTEXT= yes .include <bsd.port.pre.mk> pre-patch: - @${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" -e "s;%%X11BASE%%;${X11BASE};g" ${DISTDIR}/zh-vfontcap.in > ${WRKSRC}/vfontcap + @${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" -e "s;%%X11BASE%%;${LOCALBASE};g" ${DISTDIR}/zh-vfontcap.in > ${WRKSRC}/vfontcap post-patch: @${REINPLACE_CMD} -e "s,varargs.h,stdarg.h," ${WRKSRC}/tools/disol.c diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile index c54e154..df7338f 100644 --- a/chinese/wenju/Makefile +++ b/chinese/wenju/Makefile @@ -7,10 +7,9 @@ PORTNAME= wenju PORTVERSION= 1.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wenju +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Collection of writing tools in Chinese @@ -18,7 +17,6 @@ COMMENT= Collection of writing tools in Chinese USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 USE_LDCONFIG= yes -USE_XLIB= yes .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/chinese/xmms/Makefile b/chinese/xmms/Makefile index 4a487c8..5880636 100644 --- a/chinese/xmms/Makefile +++ b/chinese/xmms/Makefile @@ -16,6 +16,4 @@ EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-xmms-1.2.x-xfont MAINTAINER= clive@FreeBSD.org -#RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf - .include "${MASTERDIR}/Makefile" diff --git a/chinese/xpdf/files/dot.xpdfrc.in b/chinese/xpdf/files/dot.xpdfrc.in index 4f19117..0c3e438 100644 --- a/chinese/xpdf/files/dot.xpdfrc.in +++ b/chinese/xpdf/files/dot.xpdfrc.in @@ -1,16 +1,16 @@ #----- begin Chinese Traditional support package (2004-jul-27) -cidToUnicode Adobe-CNS1 %%X11BASE%%/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode -unicodeMap Big5 %%X11BASE%%/share/xpdf/chinese-traditional/Big5.unicodeMap -unicodeMap Big5ascii %%X11BASE%%/share/xpdf/chinese-traditional/Big5ascii.unicodeMap +cidToUnicode Adobe-CNS1 %%LOCALBASE%%/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode +unicodeMap Big5 %%LOCALBASE%%/share/xpdf/chinese-traditional/Big5.unicodeMap +unicodeMap Big5ascii %%LOCALBASE%%/share/xpdf/chinese-traditional/Big5ascii.unicodeMap cMapDir Adobe-CNS1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% displayCIDFontTT Adobe-CNS1 %%LOCALBASE%%/share/fonts/TrueType/bkai00mp.ttf #----- end Chinese Traditional support package #----- begin Chinese Simplified support package (2004-jul-27) -cidToUnicode Adobe-GB1 %%X11BASE%%/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode -unicodeMap ISO-2022-CN %%X11BASE%%/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap -unicodeMap EUC-CN %%X11BASE%%/share/xpdf/chinese-simplified/EUC-CN.unicodeMap -unicodeMap GBK %%X11BASE%%/share/xpdf/chinese-simplified/GBK.unicodeMap +cidToUnicode Adobe-GB1 %%LOCALBASE%%/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode +unicodeMap ISO-2022-CN %%LOCALBASE%%/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap +unicodeMap EUC-CN %%LOCALBASE%%/share/xpdf/chinese-simplified/EUC-CN.unicodeMap +unicodeMap GBK %%LOCALBASE%%/share/xpdf/chinese-simplified/GBK.unicodeMap cMapDir Adobe-GB1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% displayCIDFontTT Adobe-GB1 %%LOCALBASE%%/share/fonts/TrueType/gkai00mp.ttf diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile index 76e6f6e..9749e2a 100644 --- a/chinese/xsim/Makefile +++ b/chinese/xsim/Makefile @@ -7,17 +7,16 @@ PORTNAME= xsim PORTVERSION= 0.3.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ ${PORTNAME}-data-freebsd-gb2312.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= A simple and fast GBK Chinese XIM server -USE_XLIB= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cn-locale=eucCN PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/chinese/xsim/files/pkg-message.in b/chinese/xsim/files/pkg-message.in index 2962664..39fa6e1 100644 --- a/chinese/xsim/files/pkg-message.in +++ b/chinese/xsim/files/pkg-message.in @@ -1,13 +1,13 @@ ------------------------------------------------------------------------------- Please check the following files: - %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS -If not exist, copy %%X11BASE%%/lib/X11/locale/zh/XI18N_OBJS to it. + %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +If not exist, copy %%LOCALBASE%%/lib/X11/locale/zh/XI18N_OBJS to it. If you got the message: XSIM: Failed opening share library function: Undefined symbol "__XlcEucLoader" Comment XLC common/xlocale _XlcEucLoader # XLC_open -in %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +in %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS Remember to set environment varible XMODIFIERS: csh/tcsh: setenv XMODIFIERS @im=XSIM diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile index 8c4432d..7c87c0d 100644 --- a/comms/asmodem/Makefile +++ b/comms/asmodem/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Displays the modem status, designed to match AfterStep USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= asmodem.1 PLIST_FILES= bin/asmodem diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile index 670b055..022e853 100644 --- a/comms/echolinux/Makefile +++ b/comms/echolinux/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ gsm.1:${PORTSDIR}/audio/gsm post-patch: - @${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${X11BASE}/include|' \ - -e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${X11BASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \ + @${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${LOCALBASE}/include|' \ + -e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${LOCALBASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \ -e 's|CARGS|CFLAGS|' -e 's|= -DNodeFont=FL_TINY_SIZE|+= ${PTHREAD_CFLAGS} -DNodeFont=FL_TINY_SIZE|' \ -e 's|/usr/local/bin/|$${PREFIX}/bin/|' \ ${WRKSRC}/echogui/Makefile diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 4c2ab97..f8138c8 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -111,7 +111,7 @@ USE_GNOME+= glib20 CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11='@comment ' .else -USE_XPM= yes +USE_XORG= xpm USE_GNOME+= gtk20 gnomelibs PLIST_SUB+= X11='' MAN1+= xgnokii.1 diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile index c63d01a..e9055c37 100644 --- a/comms/hamfax/Makefile +++ b/comms/hamfax/Makefile @@ -8,8 +8,7 @@ PORTNAME= hamfax PORTVERSION= 0.6.4 PORTREVISION= 2 CATEGORIES= comms audio hamradio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= hamfax +MASTER_SITES= SF DISTNAME= HamFax-${PORTVERSION} MAINTAINER= carl@stagecraft.cx @@ -19,7 +18,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_QT_VER= 3 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-Qt-dir=${X11BASE} CXX="${CXX} ${PTHREAD_CFLAGS}" \ +CONFIGURE_ARGS= --with-Qt-dir=${LOCALBASE} CXX="${CXX} ${PTHREAD_CFLAGS}" \ LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile index 5379e14..709b7bb 100644 --- a/comms/linpsk/Makefile +++ b/comms/linpsk/Makefile @@ -9,15 +9,14 @@ PORTNAME= linpsk PORTVERSION= 0.8.1 PORTREVISION= 4 CATEGORIES= comms hamradio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= xride@FreeBSD.org COMMENT= A qt psk31 client LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ portaudio:${PORTSDIR}/audio/portaudio -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/fonts.dir:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/fonts.dir:${PORTSDIR}/x11-fonts/bitstream-vera USE_PERL5_BUILD=yes USE_QT_VER= 3 @@ -27,14 +26,14 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-qtdir=${X11BASE} --prefix=${PREFIX} +CONFIGURE_ARGS= --with-qtdir=${LOCALBASE} --prefix=${PREFIX} SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-I$$(top_srcdir)/src/portaudio||' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/src/interfaces/Makefile.in diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index 382b96b6..27eb297 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -43,7 +43,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \ ${WRKSRC}/help.c .for f in ${X11_PATCHFILES} - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${f} + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${f} .endfor do-install: diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in index 783b4bb..a5813ab 100644 --- a/comms/linrad/files/patch-Makefile.in +++ b/comms/linrad/files/patch-Makefile.in @@ -17,7 +17,7 @@ -@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ --Wparentheses -Wstrict-prototypes -Werror -ffast-math \ --fomit-frame-pointer -c -o -+CFL = ${CFLAGS} -DOSNUM=1 -I${X11BASE}/include -c -o ++CFL = ${CFLAGS} -DOSNUM=1 -I${LOCALBASE}/include -c -o CFW = -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ -Wparentheses -Wstrict-prototypes -Werror -ffast-math \ @@ -35,7 +35,7 @@ - gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \ -+ $(LCC) @MEM@ -oxlinrad -L${X11BASE}/lib -lX11 -pthread -lm \ ++ $(LCC) @MEM@ -oxlinrad -L${LOCALBASE}/lib -lX11 -pthread -lm \ -Wl,-Map,linrad.xmap,-warn-common \ xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol \ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \ diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile index 868d311..026f9f2 100644 --- a/comms/rxtx/Makefile +++ b/comms/rxtx/Makefile @@ -23,7 +23,7 @@ JAVA_VERSION= 1.2+ JAVA_OS= native GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} PREFIX= ${JAVA_HOME}/jre NO_MTREE= yes diff --git a/comms/tkhylafax/files/patch-aa b/comms/tkhylafax/files/patch-aa index e391030..86ff082 100644 --- a/comms/tkhylafax/files/patch-aa +++ b/comms/tkhylafax/files/patch-aa @@ -22,7 +22,7 @@ # The full path to your postscript viewer -GHOSTVIEW = /usr/X11/bin/gv -+GHOSTVIEW = ${X11BASE}/bin/gv ++GHOSTVIEW = ${LOCALBASE}/bin/gv ### DON'T EDIT ANYTHING BELOW THIS LINE ### diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile index e3e3aa8..1f7d303 100644 --- a/comms/twpsk/Makefile +++ b/comms/twpsk/Makefile @@ -32,7 +32,7 @@ FILES_TO_PATCH= Makefile psk31.1 twpskHelp user-twpsk/makefile \ post-patch: .for file in ${FILES_TO_PATCH} @${REINPLACE_CMD} -e \ - 's|/usr/local|${LOCALBASE}|g;s|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/local|${LOCALBASE}|g;s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/${file} .endfor diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile index cda1dc4..9e045f2 100644 --- a/comms/xcept/Makefile +++ b/comms/xcept/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcept PORTVERSION= 2.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= joerg @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= joerg MAINTAINER= joerg@FreeBSD.org COMMENT= A decoder for the CEPT (Btx) protocol -USE_XLIB= yes +USE_XORG= x11 MAN1= xcept.1 MAN8= ceptd.8 MANCOMPRESSED= maybe diff --git a/comms/xcept/files/patch-ae b/comms/xcept/files/patch-ae index d5e9952..4f04e87 100644 --- a/comms/xcept/files/patch-ae +++ b/comms/xcept/files/patch-ae @@ -13,8 +13,8 @@ -XINC = -I/usr/X386/include -XLIB = -L/usr/X386/lib +#CC = gcc -+XINC = -I${X11BASE}/include -+XLIB = -L${X11BASE}/lib ++XINC = -I${LOCALBASE}/include ++XLIB = -L${LOCALBASE}/lib #WARN = -W -Wunused -Wswitch -Wcomment -Wshadow -Wpointer-arith -Wcast-qual diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile index ac8c080..4e35b83 100644 --- a/comms/yawmppp/Makefile +++ b/comms/yawmppp/Makefile @@ -7,21 +7,18 @@ PORTNAME= yawmppp PORTVERSION= 2.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms windowmaker MASTER_SITES= ftp://ftp.seul.org/pub/yawmppp/ MAINTAINER= ports@FreeBSD.org COMMENT= A Window Maker dockapp that helps with easy use of pppd -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 -USE_XPM= yes -CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS} -I${X11BASE}/include" -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \ - --x-libraries="${X11BASE}/lib" +USE_XORG= xpm x11 +CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" MAN1= yawmppp.1x diff --git a/converters/enca/Makefile b/converters/enca/Makefile index fb40b92..7156982 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -20,7 +20,7 @@ USE_ICONV= yes USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --without-librecode \ --with-libiconv=${LOCALBASE} diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile index 04081c6..09e90b0 100644 --- a/converters/gbase/Makefile +++ b/converters/gbase/Makefile @@ -7,7 +7,7 @@ PORTNAME= gbase PORTVERSION= 0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters MASTER_SITES= http://www.hibernaculum.net/download/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A program to convert between the 4 common bases used in programming PLIST_FILES= bin/gbase -USE_X_PREFIX= yes USE_GNOME= gtk12 do-install: diff --git a/converters/recode/Makefile b/converters/recode/Makefile index bcb366c..b67c405 100644 --- a/converters/recode/Makefile +++ b/converters/recode/Makefile @@ -18,7 +18,7 @@ COMMENT= Converts files between character sets and usages USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 USE_PERL5= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --without-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 22a381e..69e88aa 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -23,11 +23,11 @@ GNU_CONFIGURE= yes # crud from the $PATH lie /usr/opt/Simili/tcl/. CONFIGURE_ARGS= --disable-tcl --disable-tk # Season to taste --- anything better or equal to tcl8.0 is probably okay -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \ +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib \ -lX11 -ltcl84 -ltk84 -lm" \ CPPFLAGS="-I${LOCALBASE}/include/tcl8.4 -DHAVE_TCL \ -I${LOCALBASE}/include/tk8.4 -DHAVE_TK \ - -I${X11BASE}/include" + -I${LOCALBASE}/include" ALL_TARGET= xdeview INSTALL_TARGET= install-tcl diff --git a/databases/clip/Makefile b/databases/clip/Makefile index 1ca4afd..fb2dfdf 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -7,7 +7,7 @@ PORTNAME= clip DISTVERSION= 1.1.16-1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases lang MASTER_SITES= ftp://ftp.linux.ru.net/mirrors/clip/ \ ftp://www.cis.by/pub/clip/pub/clip/ \ @@ -24,7 +24,7 @@ COMMENT= xBase and Clipper language compatible compiler BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ wget:${PORTSDIR}/ftp/wget \ - xmkmf:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 \ @@ -38,6 +38,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ WRKSRC= ${WRKDIR}/${PORTNAME}-prg-${DISTVERSION} USE_GETTEXT= yes +USE_XORG+= x11 xau ice xproto WANT_GNOME= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -99,8 +100,7 @@ USE_BISON= build USE_GMAKE= yes USE_ICONV= yes REINPLACE_ARGS= -i "" -USE_XLIB= yes -USE_XPM= yes +USE_XORG+= xpm xau ice xproto USE_GNOME= gtk12 gtk20 HAS_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/clip @@ -146,7 +146,7 @@ pre-configure: -e "s|#include.*<malloc.h>|#include <stdlib.h>|" \ -e "s|#!/bin/sh|#!${LOCALBASE}/bin/bash|" \ -e "s|/usr/local|${LOCALBASE}|g" \ - -e "s|/usr/X11R6|${X11BASE}|g" + -e "s|/usr/X11R6|${LOCALBASE}|g" ${REINPLACE_CMD} "s|-I/usr/include|-I${LOCALBASE}/include -L${LOCALBASE}/lib|" \ ${WRKSRC}/cliplibs/clip-xml/configure ${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" \ diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile index a6a9443..1e8cd8b 100644 --- a/databases/dbconnect/Makefile +++ b/databases/dbconnect/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD LDFLAG+= ${PTHREAD_LIBS} diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 02a44e3..73260f3 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-data-server PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +24,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \ ltverhack USE_OPENLDAP= yes diff --git a/databases/fireprofile/Makefile b/databases/fireprofile/Makefile index 45249251f..3852ffc 100644 --- a/databases/fireprofile/Makefile +++ b/databases/fireprofile/Makefile @@ -21,7 +21,7 @@ COMMENT= Library to help profiling where programs are using MySQL MAN3= libfireprofile.3 PLIST_FILES= lib/libfireprofile.so.0 lib/libfireprofile.so -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_MYSQL= yes DEFAULT_MYSQL_VER= 323 WANT_MYSQL_VER= 323 diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile index 6a6f3ba..b8c43c2 100644 --- a/databases/flamerobin/Makefile +++ b/databases/flamerobin/Makefile @@ -9,8 +9,7 @@ PORTNAME= flamerobin PORTVERSION= 0.7.6 PORTREVISION= 2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= dindin@FreeBSD.org.ua @@ -24,7 +23,7 @@ WX_UNICODE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" OPTIONS= FIREBIRD "Use firebird1 instead of firebird2" off diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 0e5c683..f382bc6 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITH_COMPAT) INSTALL_TARGET= install install-compat diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index 6ce21fb..89d28bc 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-db PORTVERSION= 0.2.96 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-db/0.2 @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Provide uniform access to data sources for the GNOME environment USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gnomehack gnomeprefix gnomehier libgda USE_GMAKE= yes USE_GETTEXT= yes diff --git a/databases/grass/Makefile b/databases/grass/Makefile index d0a085f..33f50cf 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -41,8 +41,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_GETTEXT= yes USE_PERL5= yes -USE_XLIB= yes -USE_GL= yes +USE_GL= glut USE_FREETYPE= yes USE_TCL= yes USE_TCL_BUILD= yes @@ -56,8 +55,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ --with-tcltk-includes="${TCL_INCLUDEDIR} ${TK_INCLUDEDIR}" \ - --with-opengl-includes=${X11BASE}/include \ - --with-opengl-libs=${X11BASE}/lib \ + --with-opengl-includes=${LOCALBASE}/include \ + --with-opengl-libs=${LOCALBASE}/lib \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-nls \ diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index 1b39760..aafa31d 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -29,9 +29,9 @@ CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ --with-python-incdir=${PYTHON_INCLUDEDIR} \ - --with-fontconfig-incdir=${X11BASE}/include/fontconfig \ - --with-fontconfig-libdir=${X11BASE}/lib -INSTALLS_SHLIB= yes + --with-fontconfig-incdir=${LOCALBASE}/include/fontconfig \ + --with-fontconfig-libdir=${LOCALBASE}/lib +USE_LDCONFIG= yes LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/ INSTALLS_EGGINFO= yes diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index 00ad4de..5809992 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -19,6 +19,6 @@ LIB_DEPENDS= kexicore:${PORTSDIR}/editors/koffice-kde3 USE_KDELIBS_VER= 3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile index 4d2e831..a2e1e9b 100644 --- a/databases/kmysqladmin/Makefile +++ b/databases/kmysqladmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmysqladmin PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/ @@ -16,7 +16,6 @@ COMMENT= A graphical frontend for administration of mysql servers USE_AUTOTOOLS= libtool:15 USE_MYSQL= yes -USE_XLIB= yes USE_QT_VER= 3 USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile index fd4618b..7a94f61 100644 --- a/databases/knoda/Makefile +++ b/databases/knoda/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER= 3 USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \ --with-hk_classes-incdir=${LOCALBASE}/include/hk_classes diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index 95c2bb6..4faaf21 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda PORTVERSION= 0.2.96 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 @@ -22,7 +22,6 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm CONFLICTS= libgda2*-[0-9]* USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo USE_GMAKE= yes USE_GETTEXT= yes diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index bdaf2c6..54550a3 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda2 PORTVERSION= 1.2.4 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -31,7 +31,6 @@ CONFLICTS= libgda-0* USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack intlhack USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index cad5489..f7cf8fd 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgda3 PORTVERSION?= 3.0.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:R} @@ -27,7 +27,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack USE_LDCONFIG= yes diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index a78d742..baae68c 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgnomedb PORTVERSION= 3.0.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -25,7 +25,6 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \ intlhack referencehack -USE_XLIB= yes USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile index a2c196f..8130816 100644 --- a/databases/libmemcache/Makefile +++ b/databases/libmemcache/Makefile @@ -16,7 +16,7 @@ COMMENT= The C library for accessing a memcache cluster USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes OPTIONS= DEBUG "Build with debugging turned on" off diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index 09760fc..83716f3 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -18,7 +18,7 @@ COMMENT= A C++ class library and toolset for ODBC access to data sources USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-isqlxx CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" diff --git a/databases/libudbc/Makefile b/databases/libudbc/Makefile index b704011f..552c215 100644 --- a/databases/libudbc/Makefile +++ b/databases/libudbc/Makefile @@ -21,7 +21,7 @@ COMMENT= Openlink UDBC SDK NO_WRKSUBDIR= yes NO_BUILD= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 RESTRICTED= 'Downloading and redistribution terms are unclear' diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index 9fc04dc..c8acc19 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -7,10 +7,9 @@ PORTNAME= mdbtools PORTVERSION= 0.5 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Utilities and libraries to export data from MS Access databases (.mdb) @@ -31,7 +30,7 @@ MAN1= mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1 .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_XLIB= yes +USE_XORG= x11 USE_GNOME+= gnomeprefix gnomehack libgnomeui PKGNAMESUFFIX= -gnome .endif diff --git a/databases/mird/Makefile b/databases/mird/Makefile index 04d0081..b701246 100644 --- a/databases/mird/Makefile +++ b/databases/mird/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= autoconf:261:env USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-debug -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,CFLAGS=,CFLAGS+=,' ${WRKSRC}/src/Makefile.in diff --git a/databases/msql/Makefile b/databases/msql/Makefile index 495b8ce..1968bfe 100644 --- a/databases/msql/Makefile +++ b/databases/msql/Makefile @@ -15,7 +15,7 @@ COMMENT= The Mini SQL server, version 2 CONFLICTS= msql-3* -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES USE_PERL5= YES # Not free for commercial use. diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile index 8d6fddd..186cf68 100644 --- a/databases/msql3/Makefile +++ b/databases/msql3/Makefile @@ -14,7 +14,7 @@ COMMENT= Version 3 of the Mini SQL relational database system CONFLICTS= msql-2* -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES USE_PERL5= YES LATEST_LINK= msql3 diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile index 016b81f..0fc7c2a 100644 --- a/databases/mysql++1/Makefile +++ b/databases/mysql++1/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ --includedir=${PREFIX}/include/mysql++ \ --disable-examples CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFLICTS= ${PORTNAME}*-2.* NO_LATEST_LINK= yes diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile index 47e91ff..abc8a49 100644 --- a/databases/mysql-query-browser/Makefile +++ b/databases/mysql-query-browser/Makefile @@ -7,7 +7,7 @@ PORTNAME= mysql-query-browser PORTVERSION= 1.1.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLAdministrationSuite @@ -23,7 +23,6 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed \ BROKEN= Checksum mismatch -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ @@ -35,7 +34,7 @@ DEFAULT_MYSQL_VER= 50 IGNORE_WITH_MYSQL= 323 GTKHTML_VER= ${gtkhtml3_DETECT:R} -CONFIGURE_ARGS_GUI= --prefix=${X11BASE} \ +CONFIGURE_ARGS_GUI= --prefix=${LOCALBASE} \ --datadir=${DATADIR} \ --localstatedir=${PREFIX}/share CONFIGURE_ARGS_MAIN= ${CONFIGURE_ARGS_GUI} \ diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile index 1b65da8..a6dd41f 100644 --- a/databases/mysql2odbc/Makefile +++ b/databases/mysql2odbc/Makefile @@ -42,6 +42,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.post.mk> diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 6d923bf..1c2c22d 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .endif CONFIGURE_ARGS= --with-mysql=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} s/libmysqlcppapi-1.9/libmysqlcppapi/g \ diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile index 40e304e..b8f22fb 100644 --- a/databases/pgworksheet/Makefile +++ b/databases/pgworksheet/Makefile @@ -7,6 +7,7 @@ PORTNAME= pgworksheet PORTVERSION= 1.9 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/1695/ @@ -15,7 +16,6 @@ COMMENT= Simple PostreSQL GUI front end RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:${PORTSDIR}/databases/py-pyPgSQL -USE_X_PREFIX= yes USE_PGSQL= yes USE_BZIP2= yes USE_GNOME= pygtk2 diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile index e2f09a1..87e8fa3 100644 --- a/databases/postgresql-libpgeasy/Makefile +++ b/databases/postgresql-libpgeasy/Makefile @@ -19,7 +19,7 @@ COMMENT= An easy-to-use C interface to PostgreSQL USE_AUTOTOOLS= libtool:15 USE_PGSQL= YES USE_GMAKE= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES GNU_CONFIGURE= YES DOCSDIR= ${PREFIX}/share/doc/postgresql/${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/postgresql/${PORTNAME} diff --git a/databases/postgresql-libpq++/Makefile b/databases/postgresql-libpq++/Makefile index dbc5a11..0783e29 100644 --- a/databases/postgresql-libpq++/Makefile +++ b/databases/postgresql-libpq++/Makefile @@ -19,7 +19,7 @@ COMMENT= C++ interface for PostgreSQL USE_PGSQL= YES USE_GMAKE= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES post-patch: ${REINPLACE_CMD} "s,/usr/local/pgsql,${PREFIX},; \ diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index 23d048a..780c589 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 23d048a..780c589 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile index 23d048a..780c589 100644 --- a/databases/postgresql-libpqxx30/Makefile +++ b/databases/postgresql-libpqxx30/Makefile @@ -19,7 +19,7 @@ COMMENT= A new C++ interface for PostgreSQL USE_PGSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile index 39b8fae..e66261b 100644 --- a/databases/postgresql73-client/Makefile +++ b/databases/postgresql73-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \ src/bin/pg_dump src/bin/scripts src/include \ src/interfaces doc CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index 58324b3..a083fee 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= src/bin/pg_config src/bin/pg_encoding src/bin/psql \ src/bin/pg_dump src/bin/scripts src/include \ src/interfaces doc CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile index 29ff112..73c5997 100644 --- a/databases/postgresql80-client/Makefile +++ b/databases/postgresql80-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces src/bin/pg_dump \ src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile index e81cc4b..0326652 100644 --- a/databases/postgresql81-client/Makefile +++ b/databases/postgresql81-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile index 532b039..1c71380 100644 --- a/databases/postgresql82-client/Makefile +++ b/databases/postgresql82-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index ef47075..d7bf018 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -19,6 +19,6 @@ BUILD_DIRS= config src/include src/interfaces \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index bc5f114..245062b 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib OPTIONS= DOCS "Build and install documentation" off diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile index e9e726a..025dbce 100644 --- a/databases/qt-ibase-plugin/Makefile +++ b/databases/qt-ibase-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.pre.mk> diff --git a/databases/qt-ibase-plugin/files/Makefile.bsd b/databases/qt-ibase-plugin/files/Makefile.bsd index 84998a7..23269dc 100644 --- a/databases/qt-ibase-plugin/files/Makefile.bsd +++ b/databases/qt-ibase-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lgds +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lgds SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile index 1853a2b..31fd81c 100644 --- a/databases/qt-mysql-plugin/Makefile +++ b/databases/qt-mysql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd index 12bc680..d9e74d5 100644 --- a/databases/qt-mysql-plugin/files/Makefile.bsd +++ b/databases/qt-mysql-plugin/files/Makefile.bsd @@ -3,9 +3,11 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ -I${LOCALBASE}/include/mysql \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lqt-mt -lmysqlclient +LDADD= -L${LOCALBASE}/lib/mysql \ + ${PTHREAD_LIBS} \ + -L${LOCALBASE}/lib/ -lqt-mt -lmysqlclient SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile index b817d06..9365248 100644 --- a/databases/qt-odbc-plugin/Makefile +++ b/databases/qt-odbc-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-odbc-plugin/files/Makefile.bsd b/databases/qt-odbc-plugin/files/Makefile.bsd index 22ac3ad..383c67b 100644 --- a/databases/qt-odbc-plugin/files/Makefile.bsd +++ b/databases/qt-odbc-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile index bc7c716..aff6c64 100644 --- a/databases/qt-pgsql-plugin/Makefile +++ b/databases/qt-pgsql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-pgsql-plugin/files/Makefile.bsd b/databases/qt-pgsql-plugin/files/Makefile.bsd index 3f32426..567d75d 100644 --- a/databases/qt-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt-pgsql-plugin/files/Makefile.bsd @@ -3,9 +3,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ -I${LOCALBASE}/include/postgresql/server \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq SRCS= qsql_${DB}.cpp main.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile index d61bf2b..5e57c5b 100644 --- a/databases/qt-sqlite-plugin/Makefile +++ b/databases/qt-sqlite-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -33,7 +33,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_X_PREFIX= yes PLIST_SUB= DB=${DB} .include <bsd.port.mk> diff --git a/databases/qt-sqlite-plugin/files/Makefile.bsd b/databases/qt-sqlite-plugin/files/Makefile.bsd index c1c9ad0..cddbeca 100644 --- a/databases/qt-sqlite-plugin/files/Makefile.bsd +++ b/databases/qt-sqlite-plugin/files/Makefile.bsd @@ -2,9 +2,9 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${PLUGIN} -I${DRIVER} \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT -LDADD= -L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite +LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite SRCS= qsql_${DB}.cpp smain.cpp LIBDIR= ${PREFIX}/lib/plugins/sqldrivers diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd index 1363014..daf1e92 100644 --- a/databases/qt4-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd @@ -4,7 +4,7 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ -I${LOCALBASE}/include/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 diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 8d608fb..4c1c4cd 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -21,7 +21,7 @@ CONFLICTS= rrdtool-1.2* LATEST_LINK= rrdtool10 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} PERL_MAKE_OPTIONS="PREFIX=${PREFIX}" diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 86d4bbf..97b9da4 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -18,7 +18,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper USE_GMAKE= YES USE_GNOME= pkgconfig USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 524b7f0..923d232 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -9,7 +9,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} PORTREVISION= 2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sqlrelay MAINTAINER= skv@FreeBSD.org @@ -115,7 +115,7 @@ IF_FREETDS= "@comment " .if defined(WITH_GTK) && ${WITH_GTK:L} != no USE_GNOME+= gtk12 -CONFIGURE_ARGS+= --with-gtk-prefix="${X11BASE}" +CONFIGURE_ARGS+= --with-gtk-prefix="${LOCALBASE}" IF_GTK= "" .else CONFIGURE_ARGS+= --disable-gtk diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 00f8a4f..730e7a1 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -23,13 +23,13 @@ LIB_DEPENDS= qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla \ RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client .if !defined(WITHOUT_MYSQL) -BUILD_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .endif .if !defined(WITHOUT_PGSQL) -BUILD_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .endif ORACLE_HOME?= ${LOCALBASE}/oracle8-client diff --git a/databases/wmjsql/Makefile b/databases/wmjsql/Makefile index 90d0525..72f5f82 100644 --- a/databases/wmjsql/Makefile +++ b/databases/wmjsql/Makefile @@ -17,8 +17,7 @@ COMMENT= MySQL server status displaying dockapp USE_MYSQL= yes USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= clean all diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile index 4b14a41..7dbb5cb 100644 --- a/databases/xmbase-grok/Makefile +++ b/databases/xmbase-grok/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmbase-grok PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://grok.ftp.fu-berlin.de/ \ ftp://bitrot.de/pub/grok/ @@ -18,11 +18,11 @@ COMMENT= Graphical Resource Organizer Kit BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_MOTIF= yes MAKE_ENV= MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \ GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \ - CF="-I${X11BASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" + CF="-I${LOCALBASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" MAN1= grok.1 DATADIR= ${PREFIX}/lib/X11/xmbase-grok diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index f3fd023..2a36082 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmysqladmin PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Contrib/Old-Versions @@ -18,8 +18,7 @@ COMMENT= X11 front end to the mysqladmin command of the MySQL database engine LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ mysqlclient.10:${PORTSDIR}/databases/mysql323-client -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= xmysqladmin pre-su-install: diff --git a/databases/xmysqladmin/files/patch-aa b/databases/xmysqladmin/files/patch-aa index 62b1b87..dc9a090 100644 --- a/databases/xmysqladmin/files/patch-aa +++ b/databases/xmysqladmin/files/patch-aa @@ -5,7 +5,7 @@ #------------------------------------------------------- #INSTALLPATH = /opt/local/i386/bin -INSTALLPATH = /usr/local/bin -+INSTALLPATH = ${X11BASE}/bin ++INSTALLPATH = ${LOCALBASE}/bin ######################################################## @@ -14,7 +14,7 @@ #------------------------------------------------------- #PIXMAPPATH = /opt/local/lib -PIXMAPPATH = /usr/local/bin -+PIXMAPPATH = ${X11BASE}/include/X11/pixmaps ++PIXMAPPATH = ${LOCABASE}/include/X11/pixmaps ######################################################## @@ -51,7 +51,7 @@ # mysql library dir #------------------------------------------------------- -MYSQLLOAD = -Wl,-R/usr/local/mysql/lib/mysql -L/usr/local/mysql/lib/mysql -lmysqlclient -+MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/mysql -lmysqlclient ++MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -lmysqlclient ######################################################## @@ -60,7 +60,7 @@ #------------------------------------------------------- #XFORMLIBDIR = -L/opt/local/i386/lib -XFORMLIBDIR = -L/usr/lib -+XFORMLIBDIR = -L${X11BASE}/lib ++XFORMLIBDIR = -L${LOCALBASE}/lib ######################################################## @@ -69,7 +69,7 @@ #------------------------------------------------------- #XFORMINCDIR = -I/opt/local/include -XFORMINCDIR = -I/usr/X11R6/include -+XFORMINCDIR = -I${X11BASE}/include -I${X11BASE}/include/X11 ++XFORMINCDIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ######################################################## @@ -78,7 +78,7 @@ # Use this for Linux: XINC = -XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4 -+XLOAD = -L${X11BASE}/lib -lX11 ++XLOAD = -L${LOCALBASE}/lib -lX11 ######################################################## diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index 151d663..70e028c 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -7,7 +7,7 @@ PORTNAME= aspostit PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/aspostit @@ -17,8 +17,7 @@ COMMENT= An AfterStep dockable version of XPostIt LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg/ -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xaw xext x11 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile index 25f0851..5425c50 100644 --- a/deskutils/babytrans/Makefile +++ b/deskutils/babytrans/Makefile @@ -8,7 +8,7 @@ PORTNAME= babytrans PORTVERSION= 0.9.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils MASTER_SITES= http://fjolliton.free.fr/babytrans/ @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+/GNOME front-end for Babylon Translator .dic files USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gtk12 gnomehack gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile index f632165..d9bff92 100644 --- a/deskutils/chmsee/Makefile +++ b/deskutils/chmsee/Makefile @@ -7,7 +7,7 @@ PORTNAME= chmsee PORTVERSION= 0.9.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://chmsee.gro.clinux.org/ @@ -22,7 +22,6 @@ USE_GNOME= gtk20 libglade2 gnomeprefix gnomehack libgnome WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_BZIP2= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index d7a2cea..00f545d 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -8,6 +8,7 @@ PORTNAME= deskbar-applet PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-e USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack USE_PYTHON= yes USE_GMAKE= yes diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile index e5700fb..611902a 100644 --- a/deskutils/dlume/Makefile +++ b/deskutils/dlume/Makefile @@ -7,14 +7,13 @@ PORTNAME= dlume PORTVERSION= 0.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils gnome MASTER_SITES= http://clay.ll.pl/download/ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2 address book -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile index 797f3f5..5bcfda1 100644 --- a/deskutils/dragstack/Makefile +++ b/deskutils/dragstack/Makefile @@ -17,7 +17,7 @@ COMMENT= Drop stack applet for KDE USE_AUTOTOOLS= libtool:15 USE_KDEBASE_VER= 3 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index e080233..b8cad0d 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-jescs PORTVERSION= 2.22 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile index 0fe1457..2455d55 100644 --- a/deskutils/gdeskcal-skins/Makefile +++ b/deskutils/gdeskcal-skins/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdeskcal-skins PORTVERSION= 0.56 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/skins/gdeskcal/ DISTNAME= @@ -33,7 +33,6 @@ COMMENT= Skins for gdeskcal RUN_DEPENDS= gdeskcal:${PORTSDIR}/deskutils/gdeskcal USE_PYTHON= yes -USE_XLIB= yes USE_GNOME= gnomeprefix NO_BUILD= yes diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile index 971c590..8e3806b 100644 --- a/deskutils/gdesklets-recentlyused/Makefile +++ b/deskutils/gdesklets-recentlyused/Makefile @@ -7,7 +7,7 @@ PORTNAME= recentlyused PORTVERSION= 0.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +19,6 @@ COMMENT= A toolbar for the most recently used items from ~/.recently-used RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets USE_PYTHON= yes -USE_XLIB= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile index 953cc95..da24bfd 100644 --- a/deskutils/gdesklets-starterbar/Makefile +++ b/deskutils/gdesklets-starterbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= starterbar PORTVERSION= 0.31.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -21,7 +21,6 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \ USE_BZIP2= yes USE_PYTHON= yes -USE_XLIB= yes NAME= StarterBar DATADIR= ${PREFIX}/share diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile index fe42b79..d4b124a 100644 --- a/deskutils/gdesklets/Makefile +++ b/deskutils/gdesklets/Makefile @@ -40,8 +40,8 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-install: @${MKDIR} ${PREFIX}/share/gdesklets/Displays diff --git a/deskutils/gkrellm-gtodo/Makefile b/deskutils/gkrellm-gtodo/Makefile index 9a54796..0da9fd6 100644 --- a/deskutils/gkrellm-gtodo/Makefile +++ b/deskutils/gkrellm-gtodo/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-0.2.5a MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that tracks tasks and to-do items -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile index eaffaa4..6980eea 100644 --- a/deskutils/gkrellm-reminder2/Makefile +++ b/deskutils/gkrellm-reminder2/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that reminds you of important events -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/deskutils/gkrellm-timers/Makefile b/deskutils/gkrellm-timers/Makefile index c30f4f1..8f6dfd8 100644 --- a/deskutils/gkrellm-timers/Makefile +++ b/deskutils/gkrellm-timers/Makefile @@ -17,7 +17,7 @@ DISTNAME= gkrellm_${PORTNAME}-${PORTVERSION} MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that allows the setting of countdowns -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile index 6ae7f4f..98736a9 100644 --- a/deskutils/gnome-menu-editor/Makefile +++ b/deskutils/gnome-menu-editor/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-menu-editor PORTVERSION= 0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MASTER_SITES= http://manny.cluecoder.org/packages/gnome-menu-editor/ @@ -18,7 +18,6 @@ COMMENT= Simple menu editor for Gnome USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomemenus intlhack gtk20 gnomevfs2 USE_GETTEXT= yes -USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index 49d5e63..6b9c6ad 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-pim PORTVERSION= 1.4.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://www.jroger.in-berlin.de/gnome-pim/ DIST_SUBDIR= gnome @@ -15,7 +15,6 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome pim package -USE_X_PREFIX= yes USE_BISON= build USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs libcapplet diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index ab15858..570a167 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-utils PORTVERSION= 2.20.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,7 +22,6 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile index 9b027df..c8f8abc 100644 --- a/deskutils/gnotime/Makefile +++ b/deskutils/gnotime/Makefile @@ -8,10 +8,9 @@ PORTNAME= gnotime PORTVERSION= 2.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gttr +MASTER_SITES= SF/gttr MAINTAINER= ports@FreeBSD.org COMMENT= GnoTime is a time tracker for gnome2 @@ -21,7 +20,6 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnomeprefix intlhack gtkhtml3 libgnomeui USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile index b4403c9..033dabe3 100644 --- a/deskutils/gourmet/Makefile +++ b/deskutils/gourmet/Makefile @@ -7,10 +7,9 @@ PORTNAME= gourmet PORTVERSION= 0.11.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= grecipe-manager +MASTER_SITES= SF/grecipe-manager MAINTAINER= ahze@FreeBSD.org COMMENT= GNOME recipe manager @@ -19,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py ${PYTHON_SITELIBDIR}/PyRTF/__init__.py:${PORTSDIR}/print/py-rtf \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -USE_X_PREFIX= yes USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile index 4647adc..6d8a264 100644 --- a/deskutils/griffith/Makefile +++ b/deskutils/griffith/Makefile @@ -31,6 +31,6 @@ post-patch: @${FIND} ${WRKSRC}/ -name Makefile |\ ${XARGS} ${REINPLACE_CMD} -e '/^PREFIX/d' -e '/^MANDIR/s|=.*|=${MANPREFIX}/man|' @${REINPLACE_CMD} -e '/^LANGUAGES=/s|find.*|cd i18n/\&\&ls -d *)|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/share/fonts|${X11BASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME} + @${REINPLACE_CMD} -e 's|/usr/share/fonts|${LOCALBASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME} .include <bsd.port.mk> diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile index cced085..bf65926 100644 --- a/deskutils/gtodo/Makefile +++ b/deskutils/gtodo/Makefile @@ -7,17 +7,15 @@ PORTNAME= gtodo PORTVERSION= 0.14 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtodo +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An Gtk2 Todo list manager USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnometarget gnomevfs2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile index 630517a..0121974 100644 --- a/deskutils/gtweakui/Makefile +++ b/deskutils/gtweakui/Makefile @@ -7,16 +7,14 @@ PORTNAME= gTweakUI PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtweakui +MASTER_SITES= SF/gtweakui DIST_SUBDIR= gnome2 MAINTAINER= ports@FreeBSD.org COMMENT= A collection of simple dialogs as a front end to GConf -USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix libgnomeui gconf2 libglade2 intlhack USE_GMAKE= yes diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index da068b2..eab11b5 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -8,6 +8,7 @@ PORTNAME= gucharmap PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +20,6 @@ LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 WANT_GNOME= yes diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile index e2cf55c..c4ff467 100644 --- a/deskutils/karamba/Makefile +++ b/deskutils/karamba/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../comms/kallers/files/patch-configure USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile index c50bf17..f9d8497 100644 --- a/deskutils/kbirthday/Makefile +++ b/deskutils/kbirthday/Makefile @@ -17,7 +17,7 @@ COMMENT= KDE kicker-applet that reminds you of birthdays and anniversaries USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_KDELIBS_VER=3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes # may or may not solve the alpha compilation issue.... CONFIGURE_ARGS= --with-pic diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index fe264f8..5a11037 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index fe264f8..5a11037 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile index 232a7aa..4e52f99 100644 --- a/deskutils/mdh/Makefile +++ b/deskutils/mdh/Makefile @@ -7,7 +7,7 @@ PORTNAME= mdh PORTVERSION= 1.9.59 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gozer.org/my_stuff/gtk/gtk/mdh/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2-based toolbar, like a smaller GNOME panel USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile index 642af1e..79a051f 100644 --- a/deskutils/multi-backgrounds-daemon/Makefile +++ b/deskutils/multi-backgrounds-daemon/Makefile @@ -6,14 +6,13 @@ PORTNAME= multi-backgrounds-daemon PORTVERSION= 0.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= http://jeanschu.free.fr/multi-backgrounds-daemon/ MAINTAINER= ports@FreeBSD.org COMMENT= Change your GNOME2 backgound when you switch to other workspace -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui libwnck diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile index eb1cd96..d657ca5 100644 --- a/deskutils/nautilus-actions/Makefile +++ b/deskutils/nautilus-actions/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-actions PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ftp://ftp2.grumz.net/grumz/ @@ -21,7 +22,6 @@ USE_GETTEXT= yes USE_GNOME= nautilus2 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes -USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0 diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index 43eccc8..9f3c577 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -20,8 +20,8 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GNOME= nautilus2 PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ - LDFLASG="-L${LOCALBASE}/lib -L${X11BASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ + LDFLASG="-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \ LIBS="-lssl" PLIST_FILES= lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \ lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \ diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile index 8da3997..7d2855c 100644 --- a/deskutils/nautilus-open-terminal/Makefile +++ b/deskutils/nautilus-open-terminal/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-open-terminal PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -20,7 +21,6 @@ GNU_CONFIGURE= yes USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= nautilus-open-terminal.schemas diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index 04998fd..d32cbd9 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus-sendto PORTVERSION= 0.14.0 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= GNOME @@ -19,7 +20,6 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution MAN1= nautilus-sendto.1 GCONF_SCHEMAS= nst.schemas USE_BZIP2= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index b375d8a..32e0d2e 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -7,7 +7,7 @@ PORTNAME= notification-daemon PORTVERSION= 0.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/ @@ -19,8 +19,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck USE_GMAKE= yes -USE_XLIB= yes USE_GETTEXT= yes +USE_XORG= x11 xt sm ice xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile index 905fc5a..eef5dce 100644 --- a/deskutils/plan/files/patch-Makefile +++ b/deskutils/plan/files/patch-Makefile @@ -64,7 +64,7 @@ NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -+FBSD_C = -ansi -I$(X11BASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ ++FBSD_C = -ansi -I$(LOCALBASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -DSTDLIBMALLOC @@ -76,9 +76,9 @@ -FBSD_L2 = -L/usr/X11R6/lib -lc -OBSD_L1 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11 -OBSD_L2 = -lc -+FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++FBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +FBSD_L2 = -+OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++OBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +OBSD_L2 = LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc @@ -106,11 +106,11 @@ SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure -LDIR = /usr/X11R6/lib -+LDIR = $(X11BASE)/lib ++LDIR = $(LOCALBASE)/lib BINDIR = plan-$(VERSION) gMYCC = gcc -gCF = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -+gCF = -I$(X11BASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ++gCF = -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11 gL2F = -lc - + diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 7cc2e87..951e8ca 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -8,7 +8,7 @@ PORTNAME= planner PORTVERSION= 0.14.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.14 @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Project management application for GNOME 2 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \ libgsf desktopfileutils diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile index 7d271ff..22663b7 100644 --- a/deskutils/pypanel/Makefile +++ b/deskutils/pypanel/Makefile @@ -32,7 +32,7 @@ post-patch: @${REINPLACE_CMD} -e \ 's|/usr/bin/freetype-config|${LOCALBASE}/bin/freetype-config|; \ s|/usr/bin/imlib2-config|${LOCALBASE}/bin/imlib2-config|; \ - s|/usr/X11R6/include|${X11BASE}/include|; \ + s|/usr/X11R6/include|${LOCALBASE}/include|; \ s|"COPYING", "README", ||' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \ ${WRKSRC}/setup.py ${WRKSRC}/pypanel diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index fe264f8..5a11037 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -8,6 +8,7 @@ PORTNAME= sunbird PORTVERSION= 0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/deskutils/tagutils/Makefile b/deskutils/tagutils/Makefile index 6d6c511..5e7fd62 100644 --- a/deskutils/tagutils/Makefile +++ b/deskutils/tagutils/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= leaftag.0:${PORTSDIR}/devel/libleaftag USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index 19b0e13..90a3911 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -34,7 +34,6 @@ USE_AUTOTOOLS= autoconf:261:env automake:19:env libtool:15:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile index 5f60a12..65c356a 100644 --- a/deskutils/tpb/Makefile +++ b/deskutils/tpb/Makefile @@ -38,7 +38,7 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/cfg.h \ ${WRKSRC}/man/tpb.1 diff --git a/deskutils/tpb/files/patch-man-tpb.1 b/deskutils/tpb/files/patch-man-tpb.1 index 5ac30a6..ba4e909 100644 --- a/deskutils/tpb/files/patch-man-tpb.1 +++ b/deskutils/tpb/files/patch-man-tpb.1 @@ -43,7 +43,7 @@ This program was developed on a Thinkpad Model T21. .SH EXAMPLE -tpb \-\-osd=off \-\-verbose \-\-thinkpad="xterm \-T ntpctl \-e ntpctl" -+tpb \-\-osd=off \-\-verbose \-\-thinkpad="%%X11BASE%%/bin/xterm" ++tpb \-\-osd=off \-\-verbose \-\-thinkpad="%%LOCALBASE%%/bin/xterm" .SH COPYRIGHT Copyright 2002-2005, Markus Braun <markus.braun@krawel.de> .PP diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile index 36562d6..245e08b 100644 --- a/deskutils/tuxcards/Makefile +++ b/deskutils/tuxcards/Makefile @@ -23,10 +23,10 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" .include <bsd.port.pre.mk> # Add this condititonal while people might still have old versions -# of qmake, living in X11BASE, installed. This should go away eventually. +# of qmake, living in LOCALBASE, installed. This should go away eventually. -.if exists(${X11BASE}/share/qt/mkspecs/freebsd-g++) -QMAKESPEC= ${X11BASE}/share/qt/mkspecs/freebsd-g++ +.if exists(${LOCALBASE}/share/qt/mkspecs/freebsd-g++) +QMAKESPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .else QMAKESPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .endif diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 631165e..53d4747 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -29,7 +29,7 @@ post-patch: ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero @${ECHO_MSG} removing unneccessary DependTarget from Imakefile-s ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl' .include <bsd.port.mk> diff --git a/deskutils/xmdiary/files/patch-ab b/deskutils/xmdiary/files/patch-ab index 9a3f20c..1f28e76 100644 --- a/deskutils/xmdiary/files/patch-ab +++ b/deskutils/xmdiary/files/patch-ab @@ -17,10 +17,10 @@ -XDDATADIR = /usr/local/lib/xdiary -XDAPPDIR = /usr/lib/X11/app-defaults -XDMANDIR = /usr/local/man/man1 -+XDEXEDIR = $(X11BASE)/bin -+XDDATADIR = $(X11BASE)/lib/X11/xdiary -+XDAPPDIR = $(X11BASE)/lib/X11/app-defaults -+XDMANDIR = $(X11BASE)/man/man1 ++XDEXEDIR = $(LOCALBASE)/bin ++XDDATADIR = $(LOCALBASE)/lib/X11/xdiary ++XDAPPDIR = $(LOCALBASE)/lib/X11/app-defaults ++XDMANDIR = $(LOCALBASE)/man/man1 /*---------------------------------------------------------------------------- diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile index a2765cb..6789bf0 100644 --- a/deskutils/xopps/Makefile +++ b/deskutils/xopps/Makefile @@ -7,7 +7,7 @@ PORTNAME= xopps PORTVERSION= 1.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://cvsup.theplanet.com/distfiles/ \ http://dl.droso.net/ports/ @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A tool which lets you draw Gantt charts ALL_TARGET= -USE_X_PREFIX= yes USE_MOTIF= yes MAKE_ENV= 'MACH=${OPSYS}' diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa index e825439..f95ce7b 100644 --- a/deskutils/xopps/files/patch-aa +++ b/deskutils/xopps/files/patch-aa @@ -62,7 +62,7 @@ -LIBS = -lXm -lXt -lX11 -SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib +LIBS = -lXm -lXext -lXt -lX11 ${MOTIFLIB} -+LIBS+= -Wl,-rpath,$(X11BASE)/lib ++LIBS+= -Wl,-rpath,$(LOCALBASE)/lib +#SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH) diff --git a/deskutils/xopps/files/patch-ab b/deskutils/xopps/files/patch-ab index 4d17292..b47c6c8 100644 --- a/deskutils/xopps/files/patch-ab +++ b/deskutils/xopps/files/patch-ab @@ -14,8 +14,8 @@ -MACHINCLPATH = -I/SFOC/$(SFOCVER)/include/$(MACH) -I/usr/5include -MACHLIBPATH = -L/usr/5lib +MACHDEFS = -ansi -fsigned-char -+MACHINCLPATH = -I$(X11BASE)/include -+MACHLIBPATH = -L$(X11BASE)/lib ++MACHINCLPATH = -I$(LOCALBASE)/include ++MACHLIBPATH = -L$(LOCALBASE)/lib MACHLIBS = MACHLIBS_SYBCL = -lsybdb -lcs -lct -lcomn -ltcl -lintl -linsck -lm diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index 843ad00..ec9853d 100644 --- a/deskutils/xpad/Makefile +++ b/deskutils/xpad/Makefile @@ -7,15 +7,16 @@ PORTNAME= xpad PORTVERSION= 2.14 +PORTREVISION= 1 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= amyfoub@gmail.com COMMENT= A virtual note-pad system for your X11 desktop USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= x11 sm USE_GNOME= pkgconfig gtk20 gnomehier intltool GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ diff --git a/devel/ace+tao/Makefile b/devel/ace+tao/Makefile index 0456019..1415997 100644 --- a/devel/ace+tao/Makefile +++ b/devel/ace+tao/Makefile @@ -23,7 +23,7 @@ TAO_VERSION= 1.4.2 USE_BZIP2= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes TESTS= "@comment " .if defined(WITH_TESTS) diff --git a/devel/acovea/Makefile b/devel/acovea/Makefile index 2b4023d..abca5a7 100644 --- a/devel/acovea/Makefile +++ b/devel/acovea/Makefile @@ -17,7 +17,7 @@ COMMENT= Tool to find the "best" compiler options using genetic algorithm LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ evocosm-3.1.1:${PORTSDIR}/devel/libevocosm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= CPPFLAGS=-I${PREFIX}/include/ LDFLAGS=-L${PREFIX}/lib/ diff --git a/devel/adabindx/Makefile b/devel/adabindx/Makefile index 7492024..d161a8f 100644 --- a/devel/adabindx/Makefile +++ b/devel/adabindx/Makefile @@ -7,7 +7,7 @@ PORTNAME= adabindx PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://home.arcor.de/hfvogt/ @@ -17,18 +17,18 @@ COMMENT= An Ada-binding to the X Window System and *tif BUILD_DEPENDS= gnatmake:${PORTSDIR}/lang/gnat USE_MOTIF= yes -USE_X_PREFIX= yes +USE_XORG= x11 post-patch: # @mv ${WRKSRC}/lib ${WRKSRC}/src #do-install: -# @${MKDIR} ${X11BASE}/lib/adabindx +# @${MKDIR} ${LOCALBASE}/lib/adabindx # @(for i in `cat pkg-plist|grep "lib/adabindx"|grep -v dirrm|sed "s/lib\/adabindx\///"`; do \ # ${INSTALL_DATA} ${WRKSRC}/lib/$${i} ${PREFIX}/lib/adabindx; \ # done) # -# @${MKDIR} ${X11BASE}/share/adabindx +# @${MKDIR} ${LOCALBASE}/share/adabindx # @(for i in `cat pkg-plist|grep "share/adabindx"|grep -v dirrm|sed "s/share\/adabindx\///"`; do \ # ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/share/adabindx; \ # done) diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile index fbec5f6..9216098 100644 --- a/devel/adasdl/Makefile +++ b/devel/adasdl/Makefile @@ -9,8 +9,7 @@ PORTNAME= adasdl PORTVERSION= 20010504 PORTREVISION= 5 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= AdaSDL_${PORTVERSION} MAINTAINER= david@realityrift.com @@ -29,9 +28,9 @@ do-patch: for i in `${FIND} ${WRKSRC} -name 'make.conf_x11'`; do \ ${REINPLACE_CMD} \ -e 's,/usr/local,${LOCALBASE},g' \ - -e 's,/usr/X11R6,${X11BASE},g' \ + -e 's,/usr/X11R6,${LOCALBASE},g' \ -e 's,-lpthread,-pthread,' \ - -e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \ + -e 's,-lGL,-L${LOCALBASE}/lib\ -lX11 -lXext -lGL,' \ $${i}; \ done diff --git a/devel/adasdl/files/patch-AdaGL-make.conf_x11 b/devel/adasdl/files/patch-AdaGL-make.conf_x11 index 17f914a..08bb026 100644 --- a/devel/adasdl/files/patch-AdaGL-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaGL-make.conf_x11 @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU GNATHTML=/usr/local/bin/gnathtml.pl PERL=/usr/bin/perl diff --git a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 index 740144d50..b979af7 100644 --- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11 @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU GNATHTML=/usr/local/bin/gnathtml.pl PERL=/usr/bin/perl EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 index f8fb309..e093659 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile index b0b4612..8168bf3 100644 --- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile +++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile @@ -4,7 +4,7 @@ -INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I.. -include ../make.conf -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU + +INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I.. diff --git a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 index ba7104b..cc48156 100644 --- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_image -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 index c344fbf..71868d9 100644 --- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 +++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 @@ -3,6 +3,6 @@ @@ -1,4 +1,4 @@ #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU -+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU ++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU EXE= diff --git a/devel/adime/Makefile b/devel/adime/Makefile index 4b55f4f..0d077a7 100644 --- a/devel/adime/Makefile +++ b/devel/adime/Makefile @@ -25,7 +25,7 @@ INFO= adime MAKEFILE= makefile INSTALL_TARGET= install install-info install-man -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes pre-build: @(cd ${WRKSRC} && ${SH} fix.sh unix) diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index f18a39d..6681454 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -8,9 +8,9 @@ PORTNAME= anjuta PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= anjuta +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= Integrated Development Environment for C and C++ @@ -30,7 +30,6 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes -USE_XLIB= yes USE_AUTOTOOLS= autotools:run USE_GMAKE= yes USE_GETTEXT= yes diff --git a/devel/antlrworks/Makefile b/devel/antlrworks/Makefile index 3fbe2bc..5e4c1ec 100644 --- a/devel/antlrworks/Makefile +++ b/devel/antlrworks/Makefile @@ -6,6 +6,7 @@ PORTNAME= antlrworks PORTVERSION= 1.1.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel java MASTER_SITES= http://www.antlr.org/download/ @@ -16,7 +17,6 @@ COMMENT= The ANTLR GUI Development Environment USE_ZIP= yes EXTRACT_AFTER_ARGS= "-d${DISTNAME}" -USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/devel/asis/Makefile b/devel/asis/Makefile index a9945b4..09f9683 100644 --- a/devel/asis/Makefile +++ b/devel/asis/Makefile @@ -19,7 +19,7 @@ COMMENT= GNAT implementation of the Ada Semantic Interface Specification BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile index 6a1579f..9bef0fb 100644 --- a/devel/asmutils/Makefile +++ b/devel/asmutils/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= ${PREFIX}/lib/asmutils # This will play merry hell with portlint diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 4010b09..1430edf 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -7,7 +7,7 @@ PORTNAME= bonobo-conf PORTVERSION= 0.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16 @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16 MAINTAINER= gnome@FreeBSD.org COMMENT= Bonobo configuration moniker -USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack bonobo gconf diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 729484e..0680f68 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -8,7 +8,7 @@ PORTNAME= bonobo PORTVERSION= 1.0.22 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= The component and compound document system for GNOME USE_BZIP2= yes -USE_XLIB= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index efe22fb..38e9601 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -8,6 +8,7 @@ PORTNAME= bug-buddy PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +21,6 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/c2lib/Makefile b/devel/c2lib/Makefile index 3879e4c..e7acc18 100644 --- a/devel/c2lib/Makefile +++ b/devel/c2lib/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= cdoc:${PORTSDIR}/devel/cdoc \ make+:${PORTSDIR}/devel/makeplus LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} PLIST_SUB= VERSION=${PORTVERSION} diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index c841037..d4b8d42 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -40,7 +40,7 @@ LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CONFIGURE_ARGS+=--with-ncurses ALL_TARGET= default examples demos cli cdkshlib INSTALL_TARGET= install installCDKSHLibrary -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include "${.CURDIR}/maninfo.mk" diff --git a/devel/cgilib/Makefile b/devel/cgilib/Makefile index b42190e..4b22e6f 100644 --- a/devel/cgilib/Makefile +++ b/devel/cgilib/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/ \ MAINTAINER= demon@FreeBSD.org COMMENT= A library of procedures for developing CGI programs in C -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKEFILE= ${FILESDIR}/Makefile.bsd diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 4c7853d..cc7abc0 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -8,6 +8,7 @@ PORTNAME= clanlib PORTVERSION= 0.8.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.clanlib.org/download/releases-0.8/ \ @@ -32,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 USE_GNOME= gnomehack gnometarget pkgconfig USE_LDCONFIG= yes USE_SDL= gfx diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 346c7b8..20201b8 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -25,6 +25,6 @@ MAN1= ccmake.1 cmake.1 ctest.1 post-patch: @${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \ - ${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' + ${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' .include <bsd.port.mk> diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile index b5bffa3..f944ece 100644 --- a/devel/cppunit/Makefile +++ b/devel/cppunit/Makefile @@ -15,7 +15,7 @@ COMMENT= C++ port of the JUnit framework for unit testing USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITH_DOXYGEN) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile index 20e8961..b7d492c 100644 --- a/devel/dbus-qt3/Makefile +++ b/devel/dbus-qt3/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_SUB= VERSION="1.0" diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 1cda359..d7322b6 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -7,7 +7,7 @@ PORTNAME= dbus PORTVERSION?= 1.1.20 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -41,7 +41,7 @@ MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \ dbus-monitor.1 dbus-send.1 dbus-uuidgen.1 .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .else CONFIGURE_ARGS+=--without-x .endif diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index f78c0c0..c41b149 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -46,7 +46,7 @@ LIBXMDIR!= ${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/\/libXm\.a//g' | ${AWK} '{prin LIBXMDIR!= ${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/-L//g' | ${AWK} '{print $$1}' .endif .else -LIBXMDIR= ${X11BASE} +LIBXMDIR= ${LOCALBASE} .endif pre-patch: diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index e493b76..38aa919 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -7,6 +7,7 @@ PORTNAME= devhelp PORTVERSION= 0.19 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,} @@ -31,7 +32,7 @@ MOZILLA= seamonkey .endif USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile index 56fab45..a52960e 100644 --- a/devel/djgpp-binutils/Makefile +++ b/devel/djgpp-binutils/Makefile @@ -63,7 +63,7 @@ post-install: add-plist-post: @${ECHO_CMD} "@unexec rmdir -p %D/${TARGET}/info 2> /dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir -p %D/${TARGET} 2> /dev/null || true" >> ${TMPPLIST} -.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") +.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile index 712f59b..a22a40a 100644 --- a/devel/dotconf++/Makefile +++ b/devel/dotconf++/Makefile @@ -18,7 +18,7 @@ COMMENT= Configuration file parser written in C++ USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \ diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile index 72bddcd..3276723 100644 --- a/devel/dotconf/Makefile +++ b/devel/dotconf/Makefile @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes pre-patch: @${REINPLACE_CMD} -e 's|-Wall -g||' ${WRKSRC}/configure diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 761e964..96f727e 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -44,7 +44,7 @@ MAKE_ARGS+= HAVE_LATEX=yes .if !defined(WITHOUT_DOXYWIZARD) USE_QT_VER= 3 -QT_INC= ${X11BASE}/include +QT_INC= ${LOCALBASE}/include QTNAME= qt-mt QT_OPENGL= THREADLIBS= ${PTHREAD_LIBS} diff --git a/devel/eric/Makefile b/devel/eric/Makefile index 3134130..aae8784 100644 --- a/devel/eric/Makefile +++ b/devel/eric/Makefile @@ -9,13 +9,13 @@ PORTNAME= eric PORTVERSION= 3.9.4 PORTREVISION= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= eric-ide MAINTAINER= leafy7382@gmail.com COMMENT= A Python IDE implemented using PyQt and QScintilla -BUILD_DEPENDS= ${X11BASE}/lib/libqscintilla.so:${PORTSDIR}/x11-toolkits/qscintilla \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libqscintilla.so:${PORTSDIR}/x11-toolkits/qscintilla \ ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \ pyuic:${PORTSDIR}/x11-toolkits/py-qt RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile index 23f706f9..12266a6 100644 --- a/devel/esdl/files/patch-c__src_Makefile +++ b/devel/esdl/files/patch-c__src_Makefile @@ -8,7 +8,7 @@ $FreeBSD$ else - OGLDIR = /usr -+ OGLDIR = ${X11BASE} ++ OGLDIR = ${LOCALBASE} # Uncomment these if your opengl header is located in another directory than # the usual $(OGLDIR)/include/GL/gl.h diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile index 035bcde..bb97b5c 100644 --- a/devel/evolution-gconf-tools/Makefile +++ b/devel/evolution-gconf-tools/Makefile @@ -8,7 +8,7 @@ PORTNAME= evolution-gconf-tools PORTVERSION= 0.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://people.redhat.com/dmalcolm/evolution-gconf-tools/ @@ -18,7 +18,6 @@ COMMENT= Scripts to make it easier to work with Evolution's configuration RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution GNU_CONFIGURE= yes -USE_X_PREFIX= yes USE_PYTHON= yes USE_GNOME= gnomeprefix diff --git a/devel/fib/Makefile b/devel/fib/Makefile index ad3ddb3..5743176 100644 --- a/devel/fib/Makefile +++ b/devel/fib/Makefile @@ -13,7 +13,7 @@ MAINTAINER= perky@FreeBSD.org COMMENT= Fibonacci Heap Library GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 diff --git a/devel/gauche-sdl/Makefile b/devel/gauche-sdl/Makefile index 4b47e2d..7ae3c98 100644 --- a/devel/gauche-sdl/Makefile +++ b/devel/gauche-sdl/Makefile @@ -17,9 +17,9 @@ MAINTAINER= erik@smluc.org COMMENT= Scheme script interpreter with multibyte character handling BUILD_DEPENDS= gosh:${PORTSDIR}/lang/gauche \ - ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT} + ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \ - ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT} + ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\ TARGET="${CONFIGURE_TARGET}" diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 2aa2e68..cc96a38 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -8,7 +8,7 @@ PORTNAME= gconf PORTVERSION= 1.0.9 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/1.0 @@ -23,7 +23,6 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index 024621a..fcdec5c 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gconfmm PORTVERSION= 2.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -20,11 +20,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gconf2 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index e2bf725..e1bec08 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= gconfmm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,9 +24,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ LATEST_LINK= gconfmm26 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack gconf2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile index 2827f2d..7a05aff 100644 --- a/devel/gengameng/Makefile +++ b/devel/gengameng/Makefile @@ -19,8 +19,8 @@ USE_SDL= image sdl GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+= --program-prefix="" -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" post-patch: ${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g; \ diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 3da44d8..57d1c2c 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -83,7 +83,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/gettext-tools/misc/${f} \ ${PREFIX}/share/emacs/site-lisp .endfor - @${MKDIR} ${X11BASE}/share/locale + @${MKDIR} ${LOCALBASE}/share/locale @cd ${WRKSRC}/gettext-tools/doc && make install-info-am .include <bsd.port.mk> diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index b487039..a8b2e6e 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -8,6 +8,7 @@ PORTNAME= glade PORTVERSION= 2.12.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,7 +22,6 @@ LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack gnomehack gtk20 desktopfileutils diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index 8d09f12..1005ef2 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -8,6 +8,7 @@ PORTNAME= glade3 PORTVERSION= 3.4.3 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A user interface builder for GTK+/GNOME INSTALLS_ICONS= yes -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack \ diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile index c3df826..1cfb43f 100644 --- a/devel/glademm/Makefile +++ b/devel/glademm/Makefile @@ -7,7 +7,7 @@ PORTNAME= glademm PORTVERSION= 2.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= http://home.wtal.de/petig/Gtk/ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} MAINTAINER= bland@FreeBSD.org COMMENT= A C++ code generator backend for glade and glade2 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnometarget GNU_CONFIGURE= yes diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index c651c43..f7e06f6 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-build PORTVERSION= 0.2.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5- LIB_DEPENDS= gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext -USE_XLIB= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomevfs2 diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile index df0b32c..cab8406 100644 --- a/devel/gnome-crash/Makefile +++ b/devel/gnome-crash/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-crash PORTVERSION= 0.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-crash/0.0 @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/gnome-crash/0.0 MAINTAINER= gnome@FreeBSD.org COMMENT= A small coredump analysis tool for GNOME -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libglade gnomeprint GNU_CONFIGURE= yes diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 6d8c669..da338f5 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-vfs PORTVERSION= 2.22.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ ltverhack referencehack USE_AUTOTOOLS= libtool:15 diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 80b3531..39fc014 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-vfs PORTVERSION= 1.0.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/1.0 @@ -20,7 +20,6 @@ COMMENT= GNOME Virtual File System USE_ICONV= yes USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \ gnomemimedata gnomelibs USE_GETTEXT= yes diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index 91dd177..5ffef39 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -9,6 +9,7 @@ PORTNAME= goffice PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +21,6 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome libgnomeui ltverhack USE_GETTEXT= yes diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile index c5902b0..0f5e07c 100644 --- a/devel/goffice04/Makefile +++ b/devel/goffice04/Makefile @@ -9,7 +9,7 @@ PORTNAME= goffice PORTVERSION= 0.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ NO_LATEST_LINK= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome libgnomeui ltverhack USE_GETTEXT= yes diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile index ac8a897..040e291 100644 --- a/devel/goffice1/Makefile +++ b/devel/goffice1/Makefile @@ -8,7 +8,7 @@ PORTNAME= goffice PORTVERSION= 0.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 @@ -20,7 +20,6 @@ NO_LATEST_LINK= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome ltverhack USE_GETTEXT= yes diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 97ef9b0..74690d6 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtranslator PORTVERSION= 1.1.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,6 @@ COMMENT= A GNOME application for creating GNU gettext translation files LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell -USE_XLIB= yes USE_BZIP2= yes USE_GNOME= gnomehack intlhack gnomeprefix gnometarget gnomevfs2 libgnomeui USE_GMAKE= yes diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile index 3a20c5e..e3e6d9b 100644 --- a/devel/guichan/Makefile +++ b/devel/guichan/Makefile @@ -20,8 +20,8 @@ USE_GCC= 3.2+ GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= SDL "Enable SDL support" On \ ALLEGRO "Enable Allegro support" Off \ diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile index ad725e2..a4a000e 100644 --- a/devel/hs-tclhaskell-ghc/Makefile +++ b/devel/hs-tclhaskell-ghc/Makefile @@ -42,8 +42,8 @@ PKGINSTALL= ${WRKDIR}/pkg-install MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" \ MKDIR="${MKDIR}" GHC="${GHC}" MAKE_ARGS+= CC="${CC}" GHC="${GHC}" CC_OPTS="${CFLAGS}" \ - CC_INC="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \ - CCLIB="-L${X11BASE}/lib/X11 -L${LOCALBASE}/lib" \ + CC_INC=" -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \ + CCLIB="-L${LOCALBASE}/lib" \ IMPORTS="${GHC_LIB}/imports/tclhaskell" TCLLIBS="-ltk83 -ltcl83" \ TCL_REQ="-ltk83 -ltcl83" PREFIX="${GHC_LIB}" diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 4e7f675..2a4fd58 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -20,7 +20,7 @@ COMMENT= International Components for Unicode (from IBM) OPTIONS= THREADS "Build thread-safe version of the library" on CONFLICTS= icu2-[0-9]* -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/icu/source diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile index 4e7f675..2a4fd58 100644 --- a/devel/icu4/Makefile +++ b/devel/icu4/Makefile @@ -20,7 +20,7 @@ COMMENT= International Components for Unicode (from IBM) OPTIONS= THREADS "Build thread-safe version of the library" on CONFLICTS= icu2-[0-9]* -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/icu/source diff --git a/devel/json-c/Makefile b/devel/json-c/Makefile index c441243..820b69f 100644 --- a/devel/json-c/Makefile +++ b/devel/json-c/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://oss.metaparadigm.com/json-c/ MAINTAINER= gno@yahoo-inc.com COMMENT= A JSON (Javascript Object Notation) implementation in C -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnometarget pkgconfig gnomehack diff --git a/devel/judy/Makefile b/devel/judy/Makefile index bde708a..03f41a3 100644 --- a/devel/judy/Makefile +++ b/devel/judy/Makefile @@ -16,7 +16,7 @@ COMMENT= General purpose dynamic array GNU_CONFIGURE= yes USE_GMAKE= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES MAN3= Judy.3 Judy1.3 Judy1_funcs.3 JudyHS.3 JudyHS_funcs.3 \ JudyL.3 JudyL_funcs.3 JudySL.3 JudySL_funcs.3 diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile index e7b2056..30d336d 100644 --- a/devel/kaptain/Makefile +++ b/devel/kaptain/Makefile @@ -9,19 +9,19 @@ PORTNAME= kaptain PORTVERSION= 0.72 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A tool for building/running QT GUIs for commmand line programs +USE_XORG= x11 ice xext USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --enable-mt \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --enable-mt MAN1= kaptain.1 INFO= kaptain diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 4bf1d1f..6b2aaa8 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -42,7 +42,7 @@ USE_GMAKE= yes USE_BDB= yes USE_AUTOTOOLS= libtool:15 autotools:run _NO_KDE_FINAL= yes -CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \ +CONFIGURE_ARGS+=--with-qtdoc-dir=${LOCALBSE}/share/doc/qt/html \ --with-db-includedir=${BDB_INCLUDE_DIR} \ --with-db-libdir=${BDB_LIB_DIR} --with-db-lib=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile index 97a00e1..b0b5ee9 100644 --- a/devel/kxl/Makefile +++ b/devel/kxl/Makefile @@ -7,7 +7,7 @@ PORTNAME= kxl PORTVERSION= 1.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel games MASTER_SITES= http://kxl.orz.hm/download/ DISTNAME= KXL-${PORTVERSION} @@ -16,11 +16,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A visual, sound library for games USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm x11 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 7593fa7e..3a78e3e 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -9,8 +9,7 @@ PORTNAME= kyra PORTVERSION= 2.0.7 PORTREVISION= 6 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} MAINTAINER= ports@FreeBSD.org @@ -26,8 +25,8 @@ USE_AUTOTOOLS= libtool:15 USE_SDL= image sdl USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/leaktracer/Makefile b/devel/leaktracer/Makefile index 58be8bd..2322238 100644 --- a/devel/leaktracer/Makefile +++ b/devel/leaktracer/Makefile @@ -15,7 +15,7 @@ DISTNAME= LeakTracer MAINTAINER= danfe@FreeBSD.org COMMENT= Trace and analyze memory leaks in C++ programs -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes USE_PERL5_RUN= yes MAKE_ENV= CXX="${CXX}" \ diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile index 9b10ea2..d4c351a 100644 --- a/devel/libafterbase/Makefile +++ b/devel/libafterbase/Makefile @@ -8,16 +8,14 @@ PORTNAME= libafterbase PORTVERSION= 0.92 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= afterstep +MASTER_SITES= SF/afterstep DISTNAME= libAfterBase-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= AfterStep basic functionality library -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs --with-x diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile index 400335c..f1c0c00 100644 --- a/devel/libassetml/Makefile +++ b/devel/libassetml/Makefile @@ -7,9 +7,9 @@ PORTNAME= libassetml PORTVERSION= 1.2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ofset MAINTAINER= gnome@FreeBSD.org @@ -19,7 +19,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig USE_GETTEXT= yes diff --git a/devel/libast/Makefile b/devel/libast/Makefile index 9c0fa84..9b7d163 100644 --- a/devel/libast/Makefile +++ b/devel/libast/Makefile @@ -7,7 +7,7 @@ PORTNAME= libast PORTVERSION= 0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.eterm.org/download/ \ CRITICAL @@ -18,7 +18,6 @@ COMMENT= A library of assorted spiffy things LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GNOME= gnomehack USE_EFL= imlib2 GNU_CONFIGURE= yes diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile index a2e1a49..8f27e67 100644 --- a/devel/libbegemot/Makefile +++ b/devel/libbegemot/Makefile @@ -18,7 +18,7 @@ COMMENT= A function library for begemot tools GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libltdl:15 libtool:15:env -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= cstrc.1 frame.1 getfields.1 intro.1 panic.1 prstat.1 readline.1 \ diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile index 0797729..f51022a 100644 --- a/devel/libbonobomm/Makefile +++ b/devel/libbonobomm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbonobomm PORTVERSION= 1.3.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,11 +21,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack libbonobo USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static post-patch: diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile index fd66706..22afa7b 100644 --- a/devel/libchipcard/Makefile +++ b/devel/libchipcard/Makefile @@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ diff --git a/devel/libdict/Makefile b/devel/libdict/Makefile index 876715f..f214e81 100644 --- a/devel/libdict/Makefile +++ b/devel/libdict/Makefile @@ -18,7 +18,7 @@ COMMENT= Library providing access to ``dictionary'' data structures USE_GMAKE= yes MAKEFILE= GNUmakefile -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: . for ___f in avl_insert.pdf empty.pdf treap_insert.pdf diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile index aacdc01..7bc41d5 100644 --- a/devel/libdnsres/Makefile +++ b/devel/libdnsres/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/devel/libds/Makefile b/devel/libds/Makefile index 4066daa..438a4e8 100644 --- a/devel/libds/Makefile +++ b/devel/libds/Makefile @@ -15,7 +15,7 @@ DISTNAME= libds-2.1 MAINTAINER= kingofgib@users.sourceforge.net COMMENT= ANSI Generic Data Structures Library -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ALL_TARGET= gcc .include <bsd.port.pre.mk> diff --git a/devel/libevocosm/Makefile b/devel/libevocosm/Makefile index f521329..0e0939b 100644 --- a/devel/libevocosm/Makefile +++ b/devel/libevocosm/Makefile @@ -16,7 +16,7 @@ COMMENT= Collection of tools for creating a variety of evolutionary algorithms LIB_DEPENDS= coyotl-3.1.4:${PORTSDIR}/devel/libcoyotl \ png.5:${PORTSDIR}/graphics/png -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= CPPFLAGS=-I${PREFIX}/include/ LDFLAGS=-L${PREFIX}/lib/ diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile index 3c15171..3d3c053 100644 --- a/devel/libgconf-java/Makefile +++ b/devel/libgconf-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgconf-java PORTVERSION= 2.12.6 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +20,6 @@ BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/ RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile index 9e56a03..83d5dd2 100644 --- a/devel/libglade-java/Makefile +++ b/devel/libglade-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libglade-java PORTVERSION= 2.12.8 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -22,7 +23,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/li ${JAVALIBDIR}/gnome${GNOME_API_VERSION}.jar:${PORTSDIR}/x11/libgnome-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index ec67a1f..7444653 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.17 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/libglade/0.17 @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/libglade/0.17 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME glade library -USE_XLIB= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile index 281d986..0f67c5a 100644 --- a/devel/libglademm/Makefile +++ b/devel/libglademm/Makefile @@ -7,9 +7,9 @@ PORTNAME= libglademm PORTVERSION= 2.1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gtkmm DIST_SUBDIR= gnome2 @@ -19,11 +19,11 @@ COMMENT= C++ wrapper for libglade2 library LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_XLIB= yes +USE_XORG= x11 sm USE_GMAKE= yes USE_GNOME= gnomehack libglade2 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static post-patch: diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile index 9152d59a..024ac25 100644 --- a/devel/libglademm24/Makefile +++ b/devel/libglademm24/Makefile @@ -8,7 +8,7 @@ PORTNAME= libglademm PORTVERSION= 2.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -23,12 +23,11 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libglademm24 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libglade2 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static PLIST_SUB= VERSION="2.4" API_VERSION="2.4" diff --git a/devel/libgpc/Makefile b/devel/libgpc/Makefile index 376211d..3982edb 100644 --- a/devel/libgpc/Makefile +++ b/devel/libgpc/Makefile @@ -18,7 +18,7 @@ USE_ZIP= yes PLIST_FILES= lib/libgpc.so.2 \ lib/libgpc.so lib/libgpc.a \ include/gpc.h -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_CDROM= Can't be used for profit without permission MAKEFILE= ${FILESDIR}/BSDmakefile diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 1cdc52b..65b43da 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -8,9 +8,9 @@ PORTNAME= libgsf PORTVERSION= 1.14.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 @@ -21,7 +21,6 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/devel/libisc/Makefile b/devel/libisc/Makefile index fd9580e..17a35b7 100644 --- a/devel/libisc/Makefile +++ b/devel/libisc/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes MANCOMPRESSED= yes BUILD_WRKSRC= ${WRKSRC}/lib/bind/freebsdportisc/ INSTALL_WRKSRC= ${BUILD_WRKSRC} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= assertions.3 eventlib.3 logging.3 tree.3 bitncmp.3 heap.3 \ memcluster.3 diff --git a/devel/libltdl15/Makefile b/devel/libltdl15/Makefile index cc14982..0c0a63a 100644 --- a/devel/libltdl15/Makefile +++ b/devel/libltdl15/Makefile @@ -10,7 +10,7 @@ MASTERDIR= ${.CURDIR}/../../devel/libtool15 COMMENT= System independent dlopen wrapper -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-ltdl-install BUILD_WRKSRC= ${WRKSRC}/libltdl INSTALL_WRKSRC= ${WRKSRC}/libltdl diff --git a/devel/libmcve/Makefile b/devel/libmcve/Makefile index 4cb86f3..d320519 100644 --- a/devel/libmcve/Makefile +++ b/devel/libmcve/Makefile @@ -16,7 +16,7 @@ COMMENT= Library to allow credit card processing through MCVE GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --without-pthread .include <bsd.port.mk> diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile index 5b19729..67b51e9 100644 --- a/devel/libmimedir/Makefile +++ b/devel/libmimedir/Makefile @@ -20,7 +20,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_BISON= build USE_LDCONFIG= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes regression-test: cd ${WRKSRC} && ./test diff --git a/devel/libmonetra/Makefile b/devel/libmonetra/Makefile index 4cb86f3..d320519 100644 --- a/devel/libmonetra/Makefile +++ b/devel/libmonetra/Makefile @@ -16,7 +16,7 @@ COMMENT= Library to allow credit card processing through MCVE GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --without-pthread .include <bsd.port.mk> diff --git a/devel/libmtrie/Makefile b/devel/libmtrie/Makefile index 37b25ce..80b6878 100644 --- a/devel/libmtrie/Makefile +++ b/devel/libmtrie/Makefile @@ -15,7 +15,7 @@ USE_BZIP2= yes MAINTAINER= alfred@FreeBSD.org COMMENT= A library to build an IP-netmask based mtrie. -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(NOPROFILE) PLIST_SUB+= HURRRR="@comment " diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile index 038f928..ae1992e 100644 --- a/devel/libpci/Makefile +++ b/devel/libpci/Makefile @@ -19,7 +19,7 @@ COMMENT= PCI configuration space I/O made easy USE_GMAKE= yes NO_INSTALL_MANPAGES= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= LANG=C ALL_TARGET= lib/libpci.a diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile index 4f2ad1a..4985790 100644 --- a/devel/libphish/Makefile +++ b/devel/libphish/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GCC= 3.2+ GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/devel/libpperl/Makefile b/devel/libpperl/Makefile index 9acedc5..95da97b 100644 --- a/devel/libpperl/Makefile +++ b/devel/libpperl/Makefile @@ -18,7 +18,7 @@ COMMENT= A library easing embedding perl interpreters into C programs WRKSRC= ${WRKDIR}/${PORTNAME} USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig USE_PERL5= 5.8.0+ diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile index 1769f11..606c32c 100644 --- a/devel/libs11n/Makefile +++ b/devel/libs11n/Makefile @@ -19,7 +19,7 @@ COMMENT= A C++ library for easily serializing a wide variety of objects WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_ZIP= yes USE_GCC= 3.2+ -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: @${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile index 15c7b20..2075924 100644 --- a/devel/libstatgrab/Makefile +++ b/devel/libstatgrab/Makefile @@ -19,7 +19,7 @@ MAINTAINER= tdb@FreeBSD.org COMMENT= Provides a useful interface to system statistics DIST_SUBDIR= i-scream -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gnometarget pkgconfig diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile index 1cc322a..45a50f2 100644 --- a/devel/libstroke/Makefile +++ b/devel/libstroke/Makefile @@ -7,14 +7,14 @@ PORTNAME= libstroke PORTVERSION= 0.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.etla.net/libstroke/ MAINTAINER= ports@FreeBSD.org COMMENT= A stroke translation library -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 WANT_GNOME= yes diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile index dbde807..b14a3fa 100644 --- a/devel/libtai/Makefile +++ b/devel/libtai/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library for storing and manipulating dates and times in second/attosecond ALL_TARGET= it -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= LIBVERSION="${LIBVERSION}" PLIST_SUB= LIBVERSION=${LIBVERSION} \ diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile index e438250..d12299d 100644 --- a/devel/libthai/Makefile +++ b/devel/libthai/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.usablelabs.com/download/ MAINTAINER= piyawat@usablelabs.com COMMENT= Thai language support library -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:15 autoconf:261 libtool:15 diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile index bc91856..7e2abf5 100644 --- a/devel/libukcprog/Makefile +++ b/devel/libukcprog/Makefile @@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool:15 MAN3= ukcprog.3 DIST_SUBDIR= i-scream GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget pkgconfig lthack .include <bsd.port.mk> diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile index 61405f0..f09858a 100644 --- a/devel/libunicode/Makefile +++ b/devel/libunicode/Makefile @@ -8,9 +8,9 @@ PORTNAME= libunicode PORTVERSION= 0.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/libunicode/0.4 DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome @@ -19,7 +19,6 @@ COMMENT= A library for manipulating Unicode characters and strings USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile index 714e162..16fd765 100644 --- a/devel/libvanessa_adt/Makefile +++ b/devel/libvanessa_adt/Makefile @@ -17,7 +17,7 @@ COMMENT= Library that provides ADTs (queues, dynamic arrays and more) LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= YES diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile index eb3ccfa..3450022 100644 --- a/devel/libvanessa_logger/Makefile +++ b/devel/libvanessa_logger/Makefile @@ -16,7 +16,7 @@ MAINTAINER= thomas@bsdunix.ch COMMENT= Library that provides a generic logging layer USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES GNU_CONFIGURE= YES post-patch: diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile index 8a91144..bdf09e4 100644 --- a/devel/libvanessa_socket/Makefile +++ b/devel/libvanessa_socket/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \ MAN1= vanessa_socket_pipe.1 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES GNU_CONFIGURE= YES CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile index 1ab615c..19138d1 100644 --- a/devel/libvc/Makefile +++ b/devel/libvc/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_BISON= build GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= vc.3 diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile index ea98cb4..ac60f2c 100644 --- a/devel/libytnef/Makefile +++ b/devel/libytnef/Makefile @@ -17,7 +17,7 @@ COMMENT= Unpack data in MS Outlook TNEF format GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile index e199988..aecaafe 100644 --- a/devel/linux-allegro/Makefile +++ b/devel/linux-allegro/Makefile @@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version) USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_XLIB= yes SRC_DISTFILES= diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile index e199988..aecaafe 100644 --- a/devel/linux-f10-allegro/Makefile +++ b/devel/linux-f10-allegro/Makefile @@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version) USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_XLIB= yes SRC_DISTFILES= diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile index 8bbd427..4c057ec 100644 --- a/devel/linux-f10-libglade/Makefile +++ b/devel/linux-f10-libglade/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libglade USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile index b9c0c07..23b1d20 100644 --- a/devel/linux-f10-libglade2/Makefile +++ b/devel/linux-f10-libglade2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libglade2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-f10-libsigc++20/Makefile b/devel/linux-f10-libsigc++20/Makefile index f7334b9..f42831a 100644 --- a/devel/linux-f10-libsigc++20/Makefile +++ b/devel/linux-f10-libsigc++20/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes RPMVERSION= 1 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS .if defined(NOPORTDOCS) diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile index e199988..aecaafe 100644 --- a/devel/linux-f8-allegro/Makefile +++ b/devel/linux-f8-allegro/Makefile @@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version) USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_XLIB= yes SRC_DISTFILES= diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile index 8bbd427..4c057ec 100644 --- a/devel/linux-f8-libglade/Makefile +++ b/devel/linux-f8-libglade/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libglade USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile index b9c0c07..23b1d20 100644 --- a/devel/linux-f8-libglade2/Makefile +++ b/devel/linux-f8-libglade2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libglade2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-f8-libsigc++20/Makefile b/devel/linux-f8-libsigc++20/Makefile index f7334b9..f42831a 100644 --- a/devel/linux-f8-libsigc++20/Makefile +++ b/devel/linux-f8-libsigc++20/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes RPMVERSION= 1 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS .if defined(NOPORTDOCS) diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile index 2b3a44d..e7a8a4c 100644 --- a/devel/linux-glib2/Makefile +++ b/devel/linux-glib2/Makefile @@ -15,7 +15,7 @@ COMMENT= Version 2.X Linux/i386 binary port of GLib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST_SUB+= LIBVERSION="600.6" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile index 8bbd427..4c057ec 100644 --- a/devel/linux-libglade/Makefile +++ b/devel/linux-libglade/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libglade USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile index b9c0c07..23b1d20 100644 --- a/devel/linux-libglade2/Makefile +++ b/devel/linux-libglade2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libglade2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}" diff --git a/devel/linux-libsigc++20/Makefile b/devel/linux-libsigc++20/Makefile index f7334b9..f42831a 100644 --- a/devel/linux-libsigc++20/Makefile +++ b/devel/linux-libsigc++20/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes RPMVERSION= 1 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS .if defined(NOPORTDOCS) diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile index ab24633..b41f844 100644 --- a/devel/linux-runrev/Makefile +++ b/devel/linux-runrev/Makefile @@ -25,7 +25,7 @@ NO_CDROM= "Sale for profit is not permitted" ONLY_FOR_ARCHS= i386 NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/Revolution-${PORTVERSION} DATADIR= ${PREFIX}/share/Revolution-${PORTVERSION} diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index cc9e861..45cf395 100644 --- a/devel/log4cplus/Makefile +++ b/devel/log4cplus/Makefile @@ -17,7 +17,7 @@ MAINTAINER= petri.totterman@hmv.fi COMMENT= A logging library for C++ USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile index b9438e4..31f6808 100644 --- a/devel/log4cxx/Makefile +++ b/devel/log4cxx/Makefile @@ -38,7 +38,7 @@ LDFLAGS+= -I${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN) PORTDOCS= * diff --git a/devel/lrmi/Makefile b/devel/lrmi/Makefile index 00270a7..b90b0da 100644 --- a/devel/lrmi/Makefile +++ b/devel/lrmi/Makefile @@ -15,7 +15,7 @@ MAINTAINER= amistry@am-productions.biz COMMENT= LRMI is a library for calling real mode BIOS routines ONLY_FOR_ARCHS= i386 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKEFILE= Makefile.bsd SHLIB_VERSION= 0 diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 8dd9adc..c184e13 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -7,7 +7,7 @@ PORTNAME= mico PORTVERSION= 2.3.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.mico.org/ @@ -19,7 +19,7 @@ COMMENT= Secure, reliable, production-quality, standards-based CORBA middleware PATCH_DIST_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 @@ -62,7 +62,7 @@ MICO_SERVICE= "@comment " CONFIGURE_ENV+= CXXFLAGS="${CPPFLAGS} -Wno-unused" .if defined(WITH_X11) -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+= --with-x .else CONFIGURE_ARGS+= --without-x diff --git a/devel/mimir/Makefile b/devel/mimir/Makefile index 163e136..fbf4029 100644 --- a/devel/mimir/Makefile +++ b/devel/mimir/Makefile @@ -17,6 +17,6 @@ COMMENT= Data-structure library used by the Elan Programming Environment USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile index 7dffdd4..c1ab96e 100644 --- a/devel/mingw32-binutils/Makefile +++ b/devel/mingw32-binutils/Makefile @@ -61,7 +61,7 @@ post-install: add-plist-post: @${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST} -.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") +.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile index 57a5b80f..78b7199 100644 --- a/devel/mpatrol/Makefile +++ b/devel/mpatrol/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf WRKSRC= ${WRKDIR}/${PORTNAME}/build/unix ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes MAKE_ENV= LOCALBASE="${LOCALBASE}" CXX="${CXX}" \ diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile index 1b6007e..c50cc1f 100644 --- a/devel/msp430-binutils/Makefile +++ b/devel/msp430-binutils/Makefile @@ -56,7 +56,7 @@ post-install: add-plist-post: @${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST} -.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") +.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile index cab3215..eb9fb76 100644 --- a/devel/ncnf/Makefile +++ b/devel/ncnf/Makefile @@ -18,7 +18,7 @@ COMMENT= Generic configuration management library LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES GNU_CONFIGURE= yes post-patch: diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 61923ed..a7823d8 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -8,9 +8,9 @@ PORTNAME= oaf PORTVERSION= 0.6.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/oaf/0.6 DIST_SUBDIR= gnome @@ -21,7 +21,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml USE_GETTEXT= yes diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile index 95eff8a..0e4a03b 100644 --- a/devel/ocaml-sdl/Makefile +++ b/devel/ocaml-sdl/Makefile @@ -10,7 +10,7 @@ PORTNAME= sdl PORTVERSION= 0.7.2 PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ocamlsdl PKGNAMEPREFIX= ocaml- DISTNAME= ocamlsdl-${PORTVERSION} @@ -26,8 +26,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_LDCONFIG=yes USE_SDL= sdl ttf image mixer GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-findlib DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile index b0b0713..9756942 100644 --- a/devel/ode-devel/Makefile +++ b/devel/ode-devel/Makefile @@ -36,8 +36,8 @@ post-patch: ${WRKSRC}/configurator.c @${REINPLACE_CMD} -e 's|g++|${CXX}|; s|-Wall||g; s|-L/usr/X11/lib|-lXext|; \ - s|-L/usr/lib/X11R6||; s|-L/usr/lib/X11||; s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \ - s|-fno-rtti||; s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \ + s|-L/usr/lib/X11R6||; s|-L/usr/lib/X11||; s|-L/usr/X11R6/lib|-L${LOCALBASE}/lib|; \ + s|-fno-rtti||; s|-ffast-math|${CXXFLAGS} -I${LOCALBASE}/include|' \ ${WRKSRC}/config/makefile.unix-gcc .if !defined(WITHOUT_OPCODE) @${REINPLACE_CMD} -e 's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \ diff --git a/devel/ode/Makefile b/devel/ode/Makefile index d511034..20d0772 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 0.9 PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= opende DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -25,8 +25,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" OPTIONS= GIMPACT "Enable gimpact instead of opcode support" off \ GYROSCOPIC "Configure ODE to work with gyroscopic term" on \ diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile index 8eb2765..4b3a651 100644 --- a/devel/omniNotify/Makefile +++ b/devel/omniNotify/Makefile @@ -29,7 +29,7 @@ USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes MAKEFILE= GNUmakefile -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes # Don't compiled on != i386 ONLY_FOR_ARCHS= i386 diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile index 3918db6..a89e5bf 100644 --- a/devel/ossp-al/Makefile +++ b/devel/ossp-al/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ex=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes check: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile index 6f5a4e9..e382764 100644 --- a/devel/ossp-ex/Makefile +++ b/devel/ossp-ex/Makefile @@ -18,7 +18,7 @@ COMMENT= OSSP ex is a small exception handling library for use in C USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile index d66cc2e..0f7afca 100644 --- a/devel/ossp-val/Makefile +++ b/devel/ossp-val/Makefile @@ -18,7 +18,7 @@ COMMENT= A flexible name to value mapping library for C variables LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ex=${LOCALBASE} diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile index 4c5409a..cb261a0 100644 --- a/devel/ossp-var/Makefile +++ b/devel/ossp-var/Makefile @@ -18,7 +18,7 @@ COMMENT= A flexible, full-featured and fast variable expansion library USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/devel/ossp-xds/Makefile b/devel/ossp-xds/Makefile index d2a82b9..25e8f94 100644 --- a/devel/ossp-xds/Makefile +++ b/devel/ossp-xds/Makefile @@ -17,7 +17,7 @@ COMMENT= A generic and extensible framework for serialization GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= xds-config.1 MAN3= xds.3 diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 42cc876..edac286 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -47,7 +47,7 @@ BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple .endif -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= pure_install MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index 719314e..0217b5f 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -16,6 +16,6 @@ COMMENT= A library to provide abstract access to various archives USE_GNOME= gnometarget USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile index 005487b..f14c900 100644 --- a/devel/pikdev/Makefile +++ b/devel/pikdev/Makefile @@ -26,8 +26,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" CONFIGURE_ARGS+= --with-pic=yes MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile index e25cbb2..08a9b52 100644 --- a/devel/plan9port/Makefile +++ b/devel/plan9port/Makefile @@ -7,6 +7,7 @@ PORTNAME= plan9port PORTVERSION= 20080409 +PORTREVISION= 1 CATEGORIES= devel plan9 MASTER_SITES= http://swtch.com/plan9port/ \ ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ @@ -15,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= serge.gagnon.1@ulaval.ca COMMENT= Port of the bulk of the Plan9 software build environment to Unix -USE_XLIB= YES +USE_XORG= x11 xt xi xaw6 xaw7 xaw8 USE_PERL5_BUILD=YES WRKSRC= ${WRKDIR}/plan9 PLIST= ${WRKDIR}/.PLIST diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile index 01391d5..8ac0511 100644 --- a/devel/poslib/Makefile +++ b/devel/poslib/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile index 237247c..d87176b 100644 --- a/devel/prepstools/Makefile +++ b/devel/prepstools/Makefile @@ -25,6 +25,6 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile index 1a79b11..5a2e8cf 100644 --- a/devel/ptypes/Makefile +++ b/devel/ptypes/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ Portable Types Library SHLIB_VER= 21 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PTYPES_CFLAGS= ${CFLAGS} diff --git a/devel/py-libgsf/Makefile b/devel/py-libgsf/Makefile index 33106fe..6014001 100644 --- a/devel/py-libgsf/Makefile +++ b/devel/py-libgsf/Makefile @@ -21,8 +21,8 @@ USE_GNOME= gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2 USE_PYTHON= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --disable-gtk-doc --with-bz2 --with-gnome --with-python -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= GSF_SLAVE= yes diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile index 79ee89a..83d2544 100644 --- a/devel/py-notify/Makefile +++ b/devel/py-notify/Makefile @@ -7,7 +7,7 @@ PORTNAME= notify PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX=python- CATEGORIES= devel python MASTER_SITES= http://www.galago-project.org/files/releases/source/notify-python/ @@ -18,7 +18,6 @@ COMMENT= A python bindings for libnotify LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pygtk2 diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile index 288f46a..b2a76bd 100644 --- a/devel/py-ode/Makefile +++ b/devel/py-ode/Makefile @@ -18,7 +18,7 @@ DIST_SUBDIR= python MAINTAINER= amdmi3@amdmi3.ru COMMENT= Python bindings for The Open Dynamics Engine -BUILD_DEPENDS= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode +BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode USE_BZIP2= yes @@ -33,7 +33,7 @@ OPTIONS= TRIMESH "Trimesh support (sync with OPCODE opt of devel/ode)" on .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${X11BASE}|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py .if defined(WITHOUT_TRIMESH) @${REINPLACE_CMD} -e '/TRIMESH_ENABLE/ s|True|False|' ${WRKSRC}/setup.py .endif diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile index 4c1a10a..8e4d204 100644 --- a/devel/py-omniorb/Makefile +++ b/devel/py-omniorb/Makefile @@ -36,7 +36,7 @@ USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes MAKEFILE= GNUmakefile -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_SCRIPT= ../configure CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index d2fc6e9..a00dd38 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -6,7 +6,7 @@ PORTNAME= dbus PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -25,6 +25,7 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT_VER= 4 QT_COMPONENTS= corelib qmake moc +USE_XORG= x11 xext OPTIONS= DEBUG "Enable debugging in generated code" off \ TRACING "Enable tracing in generated code" off diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile index 6336dcd..eaeb1c6 100644 --- a/devel/qmake/Makefile +++ b/devel/qmake/Makefile @@ -45,7 +45,7 @@ post-patch: -e 's|gcc|${CC}|' \ -e 's|g++|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index b92c331..0a177f5 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -53,7 +53,7 @@ post-patch: -e 's|gcc.*|${CC}|' \ -e 's|g++.*|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile index 0ad7dcf..cf90c50 100644 --- a/devel/qsa/Makefile +++ b/devel/qsa/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_QT_VER= 3 QT_NONSTANDARD= yes HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS=-prefix ${PREFIX} CONFIGURE_ENV?= QTDIR=${QT_PREFIX} QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PATH=${WRKSRC}/bin:$$PATH diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 79806c2..188ab0c 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt3support PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -25,7 +25,7 @@ QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_XLIB= yes +USE_XORG= x11 ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index c2dae7c..27d5ffe 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -8,7 +8,7 @@ PORTNAME= uic3 PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes +USE_XORG= sm ice xrender xrandr xfixes xcursor xinerama xi HAS_CONFIGURE= yes diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile index b0f21bd21..b3183c1 100644 --- a/devel/rhtvision/Makefile +++ b/devel/rhtvision/Makefile @@ -7,9 +7,9 @@ PORTNAME= rhtvision PORTVERSION= 2.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= tvision DISTNAME= rhtvision-${PORTVERSION}.src @@ -19,7 +19,7 @@ COMMENT= Complete C++ Text User Interface (TUI) library WRKSRC= ${WRKDIR}/tvision USE_PERL5= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} @@ -30,9 +30,9 @@ USE_GETTEXT= yes .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 xrender xmu sm xt ice PLIST_SUB+= X11_ONLY="" -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include .else PLIST_SUB+= X11_ONLY="@comment " @@ -44,7 +44,7 @@ post-patch: .for f in config.pl confignt.pl conflib.pl linux/compress Makefile.in @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL5},g' \ -e 's,/usr/local,${LOCALBASE},g' \ - -e 's,/usr/X11R6,${X11BASE},g' \ + -e 's,/usr/X11R6,${LOCALBASE},g' \ -e 's,\(soname.*\)Version,\1VersionMajor,g' \ -e 's/\tmake/\t\\$$(MAKE)/g' \ -e 's/ make/ $$(MAKE)/g' \ diff --git a/devel/root/Makefile b/devel/root/Makefile index 5522b9e..14fe3d99 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 dc39ede..41908f0 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 \ diff --git a/devel/rote/Makefile b/devel/rote/Makefile index d8874d6..33b6e53 100644 --- a/devel/rote/Makefile +++ b/devel/rote/Makefile @@ -16,7 +16,7 @@ COMMENT= A simple library for VT102 terminal emulation GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= bin/rote-config include/rote/rote.h lib/librote.so.${PORTVERSION} \ lib/librote.so.0 lib/librote.so diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile index c06ec5d..d1ff12c 100644 --- a/devel/ruby-sdl/Makefile +++ b/devel/ruby-sdl/Makefile @@ -28,7 +28,7 @@ USE_RUBY_EXTCONF= yes CONFIGURE_ARGS= --with-sdl-config="sdl-config" \ --enable-opengl --linkoglmodule \ - --with-x11-dir="${X11BASE}" + --with-x11-dir="${LOCALBASE}" INSTALL_TARGET= site-install RUBY_RD_FILES= rubysdl_doc.en.rd \ diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 8d93a96..25fc834 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -15,16 +15,16 @@ MASTER_SITES= ftp://ftp.simgear.org/pub/simgear/Source/ \ MAINTAINER= jylefort@FreeBSD.org COMMENT= A toolkit for 3D games and simulations -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib +RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ jpeg.9:${PORTSDIR}/graphics/jpeg \ alut.1:${PORTSDIR}/audio/freealut USE_GL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-jpeg-factory post-patch: diff --git a/devel/st/Makefile b/devel/st/Makefile index bfa1869..9b8db8d 100644 --- a/devel/st/Makefile +++ b/devel/st/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= state-threads MAINTAINER= alfred@FreeBSD.org COMMENT= State Threads Library for Internet Applications -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 alpha amd64 .include <bsd.port.pre.mk> diff --git a/devel/str/Makefile b/devel/str/Makefile index 2e17f00..3784bde 100644 --- a/devel/str/Makefile +++ b/devel/str/Makefile @@ -16,7 +16,7 @@ COMMENT= Generic String Library GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= str-config.1 MAN3= str.3 diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile index 86644da..891e636 100644 --- a/devel/subcommander/Makefile +++ b/devel/subcommander/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ARGS+= --with-boost=${LOCALBASE} CONFIGURE_ARGS+= --with-neon=${LOCALBASE} -CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index 86644da..891e636 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ARGS+= --with-boost=${LOCALBASE} CONFIGURE_ARGS+= --with-neon=${LOCALBASE} -CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile index 9378370..213d6d8 100644 --- a/devel/tclcl/Makefile +++ b/devel/tclcl/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.19 PORTREVISION= 2 DISTVERSIONPREFIX= src- CATEGORIES= devel tcl tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= otcl-tclcl +MASTER_SITES= SF/otcl-tclcl MAINTAINER= mm@FreeBSD.org COMMENT= Tcl/C++ interface used by ns and nam @@ -20,6 +19,7 @@ LIB_DEPENDS= otcl:${PORTSDIR}/lang/otcl WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_XORG= x11 USE_AUTOTOOLS= autoconf:261 GNU_CONFIGURE= yes @@ -39,8 +39,7 @@ USE_TK= 80+ .include "${PORTSDIR}/Mk/bsd.tcl.mk" -CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} post-patch: @${REINPLACE_CMD} -e 's|exec tclsh|exec ${TCLSH}|g' ${WRKSRC}/otcldoc diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index 557dd87..1511934 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -9,8 +9,7 @@ PORTNAME= tclreadline PORTVERSION= 2.1.0 PORTREVISION= 2 CATEGORIES= devel tcl -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tclreadline +MASTER_SITES= SF/tclreadline MAINTAINER= ports@FreeBSD.org COMMENT= GNU readline for TCL @@ -18,7 +17,7 @@ COMMENT= GNU readline for TCL USE_TCL= 80+ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MANN= tclreadline.n PLIST_SUB+= VERSION="${PORTVERSION}" diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile index 89baed5..0c57ebd 100644 --- a/devel/tclxml/Makefile +++ b/devel/tclxml/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 \ dtplite:${PORTSDIR}/devel/tcllib GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \ --with-tclinclude=${LOCALBASE}/include/tcl8.4 PLIST_SUB= VER=${PORTVERSION} diff --git a/devel/tinyq/Makefile b/devel/tinyq/Makefile index 1331979..96df126 100644 --- a/devel/tinyq/Makefile +++ b/devel/tinyq/Makefile @@ -30,7 +30,7 @@ post-patch: -e 's|gcc|${CC}|' \ -e 's|g++|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile index fb51d09..634076d 100644 --- a/devel/tmake/Makefile +++ b/devel/tmake/Makefile @@ -23,7 +23,7 @@ REINPLACE_ARGS= -i "" # no backup (for install) post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ - s,/usr/X11R6,${X11BASE},g' \ + s,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/lib/freebsd-g++/tmake.conf do-install: diff --git a/devel/upp/Makefile b/devel/upp/Makefile index 7e6de379..10566cf 100644 --- a/devel/upp/Makefile +++ b/devel/upp/Makefile @@ -9,18 +9,16 @@ PORTNAME= upp PORTVERSION= 2007.1 PORTREVISION= 3 CATEGORIES= devel x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF MAINTAINER= m.sund@arcor.de COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite -LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft\ - freetype.9:${PORTSDIR}/print/freetype2\ - expat.6:${PORTSDIR}/textproc/expat2\ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ + expat.6:${PORTSDIR}/textproc/expat2 +USE_XORG= xft +USE_GNOME= gtk20 USE_GMAKE= yes .if defined(WITH_SDL) @@ -56,8 +54,8 @@ post-build: @${ECHO_CMD} "RELEASE_OPTIONS = \"-O3 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm @${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm @${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm - @${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm - @${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm + @${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm + @${ECHO_CMD} "LIB = \"${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm @${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm @${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm @${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm diff --git a/devel/upp/files/patch-uppsrc-ide-Makefile b/devel/upp/files/patch-uppsrc-ide-Makefile index 17ca694..3bb6907 100644 --- a/devel/upp/files/patch-uppsrc-ide-Makefile +++ b/devel/upp/files/patch-uppsrc-ide-Makefile @@ -10,11 +10,11 @@ -C_FLAGS = $(CC) -x c -CPPFLAGS = $(CC) -x c++ -LIBPATH = -L"/usr/X11R6/lib" -+CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 ++CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 +Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD +C_FLAGS = $(CC) -x c -c $(CFLAGS) +CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS) -+LIBPATH = -L$(X11BASE)/lib -L$(LOCALBASE)/lib ++LIBPATH = -L$(LOCALBASE)/lib AR = ar -sr OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/ Macro_ide = $(Macro) -DflagMAIN diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile index d99880f..c9ac593 100644 --- a/devel/wininfo/Makefile +++ b/devel/wininfo/Makefile @@ -7,18 +7,20 @@ PORTNAME= wininfo PORTVERSION= 0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://www.freedesktop.org/software/wininfo/ MAINTAINER= jylefort@FreeBSD.org COMMENT= A window information utility -USE_GNOME= gtk20 gnomeprefix +USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \ + xcomposite x11 xres +USE_GNOME= gtk20 gnomeprefix pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= wininfo.1 diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile index 533c1f4..d7a916d 100644 --- a/devel/xfc/Makefile +++ b/devel/xfc/Makefile @@ -22,7 +22,7 @@ USE_GETTEXT= yes USE_GCC= 3.4+ USE_GNOME= glib20 gtk20 atk pango pkgconfig libglade2 gnomehack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ CPPFLAGS=-I${LOCALBASE}/include \ diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile index 7ea2f1a..b1a99d0 100644 --- a/devel/xwpe/Makefile +++ b/devel/xwpe/Makefile @@ -32,7 +32,7 @@ MLINKS= xwpe.1 xwe.1 \ post-patch: .for file in we_prog.c we_fl_unix.c @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/${file} + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${file} .endfor ${REINPLACE_CMD} -e 's|$$(INSTALL_PROGRAM)|${INSTALL_PROGRAM}|g' \ ${WRKSRC}/Makefile.in diff --git a/devel/xwpe/files/patch-09 b/devel/xwpe/files/patch-09 index 47bc8a4..2b956ba 100644 --- a/devel/xwpe/files/patch-09 +++ b/devel/xwpe/files/patch-09 @@ -18,9 +18,9 @@ - manpath = strdup("/usr/man:/usr/share/man:/usr/X11R6/man:/usr/local/man"); + manpath = strdup( +#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__)) -+ "/usr/share/man:%%X11BASE%%/man:%%LOCALBASE%%/man"); ++ "/usr/share/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man"); +#else -+ "/usr/man:%%X11BASE%%/man:%%LOCALBASE%%/man"); ++ "/usr/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man"); +#endif } /* Allocate the maximum possible rather than continually realloc. */ diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile index 035fe00..fa54b8d 100644 --- a/dns/firedns/Makefile +++ b/dns/firedns/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring USE_BZIP2= yes HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/dns/gresolver/Makefile b/dns/gresolver/Makefile index c4c087c..90bf325 100644 --- a/dns/gresolver/Makefile +++ b/dns/gresolver/Makefile @@ -7,7 +7,7 @@ PORTNAME= gresolver PORTVERSION= 0.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= http://jodrell.net/files/gresolver/ @@ -20,7 +20,6 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Lo ${SITE_PERL}/Net/IPv6Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr USE_PERL5= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/dns/libdjbdns/Makefile b/dns/libdjbdns/Makefile index 9260082..1a0974d 100644 --- a/dns/libdjbdns/Makefile +++ b/dns/libdjbdns/Makefile @@ -15,7 +15,7 @@ DISTNAME= djbdns-pd-${PORTVERSION} MAINTAINER= sergei@FreeBSD.org COMMENT= Public domain DNS client library -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes ALL_TARGET= it diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile index d8825a1..e4ee7c6 100644 --- a/dns/posadis/Makefile +++ b/dns/posadis/Makefile @@ -18,7 +18,7 @@ COMMENT= Domain Name Server (DNS) implementation LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib USE_AUTOTOOLS= autoconf:261 libltdl:15 libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/bed/Makefile b/editors/bed/Makefile index b3fae83..9a8b727 100644 --- a/editors/bed/Makefile +++ b/editors/bed/Makefile @@ -34,7 +34,7 @@ MANCOMPRESSED= yes # Check for menubar support in "x11/rxvt". In case of failure, disable X11 if # BATCH or PACKAGE_BUILDING, and IGNORE otherwise. .if !defined(WITHOUT_X11) -. if exists(${X11BASE}/bin/rxvt) +. if exists(${LOCALBASE}/bin/rxvt) MENUBAR_TEST!= rxvt -h 2>&1 | ${GREP} -i menubar || ${TRUE} . if empty(MENUBAR_TEST) . if defined(BATCH) || defined(PACKAGE_BUILDING) diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile index c7cdcde..ff1513e 100644 --- a/editors/bitmap/Makefile +++ b/editors/bitmap/Makefile @@ -29,7 +29,7 @@ BITMAP_DISTVER= ${BITMAP_MVER} BITMAPDOCDIR= share/doc/bitmap BITMAP_SETUPEL= bitmap-setupel.el -BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz +BITMAP_FONT= ${LOCALBASE}/lib/X11/fonts/local/bitmap16.pcf.gz # bitmap install lispdir BITMAP_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile index ee6db92..4072fe3 100644 --- a/editors/color-mate/Makefile +++ b/editors/color-mate/Makefile @@ -25,7 +25,7 @@ MANIFEST= MANIFEST.color-mate do-build: # Create color-mate-rgb.el cd ${WRKSRC}; \ - (${CAT} ${X11BASE}/lib/X11/rgb.txt | ${PERL5} ./rgb2el.pl > ./color-mate-rgb.el ) || ( ${ECHO} "Make rgb table from color-mate-rgb.el.std" ; ${CP} ./color-mate-rgb.el.std ./color-mate-rgb.el) + (${CAT} ${LOCALBASE}/lib/X11/rgb.txt | ${PERL5} ./rgb2el.pl > ./color-mate-rgb.el ) || ( ${ECHO} "Make rgb table from color-mate-rgb.el.std" ; ${CP} ./color-mate-rgb.el.std ./color-mate-rgb.el) # Create Xresource for theme cd ${WRKSRC}/theme; \ ${SH} ${FILESDIR}/theme_build.sh diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index e352b946..1cebc9f 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -6,15 +6,13 @@ PORTNAME= conglomerate PORTVERSION= 0.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= pav@FreeBSD.org COMMENT= GNOME2 visual XML editor with emphasis on DocBook editing -USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 2201f1f5..78bb478 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -7,7 +7,7 @@ PORTNAME= cooledit PORTVERSION= 3.17.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/editors/X/cooledit @@ -16,11 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Suite of utilities, including a GUI editor USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_PYTHON= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes +USE_XORG= x11 xt CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile index 2ed3765..72b60be 100644 --- a/editors/dedit/Makefile +++ b/editors/dedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= dedit PORTVERSION= 0.6.2.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -17,7 +17,6 @@ COMMENT= A simple GNOME i18n editor WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes USE_GNOME= gnomelibs gnomeprefix gnomehack gtk12 glib12 orbit USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/editors/e93/Makefile b/editors/e93/Makefile index bd43249..2e29858 100644 --- a/editors/e93/Makefile +++ b/editors/e93/Makefile @@ -22,7 +22,7 @@ USE_TCL= yes USE_TCL_BUILD= yes USE_TK= yes USE_TK_BUILD= yes -USE_XLIB= yes +USE_XORG= x11 xt WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: diff --git a/editors/e93/files/patch-machdef.mk b/editors/e93/files/patch-machdef.mk index b4a2bf1..c89e771 100644 --- a/editors/e93/files/patch-machdef.mk +++ b/editors/e93/files/patch-machdef.mk @@ -23,8 +23,8 @@ # files are located elsewhere on your system: -X_INCLUDE=-I/usr/X11R6/include -X_LIB=-L/usr/X11R6/lib -+X_INCLUDE=-I${X11BASE}/include -+X_LIB=-L${X11BASE}/lib ++X_INCLUDE=-I${LOCALBASE}/include ++X_LIB=-L${LOCALBASE}/lib # if your system needs some extra libraries, add them here: diff --git a/editors/edith/Makefile b/editors/edith/Makefile index 26c8731..728e3c3 100644 --- a/editors/edith/Makefile +++ b/editors/edith/Makefile @@ -7,7 +7,7 @@ PORTNAME= edith PORTVERSION= 1.58 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors linux MASTER_SITES= http://www.groenink.com/pub/edith/ DISTFILES= edith1.55.common.tar.gz \ @@ -18,7 +18,7 @@ COMMENT= A X11 GUI editor for binary and plain text files ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes RESTRICTED= "Redistribution not allowed" NO_BUILD= yes diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index 9b597cc..269a7f7 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -7,7 +7,7 @@ PORTNAME= elvis PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \ ftp://ftp.false.com/pub/elvis/ \ @@ -33,11 +33,11 @@ MAN1= elvfmt.1 elvis.1 elvtags.1 ref.1 PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --without-x .else -USE_XPM= yes +USE_XORG= xpm .if defined(WITHOUT_XFT) CONFIGURE_ARGS+= --without-xft .else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG= xft xt CONFIGURE_ARGS+= --libs="${LDFLAGS}" CFLAGS+= `freetype-config --cflags` LDFLAGS= `freetype-config --libs` @@ -53,7 +53,7 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g ; \ s|-lipc|-lcurses|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|FT_FILE|ELVIS_FT_FILE|g' \ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index bf8d1df..3e5913e 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -37,9 +37,9 @@ USE_GMAKE= yes .if !defined(WITHOUT_GTK) USE_GNOME= gtk20 .else -USE_XLIB= yes +USE_XORG= x11 .endif -USE_XPM= yes +USE_XORG= xpm xft .endif CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index 08e9238..fface6a 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= 21.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -31,8 +31,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm .endif USE_AUTOTOOLS= autoconf:213 diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index bf8d1df..3e5913e 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -37,9 +37,9 @@ USE_GMAKE= yes .if !defined(WITHOUT_GTK) USE_GNOME= gtk20 .else -USE_XLIB= yes +USE_XORG= x11 .endif -USE_XPM= yes +USE_XORG= xpm xft .endif CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index bf8d1df..3e5913e 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -37,9 +37,9 @@ USE_GMAKE= yes .if !defined(WITHOUT_GTK) USE_GNOME= gtk20 .else -USE_XLIB= yes +USE_XORG= x11 .endif -USE_XPM= yes +USE_XORG= xpm xft .endif CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd diff --git a/editors/fte/files/patch-aa b/editors/fte/files/patch-aa index 393b954..ba2ccd6 100644 --- a/editors/fte/files/patch-aa +++ b/editors/fte/files/patch-aa @@ -36,8 +36,8 @@ -XINCDIR = -I/usr/X11R6/include -XLIBDIR = -L/usr/X11R6/lib -lstdc++ +UOS = -DFREEBSD -+XINCDIR = -I$(X11BASE)/include -+XLIBDIR = -L$(X11BASE)/lib ++XINCDIR = -I$(LOCALBASE)/include ++XLIBDIR = -L$(LOCALBASE)/lib ####################################################################### # HP/UX diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index e9f4fe2..9c05722 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit \ USE_LDCONFIG= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 090cfa5..9f6bfa7 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -8,6 +8,7 @@ PORTNAME= gedit PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +23,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile index 1c1c1bd..7d008ac 100644 --- a/editors/glimmer/Makefile +++ b/editors/glimmer/Makefile @@ -7,10 +7,9 @@ PORTNAME= glimmer PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= editors gnome python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= A full featured code editor for GNOME with many advanced features @@ -20,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes USE_PYTHON= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \ diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile index 8398f0d..97cba57 100644 --- a/editors/gnotepad+/Makefile +++ b/editors/gnotepad+/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnotepad+ PORTVERSION= 1.3.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors www gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnotepad +MASTER_SITES= SF/gnotepad .if !defined(NOPORTDOCS) DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX} @@ -22,8 +21,7 @@ COMMENT= Simple GTK-based text/HTML editor DOCVERSION= 1.2.0 USE_GETTEXT= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm WANT_GNOME= yes USE_GNOME= gnomeprefix gtk12 GNU_CONFIGURE= yes diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 3c028cc..a73e164 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -27,7 +27,6 @@ BROKEN= Configure fails without X support # configure --program-suffix doesn't work somehow MAKE_ARGS= binsuffix="${BINSUFFIX}" -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib PORTDOCDIR= share/doc/gnuserv-${EMACS_PORT_NAME} MAN1= gnuserv${BINSUFFIX}.1 diff --git a/editors/hte/Makefile b/editors/hte/Makefile index 7c8b2a1..b83a58b 100644 --- a/editors/hte/Makefile +++ b/editors/hte/Makefile @@ -33,7 +33,7 @@ PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS=--disable-x11-textmode .else USE_XORG= x11 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .endif .if !defined(NOPORTDOCS) diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 3cdc153..87df857 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -7,7 +7,7 @@ PORTNAME= jed PORTVERSION= 0.99.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \ ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v${PORTVERSION:R}/ \ @@ -52,7 +52,7 @@ LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .if defined(WITHOUT_X11) PLIST_SUB+= XJED="@comment " .else -USE_XLIB= yes +USE_XORG= x11 ice xt ALL_TARGET+= xjed PLIST_SUB+= XJED="" .endif diff --git a/editors/jedit-devel/Makefile b/editors/jedit-devel/Makefile index 0e4cca2..1d3b999 100644 --- a/editors/jedit-devel/Makefile +++ b/editors/jedit-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= jedit DISTVERSION= 4.3.p13 +PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= SF DISTNAME= ${PORTNAME}${PORTVERSION:S/.p/pre/}install @@ -24,7 +25,7 @@ JAVA_VERSION= 1.5+ CONFLICTS= jedit-4.2* NO_LATEST_LINK= yes -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile index 6565d41..51bf9b3 100644 --- a/editors/jedit/Makefile +++ b/editors/jedit/Makefile @@ -7,10 +7,9 @@ PORTNAME= jedit PORTVERSION= 4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}install EXTRACT_SUFX= .jar EXTRACT_ONLY= @@ -25,7 +24,7 @@ CONFLICTS= jedit-4.3* USE_JAVA= yes JAVA_VERSION= 1.3+ -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/editors/jext/Makefile b/editors/jext/Makefile index 15bbb7d..c8e4945 100644 --- a/editors/jext/Makefile +++ b/editors/jext/Makefile @@ -7,10 +7,9 @@ PORTNAME= jext PORTVERSION= 3.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= jext +MASTER_SITES= SF MAINTAINER= vd@FreeBSD.org COMMENT= Powerful 100% pure Java text editor @@ -18,7 +17,7 @@ COMMENT= Powerful 100% pure Java text editor USE_JAVA= yes JAVA_VERSION= 1.2+ NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile index 67028ea..f6622ec 100644 --- a/editors/kxmleditor/Makefile +++ b/editors/kxmleditor/Makefile @@ -18,7 +18,7 @@ COMMENT= XML editor for KDE USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index b61511e..ae6687f 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -25,7 +25,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= # -MAKE_ENV= OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${X11BASE}/lib" LCL_PLATFORM=${LCL_PLATFORM} +MAKE_ENV= OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib" LCL_PLATFORM=${LCL_PLATFORM} MAN1= lazbuild.1 PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile index 4325a62..e828ee1 100644 --- a/editors/leafpad/Makefile +++ b/editors/leafpad/Makefile @@ -23,8 +23,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ PTHREAD_LIB="${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-chooser -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD index 5312227..e4b3ce1 100644 --- a/editors/manedit/files/patch-Makefile.FreeBSD +++ b/editors/manedit/files/patch-Makefile.FreeBSD @@ -7,7 +7,7 @@ -CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ +CFLAGS += -I. $(GTK_CFLAGS) \ -DPREFIX=\"$(PREFIX)\" \ - -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" + -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(LOCALBASE)\" @@ -116,7 +116,7 @@ # Build Rules: diff --git a/editors/manedit/files/patch-manedit.1 b/editors/manedit/files/patch-manedit.1 index 96769cf..294b945 100644 --- a/editors/manedit/files/patch-manedit.1 +++ b/editors/manedit/files/patch-manedit.1 @@ -12,5 +12,5 @@ -distributions). +Global manual pages directory. .TP - %%X11BASE%%/man + %%LOCALBASE%%/man Global X11 manual pages directory. diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index eee8e9f..09f304e 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= autoconf:261 libtool:15 USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= mlview.schemas diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-aa index 8b0d086..bd6e3db 100644 --- a/editors/nedit/files/patch-aa +++ b/editors/nedit/files/patch-aa @@ -10,7 +10,7 @@ + (cd source; make -f Makefile.freebsd install) + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nedit.man ${PREFIX}/man/man1/nedit.1 + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nc.man ${PREFIX}/man/man1/nclient.1 -+ ${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit.ad ++ ${INSTALL} ${COPY} -m 644 NEdit.ad ${LOCALBASE}/lib/X11/app-defaults/NEdit.ad + clean: (cd util; $(MAKE) -f Makefile.common clean) diff --git a/editors/nedit/files/patch-ac b/editors/nedit/files/patch-ac index 4f4e0e0..032e2a1 100644 --- a/editors/nedit/files/patch-ac +++ b/editors/nedit/files/patch-ac @@ -15,8 +15,8 @@ # -CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM -LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 -+CFLAGS+=-O -I${X11BASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM -+LIBS+= ${MOTIFLIB} -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 ++CFLAGS+=-O -I${LOCALBASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM ++LIBS+= ${MOTIFLIB} -L${LOCALBASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 include Makefile.common diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 96af254..33878ef 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.0.${SNAPDATE} +PORTREVISION= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -43,7 +44,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -125,7 +126,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} \ + imake:${PORTSDIR}/devel/imake \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469# BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice-3-devel/files/Makefile.localized +++ b/editors/openoffice-3-devel/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 9966a8b..e42e9fd 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -45,7 +45,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .if !defined(WITH_GPC) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice-3/files/Makefile.localized +++ b/editors/openoffice-3/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 4f7fb50..a604325 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice.org PORTVERSION= 1.0.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES+= editors java MASTER_SITES+= http://openoffice.lunarshells.com/sources/:moz,ru,src,help \ ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \ @@ -33,7 +33,6 @@ MOZILLA_VERSION= 1.0 MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc USE_GNOME= orbit -USE_XLIB= yes USE_PERL5= yes USE_BISON= build USE_GMAKE= yes @@ -105,10 +104,10 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ - imake:${X_IMAKE_PORT} \ + imake:${PORTSDIR}/devel/imake \ gcp:${PORTSDIR}/sysutils/coreutils \ Xvfb:${X_VFBSERVER_PORT} \ - ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT} + ${LOCALBASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT} GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:261 WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src @@ -192,7 +191,7 @@ do-build: @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .endif - ${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 @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @@ -203,7 +202,7 @@ do-install: @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .endif - @${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 @${SETENV} "LC_ALL=C" "LANG=C" DISPLAY="localhost:1001" ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}" @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill diff --git a/editors/openoffice.org-1.0/files/Makefile.localized b/editors/openoffice.org-1.0/files/Makefile.localized index e33ab41..44ca594 100644 --- a/editors/openoffice.org-1.0/files/Makefile.localized +++ b/editors/openoffice.org-1.0/files/Makefile.localized @@ -84,7 +84,7 @@ LANG_PKGNAME= ja LANG_EXT= 81 LANG_CONFIGURE_ARG= JAPN MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 059b5d1..fc6784d 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice.org PORTVERSION= 1.1.5.${SNAPDATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= editors MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \ http://openoffice.lunarshells.com/sources/1.1/ \ @@ -31,7 +31,6 @@ DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE} USE_GNOME+= orbit .endif -USE_XLIB= yes USE_PERL5= yes USE_BISON= build USE_GMAKE= yes @@ -115,7 +114,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake #.if defined(WITHOUT_JAVA) #LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt #.endif diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.localized b/editors/openoffice.org-1.1-devel/files/Makefile.localized index 6718908..142de09 100644 --- a/editors/openoffice.org-1.1-devel/files/Makefile.localized +++ b/editors/openoffice.org-1.1-devel/files/Makefile.localized @@ -1,6 +1,6 @@ # localized makefile # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.7 2005-09-02 00:22:14 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.8 2008-04-19 17:48:18 miwi Exp $ ################################################################ # consult config_office/set_soenv.in for available languages @@ -145,7 +145,7 @@ LANG_PKGNAME= ja LANG_EXT= 81 LANG_CONFIGURE_ARG= JAPN MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 0d009fe..930622f 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice.org PORTVERSION= 1.1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \ http://openoffice.lunarshells.com/sources/1.1/ \ @@ -29,7 +29,6 @@ DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE} USE_GNOME+= orbit .endif -USE_XLIB= yes USE_PERL5= yes USE_BISON= build USE_GMAKE= yes @@ -110,7 +109,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake #.if defined(WITHOUT_JAVA) #LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt #.endif diff --git a/editors/openoffice.org-1.1/files/Makefile.localized b/editors/openoffice.org-1.1/files/Makefile.localized index e03a9d2..999a45f 100644 --- a/editors/openoffice.org-1.1/files/Makefile.localized +++ b/editors/openoffice.org-1.1/files/Makefile.localized @@ -145,7 +145,7 @@ LANG_PKGNAME= ja LANG_EXT= 81 LANG_CONFIGURE_ARG= JAPN MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 0954680d..20343ed 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} +PORTREVISION= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -43,7 +44,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -123,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .if !defined(WITH_GPC) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.localized +++ b/editors/openoffice.org-2-RC/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index a7f6af3..aa8489a 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ @@ -45,7 +46,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -126,7 +127,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} \ + imake:${PORTSDIR}/devel/imake \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469# BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.localized +++ b/editors/openoffice.org-2-devel/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 9966a8b..e42e9fd 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -45,7 +45,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .if !defined(WITH_GPC) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-2/files/Makefile.localized +++ b/editors/openoffice.org-2/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 0954680d..20343ed 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} +PORTREVISION= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -43,7 +44,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -123,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .if !defined(WITH_GPC) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.localized +++ b/editors/openoffice.org-3-RC/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 96af254..33878ef 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.0.${SNAPDATE} +PORTREVISION= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -43,7 +44,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -125,7 +126,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} \ + imake:${PORTSDIR}/devel/imake \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469# BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.localized +++ b/editors/openoffice.org-3-devel/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 9966a8b..e42e9fd 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -45,7 +45,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant .if !defined(WITH_GPC) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-3/files/Makefile.localized +++ b/editors/openoffice.org-3/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index a7f6af3..aa8489a 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ @@ -45,7 +46,7 @@ USE_GNOME+= libidl .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif -USE_XLIB= yes +USE_XORG= x11 ice USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -126,7 +127,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ - imake:${X_IMAKE_PORT} \ + imake:${PORTSDIR}/devel/imake \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469# BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized index a9a2c7a..01bf95d 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.localized +++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized @@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .if ${LOCALIZED_LANG} == "ja" CATEGORIES+= japanese LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts .endif ################################################################ .if ${LOCALIZED_LANG} == "ka" diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile index 9e2c7e8..9c16041 100644 --- a/editors/pdfedit/Makefile +++ b/editors/pdfedit/Makefile @@ -24,7 +24,7 @@ USE_QT_VER= 3 GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" -MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${X11BASE}" +MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${LOCALBASE}" CFLAGS+= -I${LOCALBASE}/include MAN1= pdfedit.1 diff --git a/editors/qemacs/Makefile b/editors/qemacs/Makefile index ce16875..c635b2d 100644 --- a/editors/qemacs/Makefile +++ b/editors/qemacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= qemacs PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://fabrice.bellard.free.fr/qemacs/ @@ -46,9 +46,9 @@ LDFLAGS= `libpng-config --L_opts` PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --disable-x11 .else -USE_XLIB= yes -CFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +USE_XORG= x11 xv xext +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif post-patch: diff --git a/editors/richtext/files/patch-Imakefile b/editors/richtext/files/patch-Imakefile index 458f195..9d071f1 100644 --- a/editors/richtext/files/patch-Imakefile +++ b/editors/richtext/files/patch-Imakefile @@ -5,7 +5,7 @@ #CC = objc -q -g #MOTIFDIR=$(USRLIBDIR) -MOTIFDIR=/usr/local/LessTif/Motif1.2 -+MOTIFDIR=${X11BASE} ++MOTIFDIR=${LOCALBASE} .SUFFIXES : .m .lm diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 20fdd5e..4ade2a6 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -7,7 +7,7 @@ PORTNAME= sam PORTVERSION= 4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors plan9 MASTER_SITES= ftp://ftp.cs.usyd.edu.au/matty/unicode/ DISTNAME= ${PORTNAME} @@ -19,12 +19,12 @@ COMMENT= A unix version of Rob Pike's editor for plan9 DEPRECATED= distfile and homepage disappeared EXPIRATION_DATE= 2007-01-04 +USE_XORG= x11 xt ice sm EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= | ${SH} NO_WRKSUBDIR= yes -USE_X_PREFIX= yes MAN1= sam.1 MAN3= add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 \ diff --git a/editors/sam/files/patch-aa b/editors/sam/files/patch-aa index 63af3ca..c3c485a 100644 --- a/editors/sam/files/patch-aa +++ b/editors/sam/files/patch-aa @@ -26,11 +26,11 @@ ! OS=-DBSDi # add -Iincludedir for any include directories that need to be searched -! INCS=-I../include -I${X11BASE}/include +! INCS=-I../include -I${LOCALBASE}/include # set this if your X libraries are in different locations # or if you need extra libraries to load with X11 applications -! XLIBS=-lXt -lX11 -L${X11BASE}/lib +! XLIBS=-lXt -lX11 -L${LOCALBASE}/lib # add name of library orderer - use ":" if none ! RANLIB=ranlib diff --git a/editors/sam/files/patch-ab b/editors/sam/files/patch-ab index b17dc60..7bf0cb3 100644 --- a/editors/sam/files/patch-ab +++ b/editors/sam/files/patch-ab @@ -32,7 +32,7 @@ # add -Iincludedir for any include directories that need to be searched # for posix header files (for UMIPS, add -I/usr/include/posix) -! INCS=-I../include -I${X11BASE}/include +! INCS=-I../include -I${LOCALBASE}/include # add name of library orderer - use ":" if none exists ! RANLIB=ranlib diff --git a/editors/sam/files/patch-ac b/editors/sam/files/patch-ac index dca9bc5..7949505 100644 --- a/editors/sam/files/patch-ac +++ b/editors/sam/files/patch-ac @@ -35,7 +35,7 @@ # add -Iincludedir for any include directories that need to be searched # for posix header files (for UMIPS, add -I/usr/include/posix) -! INCS=-I../include -I${X11BASE}/include +! INCS=-I../include -I${LOCALBASE}/include # SAMTERM contains the name of the file containing the samterm # executable. SAMTERMDIR is the directory where it is installed. @@ -44,7 +44,7 @@ # set this if your X libraries are in different locations # or if you need extra libraries to load with X11 applications -! XLIBS=-lXt -lX11 -lSM -lICE -L${X11BASE}/lib +! XLIBS=-lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib ! CFLAGS+=$(OS) $(INCS) -D_LIBXG_EXTENSION diff --git a/editors/setedit/Makefile b/editors/setedit/Makefile index ea13388..e486959 100644 --- a/editors/setedit/Makefile +++ b/editors/setedit/Makefile @@ -8,8 +8,7 @@ PORTNAME= setedit PORTVERSION= 0.5.4 PORTREVISION= 1 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= setedit +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= exile@chamber.ee @@ -18,8 +17,7 @@ COMMENT= Programmer's editor with a nice Text User Interface (TUI) LIB_DEPENDS= rhtv.2:${PORTSDIR}/devel/rhtvision HAS_CONFIGURE= yes -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \ - X11BASE="${X11BASE}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" USE_PERL5_BUILD=yes USE_GMAKE= yes diff --git a/editors/setedit/files/patch-config.pl b/editors/setedit/files/patch-config.pl index cd88b05..cba2dbc 100644 --- a/editors/setedit/files/patch-config.pl +++ b/editors/setedit/files/patch-config.pl @@ -70,7 +70,7 @@ return 0; } '; -! $conf{'X11LibPath'}=$ENV{'X11BASE'} . '/lib' unless $conf{'X11LibPath'}; +! $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'}; $conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'}; $libs=$conf{'X11Lib'}; $libs=~s/(\S+)/-l$1/g; @@ -87,7 +87,7 @@ { if (!$conf{'X11IncludePath'}) { -! $conf{'X11IncludePath'}=$ENV{'X11BASE'} . '/include'; +! $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include'; $o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs"; if ($test=~/OK, (\d+)\.(\d+)/) { diff --git a/editors/softmaker-office/Makefile b/editors/softmaker-office/Makefile index 2770aee..b4db269 100644 --- a/editors/softmaker-office/Makefile +++ b/editors/softmaker-office/Makefile @@ -7,7 +7,7 @@ PORTNAME= SoftMaker-Office PORTVERSION= 2006 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://www.softmaker.net/down/ DISTFILES= ofb06trial.tgz @@ -15,9 +15,9 @@ DISTFILES= ofb06trial.tgz MAINTAINER= itetcu@FreeBSD.org COMMENT= Microsoft Word/Excel OpenDocument and OpenOffice.org editor -RUN_DEPENDS= ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT} +RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index 0bb99d1..c3fdd6b 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be downloaded direct from Sun via www interface' USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes IS_INTERACTIVE= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_CMD= ${CAT} diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index f8bad03..4543077 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -41,7 +41,7 @@ CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index dbb188f..b615d6a 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -31,7 +31,7 @@ ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes IS_INTERACTIVE= yes NO_BUILD= yes SOVERSION= ${PORTNAME}${PORTVERSION} diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index f01f3f4..884a780 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -34,7 +34,7 @@ ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes IS_INTERACTIVE= yes NO_BUILD= yes SOVERSION= ${PORTNAME}${PORTVERSION} diff --git a/editors/the/Makefile b/editors/the/Makefile index aacdf0b..b2b0b50 100644 --- a/editors/the/Makefile +++ b/editors/the/Makefile @@ -8,8 +8,7 @@ PORTNAME= the PORTVERSION= 3.2 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= hessling-editor +MASTER_SITES= SF/hessling-editor DISTNAME= THE-${PORTVERSION} PATCH_SITES= http://users.comlab.ox.ac.uk/ian.collier/distribution/ diff --git a/editors/vim/Makefile b/editors/vim/Makefile index f6b6e44..52c83a3 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -10,7 +10,7 @@ PORTNAME?= vim PATCHLEVEL= 282 PORTVERSION= 7.1.${PATCHLEVEL} RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTFILES= ${RELEASE}${EXTRACT_SUFX} @@ -128,23 +128,26 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} .elif defined(WITH_GTK2) USE_GNOME= gtk20 PKGNAMESUFFIX= -gtk2 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .elif defined(WITH_GNOME) .if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \ ${WITH_GNOME}=="1" USE_GNOME= gnomelibs gnomeprefix PKGNAMESUFFIX= -gnome -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .else USE_GNOME= gtk12 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .endif .elif defined(WITH_MOTIF) USE_MOTIF= yes -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N} .endif .else # WITHOUT_X11 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N} diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile index c9bd2c1..a095f0b 100644 --- a/editors/vim5/Makefile +++ b/editors/vim5/Makefile @@ -52,10 +52,10 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} #MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N} .elif defined(WITH_GTK) USE_GNOME+= gtk12 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} .else USE_MOTIF= yes -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N} .endif .else # WITHOUT_X11 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte" diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile index 57eb2da..43484c3 100644 --- a/editors/vim6/Makefile +++ b/editors/vim6/Makefile @@ -9,7 +9,7 @@ PORTNAME?= vim6 PATCHLEVEL= 9 PORTVERSION= 6.4.${PATCHLEVEL} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTNAME= vim-${PORTVERSION:C/\.[0-9a-z]*$//} @@ -104,23 +104,26 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} .elif defined(WITH_GTK2) USE_GNOME= gtk20 PKGNAMESUFFIX= -gtk2 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .elif defined(WITH_GNOME) .if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \ ${WITH_GNOME}=="1" USE_GNOME= gnomelibs gnomeprefix PKGNAMESUFFIX= -gnome -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .else USE_GNOME= gtk12 -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N} MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +USE_XORG+= xt .endif .elif defined(WITH_MOTIF) USE_MOTIF= yes -MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N} +MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N} .endif .else # WITHOUT_X11 MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N} @@ -141,7 +144,7 @@ pre-configure: @${REINPLACE_CMD} -e ' \ s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ - s|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${X11BASE}|g '\ + s|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g '\ ${WRKSRC}/auto/configure # Clean up junk files to keep them from being installed. diff --git a/editors/wily/Makefile b/editors/wily/Makefile index ffa1eed..2131dd1 100644 --- a/editors/wily/Makefile +++ b/editors/wily/Makefile @@ -9,14 +9,13 @@ PORTNAME= wily PORTVERSION= 0.13.42 PORTREVISION= 2 CATEGORIES= editors plan9 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= serge.gagnon.1@ulaval.ca COMMENT= A clone of the Plan9 editor `acme' RUN_DEPENDS= ${LOCALBASE}/bin/rc:${PORTSDIR}/shells/rc \ - ${X11BASE}/lib/X11/fonts/Xg/unicode.9.font:${PORTSDIR}/x11-fonts/Xg + ${LOCALBASE}/lib/X11/fonts/Xg/unicode.9.font:${PORTSDIR}/x11-fonts/Xg USE_XORG= x11 ice xt GNU_CONFIGURE= YES diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index a696c1f..abe3106 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -7,15 +7,15 @@ PORTNAME= xcoral PORTVERSION= 3.46 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ MAINTAINER= ports@FreeBSD.org COMMENT= A multiwindow mouse-based text editor for X -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= x11 CONFIGURE_ARGS= --libdir=${PREFIX}/share CONFIGURE_ENV= LIBS="-lgnuregex" PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/editors/xed/Makefile b/editors/xed/Makefile index fdb9a82..7764771 100644 --- a/editors/xed/Makefile +++ b/editors/xed/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A text editor for X USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xed.1 pre-build: diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index 15c9068..fb7df63 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel-mule PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -43,7 +43,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ compface.1:${PORTSDIR}/mail/faces -USE_XORG= x11 xpm +USE_XORG+= x11 xpm CONFIGURE_ARGS= --with-xpm .endif @@ -57,14 +57,12 @@ USE_AUTOTOOLS= autoconf:261 CONFIGURE_TARGET=--build=${XEMACS_ARCH} CONFIGURE_ARGS+= --enable-mule \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-site-libraries='${SITE_LIBRARIES}' \ --with-site-includes='${SITE_INCLUDES}' \ --enable-sound=native \ --with-site-lisp \ --with-pop \ - --with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ + --with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ --enable-clash-detection \ --enable-database=berkdb \ ${WITH_XIM} \ @@ -110,7 +108,7 @@ CONFIGURE_ARGS+=--disable-kkcc --disable-mc-alloc --disable-newgc .if defined(WITH_XFT) BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -USE_XORG= x11 xft xpm +USE_XORG+= x11 xft xpm CONFIGURE_ARGS+=--with-xft=all .elif defined(WITH_GTK) CONFIGURE_ARGS+=--with-gtk diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index d2d4f04..31c8d1b 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} @@ -29,9 +29,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ compface.1:${PORTSDIR}/mail/faces -USE_XLIB= yes -USE_XORG= xbitmaps -USE_XPM= yes +USE_XORG+= xbitmaps x11 ice xext xaw xt xmu .endif XEMACS_MAJOR_VER?= 21 @@ -82,7 +80,7 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} .include <bsd.port.pre.mk> -.if exists(${X11BASE}/lib/libXm.so) +.if exists(${LOCALBASE}/lib/libXm.so) USE_MOTIF= yes HAVE_MOTIF= yes .endif diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 929b28d..ec9ee8e 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -94,8 +94,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm x11 .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) USE_MOTIF= yes WITH_SCROLLBARS= --with-scrollbars=motif diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index f6bb1bd..cf4c35a 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -55,8 +55,6 @@ CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd CONFIGURE_ARGS= --with-x11 \ --with-mule \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-site-lisp \ --site-libraries='${SITE_LIBRARIES}' \ --site-includes='${SITE_INCLUDES}' \ @@ -68,7 +66,7 @@ CONFIGURE_ARGS= --with-x11 \ --with-png \ --with-tiff \ --with-xpm \ - --infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ + --infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ --with-clash-detection \ --with-database=berkdb \ ${WITH_XIM} \ diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile index 423ae68..1baf6ab 100644 --- a/editors/xenon/Makefile +++ b/editors/xenon/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple X-based text editor USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAKEFILE= ${WRKSRC}/makefiles/Makefile.Linux NOPRECIOUSSOFTMAKEVARS= yes EXAMPLESDIR= ${PREFIX}/share/examples/ex diff --git a/editors/xenon/files/patch-ab b/editors/xenon/files/patch-ab index 53d8291..24cb260 100644 --- a/editors/xenon/files/patch-ab +++ b/editors/xenon/files/patch-ab @@ -20,8 +20,8 @@ -INCLUDES = -I$(XEINC) -LIBS = -L/usr/X11R6/lib -lXpm -lX11 -+INCLUDES = -I$(XEINC) -I$(X11BASE)/include -+LIBS = -L$(X11BASE)/lib -lXpm -lX11 ++INCLUDES = -I$(XEINC) -I$(LOCALBASE)/include ++LIBS = -L$(LOCALBASE)/lib -lXpm -lX11 backup: cd ..;tar -cvzf xenon.tar.gz $(BACKUP) diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 057f691..9a9ea2f 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -32,9 +32,7 @@ USE_PERL5= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-libdir-path=${PREFIX}/lib/xvile \ - --datadir=${PREFIX}/share/xvile \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib + --datadir=${PREFIX}/share/xvile MAN1= xvile.1 OPTIONS= FILTERS "Add support for loadable filters" OFF diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 0522592..2dea73a 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -19,8 +19,8 @@ COMMENT= Multi-lingual unicode text editor with TTF support USE_GETTEXT= yes USE_XORG= x11 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ LC_ALL= GNU_CONFIGURE= YES MAKE_ENV= LC_ALL= diff --git a/emulators/adamem/files/patch-Makefile.X b/emulators/adamem/files/patch-Makefile.X index e62f631..6f32f75 100644 --- a/emulators/adamem/files/patch-Makefile.X +++ b/emulators/adamem/files/patch-Makefile.X @@ -15,7 +15,7 @@ adamem: $(OBJECTS) - $(LD) -s -Wl,-Map,adamem.map -L/usr/X11R6/lib \ -+ $(LD) -s -Wl,-Map,adamem.map -L${X11BASE}/lib \ ++ $(LD) -s -Wl,-Map,adamem.map -L${LOCALBASE}/lib \ -o adamem $(OBJECTS) -lXext -lX11 -lz cvem: adamem diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index ab2c930..f9328f6 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -7,7 +7,7 @@ PORTNAME= atari800 PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip @@ -42,7 +42,7 @@ PKGNAMESUFFIX= -sdl USE_SDL= sdl CONFIGURE_ARGS+= --target=sdl .else -USE_XLIB= yes +USE_XORG= x11 xext .if defined(WITHOUT_SHM) CONFIGURE_ARGS+= --target=x11 .else diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile index 3db4050..4f3863f 100644 --- a/emulators/basiliskII/Makefile +++ b/emulators/basiliskII/Makefile @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_GNOME= esound gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --disable-fbdev-dga --enable-fpe=uae ac_cv_have_33bit_addressing=no ac_cv_file__dev_ptmx=no +CONFIGURE_ARGS= --disable-fbdev-dga --enable-fpe=uae ac_cv_have_33bit_addressing=no ac_cv_file__dev_ptmx=no \ + --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile index a8318f9..53edd62 100644 --- a/emulators/bfe/Makefile +++ b/emulators/bfe/Makefile @@ -7,10 +7,9 @@ PORTNAME= bfe2 PORTVERSION= 20030723 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= bfe +MASTER_SITES= SF DISTNAME= ${PORTNAME}-23jul2003 MAINTAINER= ports@FreeBSD.org @@ -20,7 +19,6 @@ RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index cdbc7f6..a787541 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -205,7 +205,7 @@ CONFIGURE_ARGS+=--enable-x86-64 .endif .if defined(WITH_XPM) -USE_XPM= yes +USE_XORG= xpm CONFIGURE_ARGS+=--with-xpm .endif diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile index 5eddeb6..c56073a 100644 --- a/emulators/cingb/Makefile +++ b/emulators/cingb/Makefile @@ -7,17 +7,16 @@ PORTNAME= cingb PORTVERSION= 0.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Yet another Nintendo GameBoy(tm) emulator WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes +USE_XORG= x11 xext MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= standard @@ -36,7 +35,7 @@ CPPFLAGS+= -DUSE_LITTLE_ENDIAN do-configure: cd ${WRKSRC} && ${SED} -e \ 's|gcc|$${CC}|g ; \ - s|/usr/X11R6|$${X11BASE}|g ; \ + s|/usr/X11R6|$${LOCALBASE}|g ; \ s|^CFLAGS|#CFLAGS|g ; \ s|^OPTMZ|#OPTMZ|g ; \ s|%%%endian%%%|$${CPPFLAGS}|g ; \ diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile index 8866659..0ab2cab0 100644 --- a/emulators/darcnes/Makefile +++ b/emulators/darcnes/Makefile @@ -7,7 +7,7 @@ PORTNAME= darcnes PORTVERSION= 9b0401 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ DISTNAME= dn${PORTVERSION} @@ -43,7 +43,7 @@ LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= TARGET=Linux_svgalib PKGNAMESUFFIX= -svgalib .else -USE_XLIB= yes +USE_XORG= x11 xaw xext xmu xt .endif .endif diff --git a/emulators/darcnes/files/patch-ab b/emulators/darcnes/files/patch-ab index 69bbc0b..7d046d1 100644 --- a/emulators/darcnes/files/patch-ab +++ b/emulators/darcnes/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Mar 28 09:51:41 2001 -+++ Makefile Mon Feb 2 20:30:32 2004 +--- Makefile.orig 2001-03-28 02:51:41.000000000 +0200 ++++ Makefile 2008-04-01 16:53:11.000000000 +0200 @@ -11,16 +11,16 @@ #C_ONLY=-DC_ONLY @@ -36,17 +36,16 @@ LIBS=-lvgagl -lvga endif -@@ -43,9 +47,10 @@ +@@ -43,9 +47,9 @@ # ifeq ($(TARGET),Linux_X) CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND -LDFLAGS+=-L/usr/X11R6/lib -CFLAGS+=-I/usr/X11R6/include -SFLAGS+=-I/usr/X11R6/include -+X11BASE?=/usr/X11R6 -+LDFLAGS+=-L${X11BASE}/lib -+CFLAGS+=-I${X11BASE}/include -+SFLAGS+=-I${X11BASE}/include ++LDFLAGS+=-L${LOCALBASE}/lib ++CFLAGS+=-I${LOCALBASE}/include ++SFLAGS+=-I${LOCALBASE}/include SYSTEMSRCS=video_x.c ui_x.c snd_unix.c keyboard_x.c cd_unix.c BINFILE=darcnes LIBS=-lXext -lXaw -lXmu -lXt -lX11 diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile index c265f09..bcf8504 100644 --- a/emulators/dtcyber/Makefile +++ b/emulators/dtcyber/Makefile @@ -31,7 +31,7 @@ PLIST_DIRS= %%EXAMPLESDIR%% pre-patch: ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.x11 ${REINPLACE_CMD} -e 's|CFLAGS = -O2|CFLAGS+= |' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile.x11 + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.x11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dtcyber ${PREFIX}/bin diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile index c36f2ef..5dff619 100644 --- a/emulators/fceu/Makefile +++ b/emulators/fceu/Makefile @@ -7,10 +7,9 @@ PORTNAME= fceu PORTVERSION= 0.98.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fceultra +MASTER_SITES= SF/fceultra DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src MAINTAINER= xcas@cox.net @@ -20,7 +19,6 @@ USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes USE_SDL= sdl -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/fceu diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index c36f2ef..5dff619 100644 --- a/emulators/fceux/Makefile +++ b/emulators/fceux/Makefile @@ -7,10 +7,9 @@ PORTNAME= fceu PORTVERSION= 0.98.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fceultra +MASTER_SITES= SF/fceultra DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src MAINTAINER= xcas@cox.net @@ -20,7 +19,6 @@ USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes USE_SDL= sdl -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/fceu diff --git a/emulators/fmsx/files/patch-aa b/emulators/fmsx/files/patch-aa index b17d249..9c96117 100644 --- a/emulators/fmsx/files/patch-aa +++ b/emulators/fmsx/files/patch-aa @@ -11,7 +11,7 @@ +CC ?= gcc +DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \ + -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB -+CFLAGS = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES} ++CFLAGS = -O3 -Wall -I${LOCALBASE}/include -L${LOCALBASE}/lib ${DEFINES} OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Floppy.o Sound.o \ Z80.o I8255.o AY8910.o YM2413.o SCC.o V9938.o I8251.o \ Unix.o LibUnix.o SndUnix.o diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile index f298ea4..41912d7 100644 --- a/emulators/gbe/Makefile +++ b/emulators/gbe/Makefile @@ -7,7 +7,7 @@ PORTNAME= gbe PORTVERSION= 0.0.22 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.zophar.net/unix/Files/ @@ -17,10 +17,10 @@ COMMENT= Nintendo GameBoy(tm) emulator with GNU source code PLIST_FILES= bin/gbe WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -USE_X_PREFIX= yes +USE_XORG= x11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gbe ${PREFIX}/bin diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 7827c13..032184d 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -36,7 +36,7 @@ post-patch: ${REINPLACE_CMD} \ -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} \ - -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile.rules + -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} \ -e 's|%%LDFLAGS%%|${LDFLAGS}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile index 9a5d453..54018bd 100644 --- a/emulators/gngb/Makefile +++ b/emulators/gngb/Makefile @@ -7,14 +7,13 @@ PORTNAME= gngb PORTVERSION= 20060309 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://m.peponas.free.fr/gngb/download/ MAINTAINER= ports@FreeBSD.org COMMENT= GameBoy(tm) emulator -USE_X_PREFIX= yes USE_GNOME= gnometarget USE_SDL= sdl USE_GMAKE= yes @@ -23,13 +22,13 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/gngb -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib MAN1= gngb.1 .if defined(WITH_GL) -USE_GL= yes +USE_GL= gl .else CONFIGURE_ARGS+= --disable-gl .endif diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile index 95b0281..8f61f0e 100644 --- a/emulators/gngeo/Makefile +++ b/emulators/gngeo/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ARGS= --program-transform-name="" --disable-gp2x CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CPPFLAGS= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${X11BASE}/include -LDFLAGS= `${SDL_CONFIG} --libs` -L${X11BASE}/lib +CPPFLAGS= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include +LDFLAGS= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib SUB_FILES= pkg-message diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile index fb73fcc..3c93161 100644 --- a/emulators/gsnes9x/Makefile +++ b/emulators/gsnes9x/Makefile @@ -7,10 +7,9 @@ PORTNAME= gsnes9x PORTVERSION= 3.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= GSnes9x-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,7 +17,6 @@ COMMENT= A GTK front-end for the Snes9X SNES emulator RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnomelibs USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index 33c5472..5a755bd 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -38,7 +38,7 @@ USE_XORG= x11 post-patch: @${REINPLACE_CMD} -Ee \ - 's|/usr/X11R6|${X11BASE}|g; s|-O[0-9]?||g; s|-f[a-zA-Z-]+||g' \ + 's|/usr/X11R6|${LOCALBASE}|g; s|-O[0-9]?||g; s|-f[a-zA-Z-]+||g' \ ${WRKSRC}/configure do-install: diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile index 851df8a..151c840 100644 --- a/emulators/gxmame/Makefile +++ b/emulators/gxmame/Makefile @@ -7,11 +7,10 @@ PORTNAME= gxmame DISTVERSION= 0.35beta2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${DISTVERSION} MAINTAINER= ports@FreeBSD.org @@ -20,7 +19,6 @@ COMMENT= GXmame is a GTK frontend for xmame LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame -USE_XLIB= yes USE_GNOME= gtk20 intlhack gnomehack gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile index aa31d92..a022c1c 100644 --- a/emulators/ines/Makefile +++ b/emulators/ines/Makefile @@ -7,7 +7,7 @@ PORTNAME= ines PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://fms.komkon.org/iNES/ DISTNAME= iNES30-FreeBSD-80x86-bin @@ -16,11 +16,20 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Nintendo Entertainment System emlator for X +ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS_REASON= is an i386 binary + NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 xext NO_BUILD= yes STRIP= +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 600000 +LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin ${MKDIR} ${DATADIR} @@ -28,4 +37,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/CART.NES ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.pal ${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile index 59aa950..c5c11ce 100644 --- a/emulators/linux-ePSXe/Makefile +++ b/emulators/linux-ePSXe/Makefile @@ -19,7 +19,7 @@ COMMENT= A Sony Playstation emulator (Linux version) RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/emulators/linux-geepee32/Makefile b/emulators/linux-geepee32/Makefile index 905bb03..996cf00 100644 --- a/emulators/linux-geepee32/Makefile +++ b/emulators/linux-geepee32/Makefile @@ -18,7 +18,7 @@ COMMENT= The only GP32 emulator for i386 RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 ONLY_FOR_ARCHS= i386 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes USE_ZIP= yes NO_WRKSUBDIR= yes diff --git a/emulators/linux-padjoy/Makefile b/emulators/linux-padjoy/Makefile index 4b435d5..c800755 100644 --- a/emulators/linux-padjoy/Makefile +++ b/emulators/linux-padjoy/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux WRKSRC= ${WRKDIR}/padJoy NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile index 1713977..251a77c 100644 --- a/emulators/linux-peops-softgpu/Makefile +++ b/emulators/linux-peops-softgpu/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile index 633cc3d..f0dd9a2 100644 --- a/emulators/linux-peops-spu/Makefile +++ b/emulators/linux-peops-spu/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile index f553a5c..ee0aa3c 100644 --- a/emulators/linux-pete-mesagpu/Makefile +++ b/emulators/linux-pete-mesagpu/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-pete-xgl2gpu/Makefile b/emulators/linux-pete-xgl2gpu/Makefile index 90e95e2..bfd817b 100644 --- a/emulators/linux-pete-xgl2gpu/Makefile +++ b/emulators/linux-pete-xgl2gpu/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile index 79df27b..9320d85 100644 --- a/emulators/linux-vmware-toolbox2/Makefile +++ b/emulators/linux-vmware-toolbox2/Makefile @@ -19,7 +19,7 @@ COMMENT=VMware toolbox for guest OS (for VMware 2.x, Linux version) ONLY_FOR_ARCHS= i386 PLIST_FILES= bin/linux-vmware-toolbox USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile index 9f26764..8b45185 100644 --- a/emulators/linux-vmware-toolbox4/Makefile +++ b/emulators/linux-vmware-toolbox4/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes .if !defined(BATCH) IS_INTERACTIVE= yes .endif diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile index 47b46ce..71bf60a 100644 --- a/emulators/linux-vmware-toolbox5/Makefile +++ b/emulators/linux-vmware-toolbox5/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile index af5e83c..7f4d89e 100644 --- a/emulators/linux-vmware-toolbox6/Makefile +++ b/emulators/linux-vmware-toolbox6/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-winetools/Makefile b/emulators/linux-winetools/Makefile index 0a2ca0e..35c5aba 100644 --- a/emulators/linux-winetools/Makefile +++ b/emulators/linux-winetools/Makefile @@ -24,7 +24,7 @@ EXPIRATION_DATE=2007-11-14 NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 PLIST_FILES= bin/winetools diff --git a/emulators/m2000/files/patch-Makefile.X b/emulators/m2000/files/patch-Makefile.X index 955af5f..60891bf 100644 --- a/emulators/m2000/files/patch-Makefile.X +++ b/emulators/m2000/files/patch-Makefile.X @@ -10,12 +10,12 @@ +LD ?= gcc # Linker used -CFLAGS = -Wall -fomit-frame-pointer -O2 -I/usr/X11/include \ -+CFLAGS += -Wall -fomit-frame-pointer -O2 -I${X11BASE}/include \ ++CFLAGS += -Wall -fomit-frame-pointer -O2 -I${LOCALBASE}/include \ -DLSB_FIRST -DHAVE_FTRUNCATE -DHAVE_CLOCK -DUNIX_X \ -DSOUND -DMITSHM -LFLAGS = -s -L/usr/X11/lib -+LFLAGS += -L${X11BASE}/lib ++LFLAGS += -L${LOCALBASE}/lib OBJECTS = M2000.o P2000.o Z80.o Z80Debug.o \ Unix.o X.o diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile index d3e80f9..69e7dea 100644 --- a/emulators/mastergear/Makefile +++ b/emulators/mastergear/Makefile @@ -7,7 +7,7 @@ PORTNAME= mastergear PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://fms.komkon.org/MG/ DISTNAME= MG20-FreeBSD-80x86-bin @@ -23,7 +23,6 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes STRIP= -USE_X_PREFIX= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mg ${PREFIX}/bin diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index ade1711..652e7c0 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes USE_SDL= sdl net USE_XORG= x11 USE_GL= glut -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME} @@ -54,7 +54,7 @@ IGNORE= needs round(3), which appears in 5.3 or later pre-configure: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' -e \ - 's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure post-install: diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile index a4f0258..3b339fa 100644 --- a/emulators/minivmac/Makefile +++ b/emulators/minivmac/Makefile @@ -7,10 +7,9 @@ PORTNAME= minivmac PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}.src.tgz ${PORTNAME}-${PORTVERSION}.prj.tgz MAINTAINER= ports@FreeBSD.org @@ -20,15 +19,15 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash WRKSRC= ${WRKDIR}/projects/bgclx86d -USE_XLIB= yes +USE_XORG= x11 xext USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= # nothing PLIST_FILES= bin/minivmac post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/minivmac ${PREFIX}/bin diff --git a/emulators/mupen64-base/files/patch-Makefile b/emulators/mupen64-base/files/patch-Makefile index 461d7a8..69cefd1 100644 --- a/emulators/mupen64-base/files/patch-Makefile +++ b/emulators/mupen64-base/files/patch-Makefile @@ -223,13 +223,13 @@ mupen64: $(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI) $(OBJ_VCR) - $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `sdl-config --libs` -L/usr/X11R6/lib -lGL -lpthread -ldl -o $@ - strip --strip-all $@ -+ $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lGL -o $@ ++ $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lGL -o $@ endif mupen64_oldgui: $(OBJ) $(OBJ_X86) main/main_gtk.o - $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `sdl-config --libs` -L/usr/X11R6/lib -lGL -lpthread -ldl -o $@ - strip --strip-all $@ -+ $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lGL -o $@ ++ $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lGL -o $@ plugins/mupen64_input.so: $(OBJ_INPUT) $(CC) $^ -Wl,-Bsymbolic -shared $(GTK_LIBS) -o $@ diff --git a/emulators/mupen64-rice/Makefile b/emulators/mupen64-rice/Makefile index 1b144d7..0db52eed 100644 --- a/emulators/mupen64-rice/Makefile +++ b/emulators/mupen64-rice/Makefile @@ -54,7 +54,7 @@ CFLAGS+= -DUSE_GTK `${GTK_CONFIG} --cflags` -fPIC CFLAGS+= -O3 -fomit-frame-pointer -funroll-loops -ffast-math -Wall -pipe CFLAGS+= -DX86 -mcpu=athlon -msse -mmmx LDFLAGS+= `${GTK_CONFIG} --libs` \ - -lGL -lGLU -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lc + -lGL -lGLU -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lc MAKE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LD="${CXX}" diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 3718bb3..8a11088 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -7,10 +7,10 @@ PORTNAME= open-vm-tools PORTVERSION= ${BUILD_VER} +PORTREVISION= 1 CATEGORIES= emulators DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= open-vm-tools +MASTER_SITES= SF MAINTAINER= mbr@freebsd.org COMMENT?= Open VMware tools for FreeBSD VMware guests @@ -23,7 +23,9 @@ GNU_CONFIGURE= yes .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x .else -USE_XLIB= yes +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" +USE_XORG= x11 ice xineramaproto xinerama xrandr xtst USE_GNOME= gtk12 PLIST_SUB+= X11="" PLIST= ${PKGDIR}/pkg-plist-x11 @@ -71,8 +73,8 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/resume-vm-default ${PREFIX}/share/vmware-tools/resume-vm-default ${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/suspend-vm-default ${PREFIX}/share/vmware-tools/suspend-vm-default .if !defined(WITHOUT_X11) - ${INSTALL} ${WRKSRC}/toolbox/toolbox ${X11BASE}/sbin/vmware-toolbox - ${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${X11BASE}/sbin/vmware-user + ${INSTALL} ${WRKSRC}/toolbox/toolbox ${LOCALBASE}/sbin/vmware-toolbox + ${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${LOCALBASE}/sbin/vmware-user .endif .include <bsd.port.post.mk> diff --git a/emulators/p-interp/Makefile b/emulators/p-interp/Makefile index 13e1983..543be2d 100644 --- a/emulators/p-interp/Makefile +++ b/emulators/p-interp/Makefile @@ -7,7 +7,7 @@ PORTNAME= p-interp PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.klebsch.de/ \ ftp://ftp.apple.asimov.net/pub/apple_II/images/utility/programming/apple_pascal/:disks \ @@ -21,9 +21,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= A UCSD (Apple) Pascal p-code interpreter environment -BUILD_DEPENDS= gccmakedep:${X_IMAKE_PORT} +BUILD_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep -USE_XLIB= yes +USE_XORG= x11 xt RESTRICTED= "Redistribution rights for Apple Pascal disk images are unclear" diff --git a/emulators/p-interp/files/patch-aa b/emulators/p-interp/files/patch-aa index 05659ef..3c7c9a2 100644 --- a/emulators/p-interp/files/patch-aa +++ b/emulators/p-interp/files/patch-aa @@ -12,7 +12,7 @@ OBJS=$(SRCS:%.c=%.o) -X11=/opt/X11 -+X11=${X11BASE} ++X11=${LOCALBASE} X11_INCLUDE=$(X11)/include X11_LIB=$(X11)/lib diff --git a/emulators/pcemu/files/patch-aa b/emulators/pcemu/files/patch-aa index d8a4879..a572a0b 100644 --- a/emulators/pcemu/files/patch-aa +++ b/emulators/pcemu/files/patch-aa @@ -23,7 +23,7 @@ ! OPTIONS = -DBOOT720 -DLITTLE_ENDIAN -DBIGCASE -DINLINE_FUNCTIONS \ ! -DBOOTFILE=\"${LOCALPREFIX}/lib/pcemu/DriveA\" ! #XROOT = /usr/local/X11R5 -! XROOT = $(X11BASE) +! XROOT = $(LOCALBASE) ! CFLAGS = -I$(XROOT)/include -O2 -pipe #-fomit-frame-pointer # You may need to add -N to the LFLAGS if you get sporadic segmentation diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile index 91c84eb..045a0e4 100644 --- a/emulators/quasi88/Makefile +++ b/emulators/quasi88/Makefile @@ -7,7 +7,7 @@ PORTNAME= quasi88 PORTVERSION= 0.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.117.ne.jp/~show/pc8801/ EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= PC-8801 emulator for X -USE_XLIB= yes +USE_XORG= x11 xext USE_GMAKE= yes MAKE_ENV= DATADIR="${DATADIR}" _CC="${CC}" _CFLAGS="${CFLAGS}" \ _CXX="${CXX}" LD="${CXX}" PROGRAM="${PORTNAME}" @@ -47,7 +47,7 @@ post-patch: s|^SDL_|# SDL_|g ; \ s|gcc|$${_CC}|g ; \ s|-O2|$${_CFLAGS}|g ; \ - s|/usr/X11R6|$${X11BASE}|g ; \ + s|/usr/X11R6|$${LOCALBASE}|g ; \ s|g++|$${_CXX}|g ; \ s|^CXXLIBS|# CXXLIBS|g ; \ s|^LD|# LD|g ; \ diff --git a/emulators/raine/files/patch-makefile b/emulators/raine/files/patch-makefile index 7794091..9e4062c 100644 --- a/emulators/raine/files/patch-makefile +++ b/emulators/raine/files/patch-makefile @@ -10,7 +10,7 @@ SDL_CFLAGS = "$(shell sdl-config --cflags)" - INCDIR += $(PNG_CFLAGS) $(ALLEGRO_CFLAGS) $(SDL_CFLAGS) -I$(X11BASE)/include -I$(LOCALBASE)/include -+ INCDIR += ` allegro-config --cflags` `libpng-config --cflags` -I$(X11BASE)/include -I$(LOCALBASE)/include ++ INCDIR += ` allegro-config --cflags` `libpng-config --cflags` -I$(LOCALBASE)/include DEFINE = -D__RAINE__ \ diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 61b56ff..61619a0 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -40,12 +40,12 @@ do-install: cd ${PREFIX}/bin ; ${LN} -sf ski ${SL} .endfor ${INSTALL_DATA} ${WRKSRC}/nue/usr/X11R6/lib/X11/app-defaults/XSki \ - ${X11BASE}/lib/X11/app-defaults + ${LOCALBASE}/lib/X11/app-defaults ${INSTALL_MAN} ${WRKSRC}/usr/man/man1/ski.1 ${PREFIX}/man/man1 @${MKDIR} ${PREFIX}/share/examples/ski ${INSTALL_DATA} ${FILESDIR}/ia64.cmd ${PREFIX}/share/examples/ski ${INSTALL_DATA} ${WRKSRC}/nue/usr/X11R6/lib/X11/app-defaults/XSki \ - ${X11BASE}/lib/X11/app-defaults + ${LOCALBASE}/lib/X11/app-defaults .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/usr/doc/ski-0.943l/* ${DOCSDIR} diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile index 7c7effe..f78dbd9 100644 --- a/emulators/snes9express/Makefile +++ b/emulators/snes9express/Makefile @@ -7,10 +7,9 @@ PORTNAME= snes9express PORTVERSION= 1.42 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= tlp@liquidx.org COMMENT= GTK interface for snes9x @@ -19,8 +18,6 @@ RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x USE_GETTEXT= yes USE_GNOME= gtk20 -USE_XLIB= yes - GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index f1f9b6d..d1c0072 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -17,17 +17,18 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= acm@FreeBSD.org COMMENT= Super Nintendo Entertainment System(SNES) Emulator +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png + USE_BZIP2= yes USE_XORG= x11 sm ice xext USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-extensions -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${X11BASE}/include \ - -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDLIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include \ + ${PTHREAD_CFLAGS}" LDLIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ OPTIMISE="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index a5e78a7..07cc766 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -8,7 +8,7 @@ PORTNAME= spim PORTVERSION= 7.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/ @@ -28,8 +28,8 @@ OPTIONS= GUI "Graphical user interface" on .include <bsd.port.pre.mk> .if defined(WITH_GUI) -USE_XLIB= yes -BUILD_DEPENDS+= imake:${X_IMAKE_PORT} +USE_XORG= x11 xaw +BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake PLIST_FILES+= bin/xspim MAN1+= xspim.1 .endif diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index 3efb686..09aa0aa 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile index ace625d..83ac882 100644 --- a/emulators/stonx/Makefile +++ b/emulators/stonx/Makefile @@ -15,8 +15,6 @@ DISTNAME= STonX-0.6.7-epsilon MAINTAINER= treif@mayn.de COMMENT= AtariST emulator -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ gccmakedep:${PORTSDIR}/devel/gccmakedep \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 350092f..9af70e5 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -7,7 +7,7 @@ PORTNAME= tme PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ @@ -16,6 +16,7 @@ COMMENT= Emulator for Sun 2/120, 3/150 and SPARCstation 2 machines GNU_CONFIGURE= yes USE_GMAKE= yes +USE_XORG= x11 USE_GNOME= gtk12 gnometarget CONFIGURE_ARGS+= --disable-shared MAKE_ENV= LANG=C diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile index f041023..675608e 100644 --- a/emulators/tuxnes/Makefile +++ b/emulators/tuxnes/Makefile @@ -7,17 +7,17 @@ PORTNAME= tuxnes PORTVERSION= 0.75 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A Nintendo Entertainment System 8-bit emulator ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS_REASON= uses i386 assembly code -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index 326cd11..913e5eb 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -7,7 +7,7 @@ PORTNAME= twin PORTVERSION= 3.1.14 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= emulators devel MASTER_SITES= ${MASTER_SITE_NETBSD} \ @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 alpha powerpc WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile index 55ce050..b56b44d 100644 --- a/emulators/vMac/Makefile +++ b/emulators/vMac/Makefile @@ -5,41 +5,35 @@ # $FreeBSD$ # -PORTNAME= vMac -PORTVERSION= 0.1.9.3 -PORTREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= http://www.vmac.org/download/XWindows/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src -EXTRACT_SUFX= .tgz +PORTNAME= vMac +PORTVERSION= 0.1.9.3 +PORTREVISION= 3 +CATEGORIES= emulators +MASTER_SITES= http://www.vmac.org/download/XWindows/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-src +EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Emulates a MacPlus machine! Runs MacOS versions up to 7.5.5 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_XLIB= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_XORG= x11 ice sm xext pre-patch: (cd ${WRKSRC} && ${SH} ${FILESDIR}/dos2unx gemulator.c) post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vMac \ - ${PREFIX}/bin - @${STRIP_CMD} ${PREFIX}/bin/vMac + ${INSTALL_PROGRAM} ${WRKSRC}/vMac ${PREFIX}/bin + ${STRIP_CMD} ${PREFIX}/bin/vMac .if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CREDITS \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/INSTALL \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.rom \ - ${DOCSDIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.rom ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}: diff --git a/emulators/vba/pkg-message b/emulators/vba/pkg-message index eb5b9fa..cb364d4 100644 --- a/emulators/vba/pkg-message +++ b/emulators/vba/pkg-message @@ -1,7 +1,7 @@ ----------------------------------------------------------------- The default configuration file has been installed as -X11BASE/bin/VisualBoyAdvance.cfg-default. Please copy it to -X11BASE/bin/VisualBoyAdvance.cfg before you start the emulator. +%%LOCALBASE%%/bin/VisualBoyAdvance.cfg-default. Please copy it to +%%LOCALBASE%%/bin/VisualBoyAdvance.cfg before you start the emulator. If all you see after loading a ROM is a black screen and/or VisualBoy Advance crashes, try switching the video filter. diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile index e9a7f32..bfa7f18 100644 --- a/emulators/vgb/Makefile +++ b/emulators/vgb/Makefile @@ -7,7 +7,7 @@ PORTNAME= vgb PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -19,7 +19,7 @@ COMMENT= Nintendo GameBoy(tm) emulator WRKSRC= ${WRKDIR}/GB -USE_X_PREFIX= yes +USE_XORG= x11 xext do-configure: @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/vgb.sh \ diff --git a/emulators/vgb/files/patch-aa b/emulators/vgb/files/patch-aa index 7b40666..93ce83e 100644 --- a/emulators/vgb/files/patch-aa +++ b/emulators/vgb/files/patch-aa @@ -17,7 +17,7 @@ # libraries libX11.* and libXext.* are located on your system. ! CC ?= gcc ! DEFINES = -DUNIX -DLSB_FIRST -! CFLAGS += -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES} +! CFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib ${DEFINES} OBJECTS = VGB.o GB.o Z80.o Debug.o Unix.o # Make the standard distribution: VGB, DASM, and utilities. diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 1a2f477..2e0f7a7 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -28,7 +28,6 @@ RESTRICTED= "ROMs are copyrighted by Commodore Business Machines" USE_XORG= xpm xext xv x11 xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes xv USE_GMAKE= yes -USE_GCC= 3.4+ GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile index 94801a2..a5cc3c5 100644 --- a/emulators/visualos/Makefile +++ b/emulators/visualos/Makefile @@ -7,15 +7,14 @@ PORTNAME= VisualOS PORTVERSION= 1.0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:L} MAINTAINER= ports@FreeBSD.org COMMENT= A visual simulator of an operating system to help understand how OSes work -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libglade USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile index f77f18e..e45e793 100644 --- a/emulators/vmware-guestd4/Makefile +++ b/emulators/vmware-guestd4/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -guestd @@ -30,7 +30,7 @@ USE_RC_SUBR= vmware-guestd.sh IS_INTERACTIVE= yes .endif .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .endif @@ -108,10 +108,10 @@ post-patch: .if defined(VMWARE_X_PORTS) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${LOCALBASE}/bin + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${LOCALBASE}/etc/XF86Config-4_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${LOCALBASE}/lib/modules/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware -${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end .else diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile index b445201..003c3d9 100644 --- a/emulators/vmware-guestd5/Makefile +++ b/emulators/vmware-guestd5/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -#PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware Workstation PKGNAMESUFFIX?= -guestd @@ -29,13 +29,13 @@ ONLY_FOR_ARCHS= i386 amd64 IS_INTERACTIVE= yes .endif .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .if defined(WITH_VMWARE_GTK) PLIST_SUB+= INSTALLXGTKTOOL:="" USE_ICONV= yes USE_GETTEXT= yes -USE_XLIB= yes +USE_XORG= x11 xsxt USE_GNOME= glib12 gtk12 .if (${OSVERSION} >= 600000) LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x @@ -162,18 +162,18 @@ post-extract: .if defined(VMWARE_X_PORTS) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${X11BASE}/bin - ${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${LOCALBASE}/bin + ${LN} -sfh vmware-toolbox-tcl ${LOCALBASE}/bin/vmware-toolbox .if defined(WITH_VMWARE_GTK) - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${LOCALBASE}/bin .endif - if [ ! -d ${X11BASE}/lib/modules/input ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/input ; \ + if [ ! -d ${LOCALBASE}/lib/modules/input ] ; then \ + ${MKDIR} ${LOCALBASE}/lib/modules/input ; \ fi .if ${ARCH} == i386 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware .else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware .endif -${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index 60ae8f3..39f7ee1 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -#PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware Workstation PKGNAMESUFFIX?= -guestd @@ -40,7 +40,7 @@ WANT_GNOME= yes .include <bsd.port.pre.mk> .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .if ${ARCH} == amd64 WITH_VMWARE_GTK= yes @@ -181,13 +181,13 @@ post-extract: do-install: .if ${ARCH} == i386 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-tcl ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-tcl ${LOCALBASE}/bin .endif .if defined(WITH_VMWARE_GTK) - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${X11BASE}/bin - ${LN} -sfh vmware-toolbox-gtk ${X11BASE}/bin/vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${LOCALBASE}/bin + ${LN} -sfh vmware-toolbox-gtk ${LOCALBASE}/bin/vmware-toolbox .else - ${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox + ${LN} -sfh vmware-toolbox-tcl ${LOCALBASE}/bin/vmware-toolbox .endif -${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1 diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile index dc0ddf5..8529a05 100644 --- a/emulators/vmware-tools3/Makefile +++ b/emulators/vmware-tools3/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware-tools PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= # bundled with VMware itself DISTNAME= vmware-freebsd-tools @@ -23,7 +23,6 @@ IGNOREFILES= ${DISTFILES} WRKSRC= ${WRKDIR}/vmware-freebsd-tools ONLY_FOR_ARCHS= i386 -USE_X_PREFIX= yes NO_BUILD= yes NO_LATEST_LINK= yes .if !defined(BATCH) diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 0cddbb8..7621474 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -45,7 +45,7 @@ SUB_LIST= BRIDGED="${VMNET_BRIDGED}" \ VMNET1_MINOR="${VMNET1_MINOR}" ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/vmware-distrib GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1= vmware.1 diff --git a/emulators/vpce/Makefile b/emulators/vpce/Makefile index a82b74b..3786bf8 100644 --- a/emulators/vpce/Makefile +++ b/emulators/vpce/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpce PORTVERSION= 0.3f -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.geocities.com/SiliconValley/Way/3340/ \ http://freebsd.unixfreunde.de/sources/ @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PC Engine (TG16) emulator on X NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes STRIP= diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c6023d9..262deb6 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -10,7 +10,7 @@ PORTNAME= wine PORTVERSION= 0.9.60 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ +MASTER_SITES= SFE \ http://ibiblio.org/pub/linux/system/emulators/wine/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -38,7 +38,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes USE_GL= glut -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index c6023d9..262deb6 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -10,7 +10,7 @@ PORTNAME= wine PORTVERSION= 0.9.60 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ +MASTER_SITES= SFE \ http://ibiblio.org/pub/linux/system/emulators/wine/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -38,7 +38,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes USE_GL= glut -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/emulators/xbraitenberg/Makefile b/emulators/xbraitenberg/Makefile index a81743a..bf87c2f 100644 --- a/emulators/xbraitenberg/Makefile +++ b/emulators/xbraitenberg/Makefile @@ -7,14 +7,14 @@ PORTNAME= xbraitenberg PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.lcdf.org/~eddietwo/xbraitenberg/ MAINTAINER= ports@FreeBSD.org COMMENT= A Braitenberg vehicle simulator with pseudo-physics -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext USE_GNOME= gnometarget GNU_CONFIGURE= yes diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile index 64a46d7..6a52089 100644 --- a/emulators/xgngeo/Makefile +++ b/emulators/xgngeo/Makefile @@ -39,7 +39,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco .endif post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/data/py/configfile.py + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/data/py/configfile.py @${REINPLACE_CMD} -e 's|gtk.threads_init|gtk.gdk.threads_init|g' -e \ 's|gtk.threads_enter|gtk.gdk.threads_enter|g' -e \ 's|gtk.threads_leave|gtk.gdk.threads_leave|g' ${WRKSRC}/data/py/__init__.py diff --git a/emulators/xgngeo/files/patch-data-py_configfile.py b/emulators/xgngeo/files/patch-data-py_configfile.py index a80c435..c8e1073 100644 --- a/emulators/xgngeo/files/patch-data-py_configfile.py +++ b/emulators/xgngeo/files/patch-data-py_configfile.py @@ -5,7 +5,7 @@ "z80clock": 0, #Other thing section. - "libglpath": "/usr/lib/libGL.so", -+ "libglpath": "%%X11BASE%%/lib/libGL.so", ++ "libglpath": "%%LOCALBASE%%/lib/libGL.so", "sleepidle": "true", "bench": "false", },{ #XGngeo's default. diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile index 5f5ce5a..176986f 100644 --- a/emulators/xgs/Makefile +++ b/emulators/xgs/Makefile @@ -9,7 +9,7 @@ PORTNAME= xgs PORTVERSION= 0.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.inwards.com/xgs/ \ http://www.inwards.com/xgs/2mg/ @@ -27,7 +27,7 @@ RESTRICTED= "xgs.rom copyright is owned by Apple and cannot be distributed" # Source building # WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 ice sm xext USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x diff --git a/emulators/xhomer/files/patch-Makefile b/emulators/xhomer/files/patch-Makefile index c230a7b..6e96d9f 100644 --- a/emulators/xhomer/files/patch-Makefile +++ b/emulators/xhomer/files/patch-Makefile @@ -5,7 +5,7 @@ # other to "Y" or by setting both to "N" (most non-Linux systems). -X11DIR = /usr/X11R6 -+X11DIR = $(X11BASE) ++X11DIR = $(LOCALBASE) ifeq ($(X11DIR)/include/X11/extensions/xf86dga.h,$(wildcard $(X11DIR)/include/X11/extensions/xf86dga.h)) ifeq ($(X11DIR)/include/X11/extensions/xf86dga1.h,$(wildcard $(X11DIR)/include/X11/extensions/xf86dga1.h)) diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 67676c0..f83eef1 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -7,7 +7,7 @@ PORTNAME?= xmame PORTVERSION?= 0.106 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= emulators MASTER_SITES= http://www.franksworld.org/dist/xmame/ \ http://x.mame.net/download/ \ @@ -143,9 +143,9 @@ SDLSOUNDCOMMENT= .endif .if defined(WITH_OPENGL) -USE_XLIB= yes +USE_XORG+= x11 DISPLAY_TARGET= opengl -CFLAGS+= ${PTHREAD_CFLAGS} -I${X11BASE}/include +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include USE_GL= yes DISPLAY_METHOD= x11 PLIST_SUB+= OPENGL="" @@ -157,13 +157,13 @@ PLIST_SUB+= OPENGL="@comment " .if defined(WITH_SVGALIB) DISPLAY_TARGET= svgalib LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib -USE_XPM= yes +USE_XORG+= xpm DISPLAY_METHOD= svgalib .endif .if defined(WITH_X11) DISPLAY_METHOD= x11 -USE_XLIB= yes +USE_XORG+= x11 .endif # Option WITH_ESOUND @@ -203,7 +203,7 @@ do-configure: -e "s@# SOUND_SDL@${SDLSOUNDCOMMENT}SOUND_SDL@g" \ -e "s@^DISPLAY_METHOD.*@DISPLAY_METHOD = ${DISPLAY_METHOD}@g" \ -e "s@# X11_DGA@X11_DGA@g" \ - -e "s@/usr/X11R6@${X11BASE}@g" \ + -e "s@/usr/X11R6@${LOCALBASE}@g" \ -e "s@^SDL_CONFIG.*@SDL_CONFIG = ${SDL_CONFIG}@g" \ -e "s@^GLLIBS += .*@GLLIBS += ${PTHREAD_LIBS}@g" \ ${WRKSRC}/makefile.unix diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile index fd3f7f7..f2ee483 100644 --- a/emulators/xzx/Makefile +++ b/emulators/xzx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xzx PORTVERSION= 4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://mitglied.lycos.de/suppentops123/spectrum/xzx/ DISTNAME= ${PORTNAME}-pro-${PORTVERSION} @@ -16,13 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11 # xmkmf is used in configure script; USE_IMAKE makes the build unhappy -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake # Server redirects to distfile; won't work with -A FETCH_CMD= /usr/bin/fetch -Rr USE_MOTIF= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm xt xxf86vm # License forbids redistribution RESTRICTED= Redistribution forbidden by license diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index e513702..a617f59 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -68,9 +68,9 @@ CONFIGURE_ARGS+=--without-x PKGNAMESUFFIX= -nox11 .else CONFIGURE_ARGS+=--with-x -CFLAGS+= -I${X11BASE}/include -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(WITH_OPENGL) diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile index 0a93da5..cb7fd13 100644 --- a/finance/gnucash-docs/Makefile +++ b/finance/gnucash-docs/Makefile @@ -26,6 +26,6 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= libxml2 gnomehier GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" .include <bsd.port.mk> diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 64377a0..0d833aa 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnucash PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.gnucash.org/pub/gnucash/sources/stable/ @@ -37,9 +37,8 @@ OPTIONS= AQBANKING "AqBanking support (HBCI/OpenHBCI)" off \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes +USE_XORG= xpm x11 USE_GMAKE= yes -USE_XPM= yes USE_PERL5= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix libgsf_gnome libglade2 \ diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile index b053eee..459c7b9 100644 --- a/finance/khacc/Makefile +++ b/finance/khacc/Makefile @@ -22,7 +22,7 @@ USE_PERL5_BUILD=yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-qhacc-config=${X11BASE}/bin +CONFIGURE_ARGS= --with-qhacc-config=${LOCALBASE}/bin MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile index 1caf126..d0eac87 100644 --- a/finance/opentaxsolver/Makefile +++ b/finance/opentaxsolver/Makefile @@ -9,8 +9,7 @@ PORTNAME= ${UPPORTNAME:L} PORTVERSION= 5.05 PORTREVISION= 1 CATEGORIES= finance -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= opentaxsolver +MASTER_SITES= SF/opentaxsolver DISTNAME= ${UPPORTNAME}2007_${PORTVERSION} EXTRACT_SUFX= .tgz @@ -23,7 +22,7 @@ UPPORTNAME= OpenTaxSolver post-patch: @${REINPLACE_CMD} -e 's/%%PREFIX%%/${PREFIX:C,/,\/,g}/' \ ${WRKSRC}/src/GUI/ots_gui.c - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/src/GUI/Makefile.linux # 4.07 distfile has pre-built (linux) binaries we must whack. diff --git a/finance/pfpro/Makefile b/finance/pfpro/Makefile index 75e4f10..eae0fed 100644 --- a/finance/pfpro/Makefile +++ b/finance/pfpro/Makefile @@ -17,7 +17,7 @@ COMMENT= SDK for VeriSign's PayFlow Pro ONLY_FOR_ARCHS= i386 RESTRICTED= Only for VeriSign PayFlow Pro customers -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_WRKSUBDIR= yes SUB_FILES= pkg-message diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index 65071d1..3d527ad 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -7,10 +7,9 @@ PORTNAME= qhacc PORTVERSION= 3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= finance -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Simple QT-based financial manager @@ -19,7 +18,6 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile index c17ebb5..3d3e38a 100644 --- a/finance/qtstalker/Makefile +++ b/finance/qtstalker/Makefile @@ -9,8 +9,7 @@ PORTNAME= qtstalker PORTVERSION= 0.28 PORTREVISION= 1 CATEGORIES= finance kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= lioux@FreeBSD.org COMMENT= Commodity and stock market charting and technical analysis @@ -19,7 +18,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= db2:${PORTSDIR}/databases/db2 USE_QT_VER=3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= QTDIR="${QT_PREFIX}" @@ -84,8 +83,8 @@ do-configure: @cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} -spec ${QMAKESPEC} \ - "INCLUDEPATH += ${QT_PREFIX}/include ${LOCALBASE}/include ${X11BASE}/include" \ - "LIBS += -L${LOCALBASE}/lib -L${X11BASE}/lib" \ + "INCLUDEPATH += ${QT_PREFIX}/include ${LOCALBASE}/include" \ + "LIBS += -L${LOCALBASE}/lib " \ "QMAKE_CFLAGS_SHLIB += -fPIC" \ "QMAKE_CXXFLAGS_SHLIB += -fPIC" \ "DEFINES += QT_NO_COMPAT PIC" -o ${MAKEFILE} qtstalker.pro diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile index 46c7973..e94acb6 100644 --- a/finance/wmstock/Makefile +++ b/finance/wmstock/Makefile @@ -7,15 +7,14 @@ PORTNAME= wmstock PORTVERSION= 0.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= finance windowmaker MASTER_SITES= http://mattfischer.com/wmstock/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Cool WindowMaker Dockapp that shows stock ticker(s) -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/wmstock/src USE_GMAKE= yes diff --git a/finance/wmstock/files/patch-ab b/finance/wmstock/files/patch-ab index bde526c..6025b41 100644 --- a/finance/wmstock/files/patch-ab +++ b/finance/wmstock/files/patch-ab @@ -14,9 +14,9 @@ -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib +X11BASE ?= /usr/X11R6 -+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile index e223fab..1d484d5 100644 --- a/finance/xquote/Makefile +++ b/finance/xquote/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= Xbae.4:${PORTSDIR}/x11-toolkits/xbae USE_MOTIF= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm PLIST_FILES= bin/Xquote lib/X11/app-defaults/Xquote diff --git a/finance/xtrader/files/patch-Makefile.linux b/finance/xtrader/files/patch-Makefile.linux index f22cbec..ef14bac 100644 --- a/finance/xtrader/files/patch-Makefile.linux +++ b/finance/xtrader/files/patch-Makefile.linux @@ -7,10 +7,10 @@ -LFLAGS= -L/usr/local/lib -lz -lfltk -lptypes -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft -LFLAGS2= -L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread +COMP= $(CC) -+IFLAGS= -I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes -I$(X11BASE)/include ++IFLAGS= -I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes +CFLAGS:= $(CFLAGS) -Wno-format-y2k -+LFLAGS= -L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -L$(X11BASE)/lib -lm -lXpm -lX11 $(PTHREAD_LIBS) -lXft -lcompat -+LFLAGS2= -L$(LOCALBASE)/lib -lfltk -lptypes -L$(X11BASE)/lib -lXpm -lX11 $(PTHREAD_LIBS) ++LFLAGS= -L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 $(PTHREAD_LIBS) -lXft -lcompat ++LFLAGS2= -L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 $(PTHREAD_LIBS) XTRADER= xtrader XTRADER2= xtrader.static diff --git a/french/aster/Makefile b/french/aster/Makefile index e5e03b3..28969a2 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -171,9 +171,9 @@ SHIA= zsh SHIADEP= ${SHIA} .if !defined(WITH_ED) -. if exists(${X11BASE}/bin/nedit) +. if exists(${LOCALBASE}/bin/nedit) WITH_ED= nedit -RUN_DEPENDS+= ${X11BASE}/bin/nedit:${PORTSDIR}/editors/nedit +RUN_DEPENDS+= ${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit . elif exists(${LOCALBASE}/bin/gvim) WITH_ED= gvim RUN_DEPENDS+= ${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim @@ -188,10 +188,10 @@ WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit . elif exists(${LOCALBASE}/bin/kwrite) WITH_ED= kwrite -RUN_DEPENDS+= ${X11BASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 +RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 . elif exists(${LOCALBASE}/bin/xedit) WITH_ED= xedit -RUN_DEPENDS+= ${X11BASE}/bin/xedit:${PORTSDIR}/x11/xedit +RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit . else WITH_ED= vi . endif diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile index 876d24a..4e57abe 100644 --- a/french/staroffice52/Makefile +++ b/french/staroffice52/Makefile @@ -36,7 +36,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT} ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_CDROM= 'Doit être téléchargé depuis le site web de Sun' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes diff --git a/french/xtel/Makefile b/french/xtel/Makefile index 34fc779..556aa80 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtel PORTVERSION= 3.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= french comms emulators MASTER_SITES= http://pficheux.free.fr/xtel/download/ @@ -15,15 +15,16 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= An emulator for the french Minitel LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale # Remark: Xtel can serve a network, and emulate TVR and I-Minitel, but this is # the first release of this port, and these functionnalities have not (yet) # been implemented. USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm xbitmaps MAN1= xtel.1 xteld.1 diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile index 15b72db..a29f1ca 100644 --- a/ftp/IglooFTP/Makefile +++ b/ftp/IglooFTP/Makefile @@ -7,7 +7,7 @@ PORTNAME= IglooFTP PORTVERSION= 0.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp MASTER_SITES= ${MASTER_SITE_SUNSITE} \ ftp://littleigloo.org/pub/iglooftp/ @@ -19,6 +19,7 @@ COMMENT= Easy to use FTP client for X Window System WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src +USE_XORG= x11 xmu USE_GNOME= gtk12 ALL_TARGET= # empty MAKE_ARGS= CC=${CC} C_FLAGS="${CFLAGS}" DESTDIR=${PREFIX} diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile index 8121a8c..713f3c1 100644 --- a/ftp/ftptool/Makefile +++ b/ftp/ftptool/Makefile @@ -17,7 +17,7 @@ MAINTAINER= serge.gagnon.1@ulaval.ca COMMENT= Graphic ftp shell based on xview LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -RUN_DEPENDS= ${X11BASE}/bin/textedit:${PORTSDIR}/editors/textedit +RUN_DEPENDS= ${LOCALBASE}/bin/textedit:${PORTSDIR}/editors/textedit USE_IMAKE= yes MAKE_ARGS= CC=${CC} diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile index 12c78a0..4c62aca 100644 --- a/ftp/kbear/Makefile +++ b/ftp/kbear/Makefile @@ -20,7 +20,7 @@ COMMENT= A graphical FTP client for KDE WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes diff --git a/ftp/linux-curl/Makefile b/ftp/linux-curl/Makefile index 08519bc..ee494bb 100644 --- a/ftp/linux-curl/Makefile +++ b/ftp/linux-curl/Makefile @@ -16,7 +16,7 @@ COMMENT= Curl linux version USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/ftp/linux-f10-curl/Makefile b/ftp/linux-f10-curl/Makefile index 08519bc..ee494bb 100644 --- a/ftp/linux-f10-curl/Makefile +++ b/ftp/linux-f10-curl/Makefile @@ -16,7 +16,7 @@ COMMENT= Curl linux version USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/ftp/linux-f8-curl/Makefile b/ftp/linux-f8-curl/Makefile index 08519bc..ee494bb 100644 --- a/ftp/linux-f8-curl/Makefile +++ b/ftp/linux-f8-curl/Makefile @@ -16,7 +16,7 @@ COMMENT= Curl linux version USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/ftp/wmget/files/patch-Makefile b/ftp/wmget/files/patch-Makefile index d747664..018defc 100644 --- a/ftp/wmget/files/patch-Makefile +++ b/ftp/wmget/files/patch-Makefile @@ -5,7 +5,7 @@ # make PREFIX=/opt/dockapps install -PREFIX= /usr/local +X11BASE?= /usr/X11R6 -+PREFIX?= ${X11BASE} ++PREFIX?= ${LOCALBASE} INSTALLDIR= install -d -m 755 -INSTALLBIN= install -m 555 @@ -16,11 +16,11 @@ +INSTALLMAN= $(INSTALL_MAN) +CC?= gcc +CFLAGS?= -Wall -W -+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include ++CFLAGS+= -I${LOCALBASE}/include # The following line is what I use during development #CFLAGS:= $(CFLAGS) -Werror -g -LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl -+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl ++LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl DOCS= wmget.1 VERSION:= $(shell grep '\#define WMGET_VERSION ' wmget.h \ diff --git a/ftp/wmget/files/patch-dockapp::Makefile b/ftp/wmget/files/patch-dockapp::Makefile index e047a61..bc8795e 100644 --- a/ftp/wmget/files/patch-dockapp::Makefile +++ b/ftp/wmget/files/patch-dockapp::Makefile @@ -10,8 +10,8 @@ -CFLAGS= -ansi -Wall -W -Werror -g -LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 +CFLAGS?= -ansi -Wall -W -Werror -g -+CFLAGS+= -I${X11BASE}/include -+LDFLAGS= -L${X11BASE}/lib -lXpm -lXext -lX11 ++CFLAGS+= -I${LOCALBASE}/include ++LDFLAGS= -L${LOCALBASE}/lib -lXpm -lXext -lX11 dockapp.a: $(DAOBJS) ar rcsv dockapp.a $(DAOBJS) diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile index 305d103..c61cfe2 100644 --- a/ftp/xrmftp/Makefile +++ b/ftp/xrmftp/Makefile @@ -20,9 +20,9 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.src ALL_TARGET= xrmftp -CFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/X11 +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ - LDFLAGS="-L/usr/lib -L${X11BASE}/lib -lm -lX11 -lforms -lXpm" + LDFLAGS="-L/usr/lib -L${LOCALBASE}/lib -lm -lX11 -lforms -lXpm" PORTDOCS= CHANGES FIXED-BUGS README PLIST_FILES= bin/xrmftp diff --git a/games/3dc/Makefile b/games/3dc/Makefile index 0a06ec4..37b5de4 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -16,7 +16,7 @@ DISTNAME= 3Dc-${PORTVERSION} MAINTAINER= adam-ports@blacktabby.org COMMENT= 3-Dimensional Chess for X Window System -LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_PERL5_BUILD=yes USE_XORG= xpm diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-aa index 5ab8f9a..791668f 100644 --- a/games/3dc/files/patch-aa +++ b/games/3dc/files/patch-aa @@ -21,7 +21,7 @@ +COPTIONS=-DVERSION=\"${VERSION}\" -CFLAGS=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -+CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${X11BASE}/include ++CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${LOCALBASE}/include LDOPTIONS= # LDLIBS should include the name of your X library path if not /usr/lib; @@ -29,7 +29,7 @@ # appear much but it looks much better when it does. # Linux -LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -+LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${X11BASE}/lib ++LDLIBS=-L${LOCALBASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${LOCALBASE}/lib # Sun #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile index e3e77b3..81d82aa 100644 --- a/games/3dpong/Makefile +++ b/games/3dpong/Makefile @@ -16,8 +16,8 @@ COMMENT= X Window 3D Pong game for 1 or 2 players with a ball and paddles USE_XORG= x11 USE_GMAKE= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - XLIB="-L${X11BASE}/lib -lX11" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + XLIB="-L${LOCALBASE}/lib -lX11" post-patch: @${REINPLACE_CMD} -e \ diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile index 40f4c53..08e6092 100644 --- a/games/BillardGL/Makefile +++ b/games/BillardGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= BillardGL PORTVERSION= 1.75 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF MASTER_SITE_SUBDIR= billardgl @@ -15,16 +15,14 @@ MASTER_SITE_SUBDIR= billardgl MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL billiard simulator -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_GMAKE= yes -USE_GL= gl +USE_GL= gl glut post-patch: @${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \ - s|%%X11BASE%%|${X11BASE}|' ${WRKSRC}/Namen.h + s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Namen.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/games/BillardGL/files/patch-Makefile b/games/BillardGL/files/patch-Makefile index fadeee5..0f85127 100644 --- a/games/BillardGL/files/patch-Makefile +++ b/games/BillardGL/files/patch-Makefile @@ -14,11 +14,11 @@ +CXX ?= g++
+CFLAGS += -pipe -Wall -W -DNO_DEBUG -g
+CXXFLAGS+= -pipe -Wall -W -DNO_DEBUG -g
-+INCPATH = -I${X11BASE}/include
++INCPATH = -I${LOCALBASE}/include
+LINK = ${CXX} LFLAGS =
-LIBS = -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
-+LIBS = -L${X11BASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
++LIBS = -L${LOCALBASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
## -lqgl -lGLU
diff --git a/games/BillardGL/files/patch-Namen.h b/games/BillardGL/files/patch-Namen.h index b42a532..425f7f9 100644 --- a/games/BillardGL/files/patch-Namen.h +++ b/games/BillardGL/files/patch-Namen.h @@ -5,7 +5,7 @@ #ifndef _WIN32
-#define PFAD "/usr/share/BillardGL/"
-+#define PFAD "%%X11BASE%%/share/%%PORTNAME%%/"
++#define PFAD "%%LOCALBASE%%/share/%%PORTNAME%%/"
#endif
#ifndef PFAD
diff --git a/games/CaribbeanStud/files/patch-Xmakefile b/games/CaribbeanStud/files/patch-Xmakefile index 617ce93..cb17200 100644 --- a/games/CaribbeanStud/files/patch-Xmakefile +++ b/games/CaribbeanStud/files/patch-Xmakefile @@ -6,11 +6,11 @@ +## FreeBSD +## -+XINCLUDES=-I$(X11BASE)/include ++XINCLUDES=-I$(LOCALBASE)/include +UILFLAGS= +CFLAGS+= -fhandle-exceptions -fno-for-scope +CXXFLAGS+= $(XINCLUDES) -+LDFLAGS+=-L$(X11BASE)/lib ++LDFLAGS+=-L$(LOCALBASE)/lib +LDLIBS= +MOTIFLIBS=-lXm -lXmu -lXt -lX11 ${MOTIFLIB} + diff --git a/games/KnightCap/files/patch-aa b/games/KnightCap/files/patch-aa index 5c8749b..3a4bc2c 100644 --- a/games/KnightCap/files/patch-aa +++ b/games/KnightCap/files/patch-aa @@ -23,9 +23,9 @@ -X11 = /usr/X11R6 -GLUT_LIBS = -L$(GLUT)/lib/glut -lglut -MESA_LIBS = -L$(MESA)/lib -lMesaGLU -lMesaGL -lm -+MESA = ${X11BASE} -+GLUT = ${X11BASE} -+X11 = ${X11BASE} ++MESA = ${LOCALBASE} ++GLUT = ${LOCALBASE} ++X11 = ${LOCALBASE} +GLUT_LIBS = -L$(GLUT)/lib -lglut +MESA_LIBS = -L$(MESA)/lib -lGLU -lGL -lm XLIBS = -L$(X11)/lib -lXmu -lXt -lXext -lX11 -lXi diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile index 821dd80..437ecc3 100644 --- a/games/abuse_sdl/Makefile +++ b/games/abuse_sdl/Makefile @@ -15,12 +15,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An SDL port of the Abuse game engine USE_BZIP2= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN6= abuse-sdl.6 diff --git a/games/actx/Makefile b/games/actx/Makefile index e188118..5ac45b1 100644 --- a/games/actx/Makefile +++ b/games/actx/Makefile @@ -17,7 +17,7 @@ COMMENT= Window sitter for X11 NO_CDROM= 'contains commercial character data' USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= actx.1 MANLANG= "" ja diff --git a/games/adom/Makefile b/games/adom/Makefile index 136ae45..3ffc9f1 100644 --- a/games/adom/Makefile +++ b/games/adom/Makefile @@ -19,7 +19,7 @@ NO_CDROM= Copy of CD must be sent to author ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/adom NO_BUILD= yes diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile index 2bb1a46..4c08c565 100644 --- a/games/affenspiel/Makefile +++ b/games/affenspiel/Makefile @@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= x11 xt -MAKE_ARGS= CC="${CC}" LIBS="-L${X11BASE}/lib -lX11" \ - DEBUG="${CFLAGS} -I${X11BASE}/include" \ +MAKE_ARGS= CC="${CC}" LIBS="-L${LOCALBASE}/lib -lX11" \ + DEBUG="${CFLAGS} -I${LOCALBASE}/include" \ FILE_CONFIG=-DSAVED_GAME_NAME='\"affenspiel.saved\"' PORTDOCS= COPYRIGHT README diff --git a/games/airrox/files/patch-Makefile b/games/airrox/files/patch-Makefile index f0ffd88..cd5e690 100644 --- a/games/airrox/files/patch-Makefile +++ b/games/airrox/files/patch-Makefile @@ -9,7 +9,7 @@ + # bibliotecas para Linux -LIBSLINUX = -L/usr/X11R6/lib -lGL -lGLU -lglut -L/usr/lib -lSDL_mixer -lSDL -lpthread `sdl-config --cflags --libs` -lSDL_net -+LIBSLINUX = -L$(X11BASE)/lib -lGL -lGLU -lglut `sdl-config --libs` -lSDL_mixer -lSDL_net ++LIBSLINUX = -L$(LOCALBASE)/lib -lGL -lGLU -lglut `sdl-config --libs` -lSDL_mixer -lSDL_net # bibliotecas para Windows LIBSWIN = -lopengl32 -lglu32 -lglut32 -lmingw32 -lSDLmain -lSDL -lSDL_mixer -mwindows -L$(DEVCPP_PATH)\lib -lSDL_net @@ -22,7 +22,7 @@ # flags (otimizacao e nao exibir warnings) -FLAGS = -O2 -DREENTRANT -DHAVE_OPENGL #-g -+FLAGS = $(CFLAGS) -DREENTRANT -DHAVE_OPENGL -I$(X11BASE)/include `sdl-config --cflags` ++FLAGS = $(CFLAGS) -DREENTRANT -DHAVE_OPENGL -I$(LOCALBASE)/include `sdl-config --cflags` + +ifdef OPTIMIZED_CFLAGS +FLAGS += -O2 diff --git a/games/alephone/Makefile b/games/alephone/Makefile index c189a3d..b25add8 100644 --- a/games/alephone/Makefile +++ b/games/alephone/Makefile @@ -9,8 +9,7 @@ PORTNAME= alephone PORTVERSION= 20070525 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= marathon +MASTER_SITES= SF/marathon DISTNAME= AlephOne-${PORTVERSION} MAINTAINER= ray@cultofray.net @@ -26,8 +25,8 @@ USE_LUA= 5.0 USE_SDL= image net sdl sound GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR} +CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR} +LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR} DATADIR= ${PREFIX}/share/AlephOne diff --git a/games/amphetamine/files/patch-aa b/games/amphetamine/files/patch-aa index a8279ff..82c3d68 100644 --- a/games/amphetamine/files/patch-aa +++ b/games/amphetamine/files/patch-aa @@ -25,7 +25,7 @@ $FreeBSD$ # Directories to search for header files -SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS} -+SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS} -I ${X11BASE}/include ++SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS} -I ${LOCALBASE}/include # makemake variables @@ -56,7 +56,7 @@ $FreeBSD$ endif -LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -+LDFLAGS = -L$(X11BASE)/lib ++LDFLAGS = -L$(LOCALBASE)/lib .PHONY : default default : amph @@ -78,7 +78,7 @@ $FreeBSD$ ./src/Surface.o: ./src/AmpHead.hpp ./src/Clut.hpp ./src/ConstVal.hpp ./src/Graphfil.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h -./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h -+./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp ${X11BASE}/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h ++./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp ${LOCALBASE}/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h ./src/Thing.o: ./src/AmpHead.hpp ./src/Appl.hpp ./src/Bullet.hpp ./src/ConstVal.hpp ./src/Element.hpp ./src/File.hpp ./src/Graphfil.hpp ./src/Level.hpp ./src/ObjInfo.hpp ./src/Object.hpp ./src/Pltform.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp ./src/Thing.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h diff --git a/games/annelid/Makefile b/games/annelid/Makefile index f6627cf..838e5db 100644 --- a/games/annelid/Makefile +++ b/games/annelid/Makefile @@ -23,7 +23,7 @@ RESTRICTED= No redistribution allowed USE_ZIP= yes USE_GMAKE= yes USE_SDL= sdl -USE_GL= yes +USE_GL= gl NO_WRKSUBDIR= yes OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on @@ -40,7 +40,7 @@ DATAFILES= annelid.dat apple.tga apple.wav backd.tga backn.tga font.dat \ post-patch: # Fix Makefile. @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}| ; \ - s|%%X11BASE%%|${X11BASE}| ; \ + s|%%LOCALBASE%%|${LOCALBASE}| ; \ s|sdl-config|${SDL_CONFIG}|' \ ${WRKSRC}/${MAKEFILE} diff --git a/games/annelid/files/patch-Makefile b/games/annelid/files/patch-Makefile index 1409572..6bb19c1 100644 --- a/games/annelid/files/patch-Makefile +++ b/games/annelid/files/patch-Makefile @@ -16,7 +16,7 @@ -CCC=g++ -CFLAGS=-I. `sdl-config --cflags` -c -Wall -ggdb -fomit-frame-pointer -O3 +CCC=$(CXX) -+CFLAGS=%%CFLAGS%% -I. -I%%X11BASE%%/include `sdl-config --cflags` -c -Wall $(OPT) ++CFLAGS=%%CFLAGS%% -I. -I%%LOCALBASE%%/include `sdl-config --cflags` -c -Wall $(OPT) +OPT = -fomit-frame-pointer -O3 -LD=g++ @@ -26,7 +26,7 @@ LIBS=-lopengl32 `sdl-config --libs` else -LIBS=-L/usr/X11R6/lib -lGL `sdl-config --libs` -+LIBS=-L%%X11BASE%%/lib -lGL `sdl-config --libs` ++LIBS=-L%%LOCALBASE%%/lib -lGL `sdl-config --libs` endif all: $(NAME) diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile index aaf4148..0182f57 100644 --- a/games/apoolGL/Makefile +++ b/games/apoolGL/Makefile @@ -27,7 +27,7 @@ post-patch: do-build: ${CC} ${CFLAGS} -DDATADIR="\"${DATADIR}\"" \ `${SDL_CONFIG} --cflags --libs` \ - -I${X11BASE}/include -L${X11BASE}/lib -lGL -lGLU \ + -I${LOCALBASE}/include -L${LOCALBASE}/lib -lGL -lGLU \ -o ${WRKSRC}/apool ${WRKSRC}/*.c do-install: diff --git a/games/aqbubble/Makefile b/games/aqbubble/Makefile index d634b04..e945df0 100644 --- a/games/aqbubble/Makefile +++ b/games/aqbubble/Makefile @@ -17,8 +17,8 @@ COMMENT= Game similar to snow bros USE_SDL= sdl mixer image GNU_CONFIGURE= yes USE_GMAKE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile index eb4d0b9..1a44612 100644 --- a/games/armagetron/Makefile +++ b/games/armagetron/Makefile @@ -10,18 +10,17 @@ PORTNAME= armagetron PORTVERSION= 0.2.7.1 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= armagetronad +MASTER_SITES= SF/armagetronad DISTNAME= armagetronad-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A multiplayer networked Tron clone in 3D -USE_GL= yes +USE_GL= gl USE_SDL= sdl image USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png diff --git a/games/atitd/Makefile b/games/atitd/Makefile index 097acdf..1a181c5 100644 --- a/games/atitd/Makefile +++ b/games/atitd/Makefile @@ -17,7 +17,7 @@ EXTRACT_ONLY= MAINTAINER= ports@FreeBSD.org COMMENT= The Linux "A Tale in the Desert" (ATITD) client -RUN_DEPENDS= ${X11BASE}/bin/xhost:${X_CLIENTS_PORT} +RUN_DEPENDS= ${LOCALBASE}/bin/xhost:${PORTSDIR}/x11/xhost .include <bsd.port.pre.mk> diff --git a/games/atomix/Makefile b/games/atomix/Makefile index bb0a2eb..023506a 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -8,7 +8,7 @@ PORTNAME= atomix PORTVERSION= 2.14.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +17,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A yet another little mind game -USE_X_PREFIX= yes USE_GMAKE= yes USE_BZIP2= yes USE_GETTEXT= yes diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index 01af905..c164128 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -33,8 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ SDL_CONFIG="${SDL_CONFIG}" USE_AUTOTOOLS= automake:19 autoconf:261 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> @@ -53,7 +53,7 @@ pre-patch: @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|' ${WRKSRC}/Makefile.am post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile.am pre-configure: cd ${WRKSRC}; ${SH} autogen.sh diff --git a/games/barrage/Makefile b/games/barrage/Makefile index 2b21d10..2a0c9d2 100644 --- a/games/barrage/Makefile +++ b/games/barrage/Makefile @@ -9,8 +9,7 @@ PORTNAME= barrage PORTVERSION= 1.0.2 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= lgames +MASTER_SITES= SF/lgames DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= az@FreeBSD.org @@ -21,7 +20,7 @@ USE_SDL= sdl mixer GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-profile-path=/var/games -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e 's|applications|applnk/Applications|g' \ diff --git a/games/battalion/files/patch-aa b/games/battalion/files/patch-aa index fe1e950..cda0266 100644 --- a/games/battalion/files/patch-aa +++ b/games/battalion/files/patch-aa @@ -37,7 +37,7 @@ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS # ------------------------------------------------------------ -CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. -+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\" ++CFLAGS+= -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" # STEP 8: ADD ANY SPECIAL LIBRARY PATHS @@ -46,7 +46,7 @@ OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o -LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext -+LIBS = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS) ++LIBS = -L./. -L${LOCALBASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS) all: $(TARGET) diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 5dcf4b1..03b55e4 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -19,10 +19,10 @@ USE_GL= glu gl WRKSRC= ${WRKDIR}/battleball-2.1-src CFLAGS+= -Wno-deprecated ${PTHREAD_CFLAGS} MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - XLIBS="-L${X11BASE}/lib -lX11" \ + XLIBS="-L${LOCALBASE}/lib -lX11" \ LIBS="-lm ${XLIBS} ${PTHREAD_LIBS}" \ - GLINCS="-I${X11BASE}/include" \ - GLLIBS="-lXi -lXmu -lXext -L${X11BASE}/lib -lGL" + GLINCS="-I${LOCALBASE}/include" \ + GLLIBS="-lXi -lXmu -lXext -L${LOCALBASE}/lib -lGL" PLIST_FILES= bin/battleball .if !defined(NOPORTDOCS) diff --git a/games/bfm/files/patch-Rules.make.in b/games/bfm/files/patch-Rules.make.in index 4b009d5..82c31f0 100644 --- a/games/bfm/files/patch-Rules.make.in +++ b/games/bfm/files/patch-Rules.make.in @@ -42,7 +42,7 @@ @LUA_CFLAGS@ $(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ @PLATFORM@ \ - $(DATADIR) \ - -I/usr/local/include $(ARTSC) -+ $(DATADIR) $(ARTSC) -I$(LOCALBASE)/include -I$(X11BASE)/include ++ $(DATADIR) $(ARTSC) -I$(LOCALBASE)/include CTAGSFLAGS=-i defptvS -a -f diff --git a/games/blobandconquer/files/patch-makefile b/games/blobandconquer/files/patch-makefile index 251ab44..430a09f 100644 --- a/games/blobandconquer/files/patch-makefile +++ b/games/blobandconquer/files/patch-makefile @@ -17,12 +17,12 @@ CXXFLAGS += -Wmissing-format-attribute -Wmissing-noreturn CXXFLAGS += -Wdisabled-optimization -CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV) -+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV) ++CXXFLAGS += -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV) CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)/index.html\" -Wall -pedantic CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib -LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz -+LIBPATH = -L$(X11BASE)/lib ++LIBPATH = -L$(LOCALBASE)/lib +LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz -lintl # Yes, it means compiling is a little slower... but it's less hassle diff --git a/games/bloboats/files/patch-Makefile b/games/bloboats/files/patch-Makefile index 22e6282..dd7ad61 100644 --- a/games/bloboats/files/patch-Makefile +++ b/games/bloboats/files/patch-Makefile @@ -49,7 +49,7 @@ ### Libs LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L/usr/X11R6/lib -lGL -lGLU -+LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L$(X11BASE)/lib -lGL -lGLU ++LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L$(LOCALBASE)/lib -lGL -lGLU LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -L/usr/pkg/lib LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -framework OpenGL LIBS_CROSS = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lopengl32 -lglu32 @@ -67,7 +67,7 @@ BINARY_ = $(BINARY_$(TARGET)_) CXXFLAGS_DEFAULT_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 -CXXFLAGS_FREEBSD_ = -g `$(SDLCONFIG) --cflags` -I/usr/X11R6/include -o bin/$(BINARY_) -O2 -+CXXFLAGS_FREEBSD_ = `$(SDLCONFIG) --cflags` -I$(X11BASE)/include -o bin/$(BINARY_) -O2 ++CXXFLAGS_FREEBSD_ = `$(SDLCONFIG) --cflags` -I$(LOCALBASE)/include -o bin/$(BINARY_) -O2 CXXFLAGS_NETBSD = -g `$(SDLCONFIG) --cflags` -O2 -I/usr/pkg/include CXXFLAGS_MACOSX_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 diff --git a/games/blockade/files/patch-aa b/games/blockade/files/patch-aa index 5493fbd..7c2444b 100644 --- a/games/blockade/files/patch-aa +++ b/games/blockade/files/patch-aa @@ -15,8 +15,8 @@ # Linux -CFLAGS = -DSYSV -I/usr/include/X11 -Wall -LDFLAGS = -L/usr/X11R6/lib -lX11 -+CFLAGS += -I$(X11BASE)/include -+LDFLAGS = -L$(X11BASE)/lib -lX11 ++CFLAGS += -I$(LOCALBASE)/include ++LDFLAGS = -L$(LOCALBASE)/lib -lX11 SOUND = blockade-snd.o SOUNDH = blockade-snd.h diff --git a/games/blokish/Makefile b/games/blokish/Makefile index 6cc004d..b8080b8 100644 --- a/games/blokish/Makefile +++ b/games/blokish/Makefile @@ -18,11 +18,11 @@ COMMENT= Clone of the strategy board game 'Blokus' GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_WX= 2.6 -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" MAKEFILE= makefile diff --git a/games/bloodfrontier/files/patch-src_Makefile b/games/bloodfrontier/files/patch-src_Makefile index d7c8164..bbef901 100644 --- a/games/bloodfrontier/files/patch-src_Makefile +++ b/games/bloodfrontier/files/patch-src_Makefile @@ -4,14 +4,14 @@ -CXXOPTFLAGS= -O3 -fomit-frame-pointer -INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags` -CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES) -+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` ++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` +CXXFLAGS+= -Wall -fsigned-char $(INCLUDES) -PLATFORM_PREFIX=native +PLATFORM_PREFIX=FreeBSD -CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU -+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU ++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU CLIENT_OBJS= \ shared/tools.o \ shared/geom.o \ diff --git a/games/bogged/Makefile b/games/bogged/Makefile index c538be5..d537111 100644 --- a/games/bogged/Makefile +++ b/games/bogged/Makefile @@ -7,7 +7,7 @@ PORTNAME= bogged PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/strategy @@ -25,7 +25,6 @@ EXTRACT_AFTER_ARGS= ${WRKDIR} NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/bogged -USE_X_PREFIX= yes post-extract: @ ${GUNZIP_CMD} ${WRKDIR}/${DISTNAME}${EXTRACT_SUFX} diff --git a/games/bomb/Makefile b/games/bomb/Makefile index 3ab7a3d..b838149 100644 --- a/games/bomb/Makefile +++ b/games/bomb/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ vga.1:${PORTSDIR}/graphics/svgalib \ quicktime.0:${PORTSDIR}/multimedia/libquicktime -MAKE_ENV= SCM_CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" +MAKE_ENV= SCM_CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" ALL_TARGET= ${PORTNAME} PORTDOCS= README bomb.lsm guile.txt manual.txt notes.txt @@ -29,7 +29,7 @@ pre-configure: ${REINPLACE_CMD} -e 's|/usr/lib/bomb|${DATADIR}|; \ s|/home/spot/src/quicktime4linux-1.1.9/quicktime|${LOCALBASE}/lib|; \ s|..QTDIR./libquicktime.a|-lquicktime|; \ - s|/usr/X11R6/lib|${X11BASE}/lib -L${LOCALBASE}/lib|; \ + s|/usr/X11R6/lib|${LOCALBASE}/lib -L${LOCALBASE}/lib|; \ s|-lpthread|${PTHREAD_LIBS}|; \ s|/usr/bin/bomb|${PREFIX}/bin/bomb|; \ s|/usr/share/control-center/.data|${DATADIR}/.data|; \ diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile index 4d68298..f8888ff 100644 --- a/games/bomberclone/Makefile +++ b/games/bomberclone/Makefile @@ -9,8 +9,7 @@ PORTNAME= bomberclone PORTVERSION= 0.11.8 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= edwin@mavetju.org COMMENT= Reimplementation of Atomic Bomber Man @@ -21,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes CONFIGURE_ARGS= --target="" CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" + CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" post-extract: ${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf ; diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile index a539271..372eb5a 100644 --- a/games/bombermaze/Makefile +++ b/games/bombermaze/Makefile @@ -7,15 +7,13 @@ PORTNAME= bombermaze PORTVERSION= 0.6.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= A multiplayer game, strategy place bombs to kill enemies and obstacles -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf USE_GETTEXT= yes diff --git a/games/boswars/Makefile b/games/boswars/Makefile index a552fa3..c0f3be3 100644 --- a/games/boswars/Makefile +++ b/games/boswars/Makefile @@ -7,7 +7,7 @@ PORTNAME= boswars PORTVERSION= 2.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://boswars.org:8001/bos/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -34,8 +34,8 @@ OPTIONS= GL "Enable OpenGL support" on \ .if !defined(WITHOUT_GL) USE_GL= yes SCONS_ARGS+= opengl=1 -CPPPATH+= ${X11BASE}/include -LIBPATH+= ${X11BASE}/lib +CPPPATH+= ${LOCALBASE}/include +LIBPATH+= ${LOCALBASE}/lib .endif .if !defined(WITH_OPTIMIZED_CFLAGS) diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile index fe89fcb..5d1054f 100644 --- a/games/bubbros/Makefile +++ b/games/bubbros/Makefile @@ -22,7 +22,7 @@ USE_PYTHON= yes USE_BZIP2= yes post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/display/setup.py do-build: diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile index 0fe330e..03bdc64 100644 --- a/games/bumprace/Makefile +++ b/games/bumprace/Makefile @@ -19,8 +19,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_SDL= sdl mixer image -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PORTDOCS= FAQ README diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile index dfd824a..2c2b7f9 100644 --- a/games/burgerspace/Makefile +++ b/games/burgerspace/Makefile @@ -19,10 +19,10 @@ LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng \ GNU_CONFIGURE= yes SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config -CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include +CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib CCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS+= --with-gengameng-prefix="${X11BASE}" +CONFIGURE_ARGS+= --with-gengameng-prefix="${LOCALBASE}" MAN6= burgerspace.6 PLIST_FILES= bin/burgerspace diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile index 4feab03..18c9051 100644 --- a/games/bygfoot/Makefile +++ b/games/bygfoot/Makefile @@ -7,9 +7,9 @@ PORTNAME= bygfoot PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= pav@FreeBSD.org @@ -18,7 +18,6 @@ COMMENT= Football (soccer) management game GNU_CONFIGURE= yes USE_BZIP2= yes USE_GNOME= gtk20 gnometarget -USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/games/cake/files/patch-Makefile b/games/cake/files/patch-Makefile index 020889d..629772c 100644 --- a/games/cake/files/patch-Makefile +++ b/games/cake/files/patch-Makefile @@ -8,11 +8,11 @@ -LDFLAGS += -L/usr/lib -L/usr/local/lib -lglut -lGLU -lGL -L/usr/X11R6/lib -lm -ldl -LDFLAGS += -lpthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 -+INCLUDES = -I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include ++INCLUDES = -I/usr/include -I$(LOCALBASE)/include +CXX ?= g++ +CXXFLAGS += -Wall $(INCLUDES) + -+LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lglut -lGLU -lGL ++LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lglut -lGLU -lGL +LDFLAGS += $(PTHREAD_LIBS) -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE +#LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 +LDFLAGS += -ljpeg diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile index 0d7decb..669101f 100644 --- a/games/ceferino/Makefile +++ b/games/ceferino/Makefile @@ -17,8 +17,8 @@ COMMENT= Game similar to Super Pang USE_SDL= sdl mixer image GNU_CONFIGURE= yes USE_GMAKE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/cgoban2/Makefile b/games/cgoban2/Makefile index 3d97e32..d42325d 100644 --- a/games/cgoban2/Makefile +++ b/games/cgoban2/Makefile @@ -7,7 +7,7 @@ PORTNAME= cgoban2 PORTVERSION= 2.6.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games java MASTER_SITES= http://kgs.kiseido.com/ DISTNAME= cgoban-unix-${PORTVERSION} @@ -20,7 +20,6 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/cgoban -USE_X_PREFIX= yes USE_JAVA= yes JAVA_VERSION= 1.3+ NO_BUILD= yes diff --git a/games/chanta/Makefile b/games/chanta/Makefile index a81576f..a8103c1 100644 --- a/games/chanta/Makefile +++ b/games/chanta/Makefile @@ -17,8 +17,8 @@ COMMENT= Free 2D jump and run game USE_SDL= sdl image mixer USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index d67106b..1b0dda4 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -22,16 +22,16 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ openal.0:${PORTSDIR}/audio/openal \ alut.1:${PORTSDIR}/audio/freealut -USE_GL= yes +USE_GL= glu USE_GMAKE= yes WRKSRC= ${WRKDIR}/Chromium-0.9 post-patch: @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src-setup/Makefile - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/support/glpng/src/Makefile + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin diff --git a/games/chromium/Makefile b/games/chromium/Makefile index d67106b..1b0dda4 100644 --- a/games/chromium/Makefile +++ b/games/chromium/Makefile @@ -22,16 +22,16 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ openal.0:${PORTSDIR}/audio/openal \ alut.1:${PORTSDIR}/audio/freealut -USE_GL= yes +USE_GL= glu USE_GMAKE= yes WRKSRC= ${WRKDIR}/Chromium-0.9 post-patch: @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src-setup/Makefile - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/support/glpng/src/Makefile + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile index 27df294..36e2a46 100644 --- a/games/clanbomber/Makefile +++ b/games/clanbomber/Makefile @@ -7,10 +7,9 @@ PORTNAME= clanbomber PORTVERSION= 1.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A bomberman-like multiplayer game @@ -19,7 +18,6 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib BROKEN= Does not compile with the newer clanCore -USE_XLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ diff --git a/games/cleanq3/files/patch-code-unix-Makefile b/games/cleanq3/files/patch-code-unix-Makefile index 4906133..ac3078f 100644 --- a/games/cleanq3/files/patch-code-unix-Makefile +++ b/games/cleanq3/files/patch-code-unix-Makefile @@ -52,7 +52,7 @@ -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe -+GL_CFLAGS = -I$(X11BASE)/include ++GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror @@ -94,7 +94,7 @@ #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ diff --git a/games/columns/Makefile b/games/columns/Makefile index 9117781..6453b47 100644 --- a/games/columns/Makefile +++ b/games/columns/Makefile @@ -7,7 +7,7 @@ PORTNAME= columns PORTVERSION= 1.2b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games # mastersite disappeared in December 2000 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -18,7 +18,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Nice little implementation of columns game for X Window System USE_SDL= sdl -USE_X_PREFIX= yes GNU_CONFIGURE= yes DATADIR= ${PREFIX}/share/Columns diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile index 24d6866..3660a5e 100644 --- a/games/connectfive/Makefile +++ b/games/connectfive/Makefile @@ -9,8 +9,7 @@ PORTNAME= connectfive PORTVERSION= 1.0.2 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= connectfive +MASTER_SITES= SF/connectfive DISTNAME= connectFive MAINTAINER= amdmi3@amdmi3.ru @@ -18,12 +17,12 @@ COMMENT= Place five pieces in a row on a 3d board MAKEFILE= Makefile.linux MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" ALL_TARGET= default USE_SDL= sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes WRKSRC= ${WRKDIR}/connectFive diff --git a/games/construo/Makefile b/games/construo/Makefile index 381e98e..73ee9cb 100644 --- a/games/construo/Makefile +++ b/games/construo/Makefile @@ -20,8 +20,8 @@ USE_GMAKE= yes USE_XORG= sm ice x11 xext xxf86vm CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${DATADIR} OPTIONS= GLUT "Use glut" on @@ -29,7 +29,7 @@ OPTIONS= GLUT "Use glut" on .include <bsd.port.pre.mk> .if defined(WITH_GLUT) -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut PLIST_SUB+= GLUTBIN:="" .else PLIST_SUB+= GLUTBIN:="@comment " diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 5779046..bc30083 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -6,7 +6,7 @@ PORTNAME= crack-attack PORTVERSION= 1.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,12 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pav@FreeBSD.org COMMENT= OpenGL game based on Super Nintendo classic Tetris Attack -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_X_PREFIX= yes +USE_GL= glut USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" CXXFLAGS="${CFLAGS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" CXXFLAGS="${CFLAGS}" MAN6= crack-attack.6 diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index a00c58a..7ff651e 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -7,11 +7,10 @@ PORTNAME= criticalmass PORTVERSION= 1.0.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= CriticalMass-${PORTVERSION} MAINTAINER= acm@FreeBSD.org @@ -21,7 +20,7 @@ CONFLICTS= shaaft-[0-9]* USE_BZIP2= yes USE_SDL= image mixer sdl -USE_GL= yes +USE_GL= gl USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -41,7 +40,7 @@ post-patch: 's|SDL/SDL|SDL|g' @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \ s|^CXXFLAGS|#CXXFLAGS|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|-lSDL | |g ; \ s|-lpng12|-lpng|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|and def|\&\& def|g' ${WRKSRC}/utils/OSName.hpp diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile index 70c262a..6678165 100644 --- a/games/crossfire-client/Makefile +++ b/games/crossfire-client/Makefile @@ -9,7 +9,7 @@ PORTNAME= crossfire-client PORTVERSION= 1.8.0 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ ftp://ftp.ifi.uio.no/pub/crossfire/ \ ftp://ftp.real-time.com/pub/games/crossfire/ MASTER_SITE_SUBDIR= ${PORTNAME:S/-client//} @@ -27,8 +27,8 @@ USE_GNOME= gnometarget USE_GMAKE= yes USE_SDL= image sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds MAN6= cfclient.6 diff --git a/games/cube/files/patch-Makefile b/games/cube/files/patch-Makefile index 6bc72191d..4717ba6 100644 --- a/games/cube/files/patch-Makefile +++ b/games/cube/files/patch-Makefile @@ -6,10 +6,10 @@ -CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` +CXX?=g++ +CXXOPTFLAGS=-Wall -+CXXFLAGS+=$(CXXOPTFLAGS) -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` -I$(X11BASE)/include ++CXXFLAGS+=$(CXXOPTFLAGS) -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` -CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU -+CLIENT_LIBS=-L$(LOCALBASE)/lib -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU ++CLIENT_LIBS=-L$(LOCALBASE)/lib -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU CLIENT_OBJS= \ client.o \ clientextras.o \ diff --git a/games/cultivation/files/patch-Makefile.GnuLinux b/games/cultivation/files/patch-Makefile.GnuLinux index 3afa4bf..2282fe9 100644 --- a/games/cultivation/files/patch-Makefile.GnuLinux +++ b/games/cultivation/files/patch-Makefile.GnuLinux @@ -5,13 +5,13 @@ -PLATFORM_COMPILE_FLAGS = -DLINUX -+PLATFORM_COMPILE_FLAGS = ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -DLINUX ++PLATFORM_COMPILE_FLAGS = ${CXXFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include -DLINUX # various GL and X windows librariesneeded for linux # also need portaudio library (which in turn needs pthreads) -PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread -+PLATFORM_LINK_FLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -pthread -lportaudio ++PLATFORM_LINK_FLAGS = -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -pthread -lportaudio # All platforms but OSX support g++ and need no linker hacks diff --git a/games/d2x/Makefile b/games/d2x/Makefile index b2d15dd..df9f5aa 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -25,9 +25,9 @@ PORTDOCS= README TODO NEWS AUTHORS readme.txt installation.txt PLIST_FILES= bin/d2x .ifdef(WITH_OPENGL) -USE_GL= yes +USE_GL= glut CONFIGURE_ARGS+=--with-opengl -CONFIGURE_ENV=LDFLAGS=-L${X11BASE}/lib CPPFLAGS=-I${X11BASE}/include +CONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include .endif pre-everything:: diff --git a/games/daimonin-client/Makefile b/games/daimonin-client/Makefile index a1f315b..c511d9a 100644 --- a/games/daimonin-client/Makefile +++ b/games/daimonin-client/Makefile @@ -7,10 +7,9 @@ PORTNAME= daimonin_client PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= daimonin +MASTER_SITES= SF/daimonin EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org @@ -20,7 +19,6 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX}/share CONFIGURE_ENV= CFLAGS="-pipe" USE_SDL= mixer image -USE_XLIB= yes SUB_FILES= daimonin.sh SUB_LIST= PORTVERSION=${PORTVERSION} PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile index a1f315b..c511d9a 100644 --- a/games/daimonin/Makefile +++ b/games/daimonin/Makefile @@ -7,10 +7,9 @@ PORTNAME= daimonin_client PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= daimonin +MASTER_SITES= SF/daimonin EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org @@ -20,7 +19,6 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX}/share CONFIGURE_ENV= CFLAGS="-pipe" USE_SDL= mixer image -USE_XLIB= yes SUB_FILES= daimonin.sh SUB_LIST= PORTVERSION=${PORTVERSION} PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile index c6da1bb..38a6ba8 100644 --- a/games/dangerdeep/Makefile +++ b/games/dangerdeep/Makefile @@ -43,6 +43,8 @@ SCONS_ARGS+= usex86sse=-1 # disable MMX/SSE on the build cluster post-patch: @${REINPLACE_CMD} -e 's|/usr/share/games/dangerdeep|${DATADIR}|; \ s|Linux|"Danger from the Deep"|' ${WRKSRC}/doc/man/dangerdeep.6 + @${REINPLACE_CMD} -e 's|/usr/X11BASE|${LOCALBASE}|g' \ + ${WRKSRC}/SConstruct do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS} diff --git a/games/deng/Makefile b/games/deng/Makefile index 87e9184..b67004d 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -19,11 +19,11 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity -USE_GL= yes +USE_GL= gl USE_LDCONFIG= yes USE_SDL= sdl mixer net GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ `${SDL_CONFIG} --cflags`" CONFIGURE_SCRIPT= ../configure CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} diff --git a/games/diameter/Makefile b/games/diameter/Makefile index a5e7039..9e37f7f 100644 --- a/games/diameter/Makefile +++ b/games/diameter/Makefile @@ -21,14 +21,14 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl mixer image USE_PYTHON= yes WRKSRC= ${WRKDIR}/gamediameter -CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \ - LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \ + LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib" DATADIR= ${PREFIX}/share/gamediameter diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile index 2fda9aa..7d4667c 100644 --- a/games/djgame2/Makefile +++ b/games/djgame2/Makefile @@ -45,9 +45,9 @@ post-patch: ${WRKSRC}/makelinux @${REINPLACE_CMD} -e 's|qmake|${QMAKE}|' \ ${WRKSRC}/makelinux - @${ECHO_CMD} "INCLUDEPATH += ${X11BASE}/include" \ + @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \ >> ${WRKSRC}/Base/Base.pro - @${ECHO_CMD} "INCLUDEPATH += ${X11BASE}/include" \ + @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \ >> ${WRKSRC}/Hall/Hall.pro @${CHMOD} a+x ${WRKSRC}/makelinux diff --git a/games/doom/Makefile b/games/doom/Makefile index ac5bdd2..b5706e1 100644 --- a/games/doom/Makefile +++ b/games/doom/Makefile @@ -7,10 +7,9 @@ PORTNAME= doom PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} -MASTER_SITE_SUBDIR= source +MASTER_SITES= SF/source DISTNAME= doomsrc MAINTAINER= jmz@FreeBSD.org @@ -21,8 +20,8 @@ NO_CDROM= requested by IDsoftware ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -USE_XLIB= yes USE_ZIP= yes +USE_XORG= x11 NO_WRKSUBDIR= yes DATADIR= ${DMDIR} @@ -35,7 +34,7 @@ post-patch: -E -e 's|#include +<malloc.h>|#include <stdlib.h>|g' do-build: - @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${X11BASE} + @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${LOCALBASE} @cd ${WRKDIR}/sndserv && ${GMAKE} do-install: diff --git a/games/doom/files/patch-ab b/games/doom/files/patch-ab index c5e6617..65a772b 100644 --- a/games/doom/files/patch-ab +++ b/games/doom/files/patch-ab @@ -11,8 +11,8 @@ -LDFLAGS=-L/usr/X11R6/lib -LIBS=-lXext -lX11 -lnsl -lm +CFLAGS?= -O -+CFLAGS+=-g -I${X11BASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM -+LDFLAGS=-L${X11BASE}/lib ++CFLAGS+=-g -I${LOCALBASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM ++LDFLAGS=-L${LOCALBASE}/lib +LIBS=-lXext -lX11 -lm # subdirectory for objects diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile index 7a3eea0..7d07fae 100644 --- a/games/doomlegacy/Makefile +++ b/games/doomlegacy/Makefile @@ -50,7 +50,7 @@ post-patch: 's|-I/usr/local/include/SDL11|`${SDL_CONFIG} --cflags`|; \ s|-lSDL-1\.1|`${SDL_CONFIG} --libs`|; \ s|/usr/local|${LOCALBASE}|; \ - s|/usr/X11R6|${X11BASE}|' \ + s|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/${MAKEFILE} pre-build: diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 21ea97b..bf4d08d 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -7,7 +7,7 @@ PORTNAME= dopewars PORTVERSION= 1.5.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF @@ -18,7 +18,6 @@ USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 -USE_X_PREFIX= yes CONFIGURE_ARGS= --enable-networking --disable-plugins --localstatedir=${DATADIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile index 28cb870..a971c01 100644 --- a/games/dsnake/Makefile +++ b/games/dsnake/Makefile @@ -21,7 +21,7 @@ RESTRICTED= Licence forbids any repacking and reselling ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/DeluxeSnake SUB_FILES= pkg-install pkg-deinstall diff --git a/games/duel/Makefile b/games/duel/Makefile index f91a9d3..19d8b09 100644 --- a/games/duel/Makefile +++ b/games/duel/Makefile @@ -16,16 +16,16 @@ DISTNAME= lin${PORTNAME} MAINTAINER= alepulver@FreeBSD.org COMMENT= An overhead, OpenGL space shooter -BUILD_DEPENDS= ${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl +BUILD_DEPENDS= ${LOCALBASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${X11BASE}/include -I${X11BASE}/include/FTGL" \ - LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL" \ + LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= ${PORTNAME}-sh diff --git a/games/eboard/Makefile b/games/eboard/Makefile index 0322e4b..a07f07d 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -24,8 +24,8 @@ USE_PERL5_BUILD=yes USE_GNOME= gtk20 CONFIGURE_ARGS= --prefix=${PREFIX} \ - --extra-inc=${LOCALBASE}/include:${X11BASE}/include \ - --extra-ld=${LOCALBASE}/lib:${X11BASE}/lib \ + --extra-inc=${LOCALBASE}/include \ + --extra-ld=${LOCALBASE}/lib \ --disable-dgt INSTALL_TARGET= install install-man diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 7dadaa8..bd2298c 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -16,7 +16,7 @@ COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke USE_ZIP= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_GNOME= gtk20 USE_SDL= mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME} @@ -42,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -Ee \ 's|^(CC=).*|\1${CC}|; \ s|^(CXX=).*|\1${CXX}|; \ - s|/usr/X11R6|${X11BASE}|; \ + s|/usr/X11R6|${LOCALBASE}|; \ s|sdl-config|${SDL_CONFIG}|' \ ${WRKSRC}/Makefile \ ${WRKSRC}/../build/Makefile \ diff --git a/games/egl/files/patch-makefile b/games/egl/files/patch-makefile index 50fdb2e..54716e5 100644 --- a/games/egl/files/patch-makefile +++ b/games/egl/files/patch-makefile @@ -57,9 +57,9 @@ + +ifeq ($(OSTYPE),FreeBSD) +# These variables are defined from the port, and passed by the environment. -+SHARED_FLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include \ ++SHARED_FLAGS+= -I$(LOCALBASE)/include \ + -DDATADIR='\"$(Q2DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -+LDFLAGS+= -L$(LOCALBASE)/lib -L$(X11BASE)/lib ++LDFLAGS+= -L$(LOCALBASE)/lib +X11_LDFLAGS+= $(PTHREAD_LIBS) +endif @@ -87,13 +87,13 @@ +SHARED_FLAGS += -DHOMEDIR +endif + -+ifeq ($(wildcard $(X11BASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) ++ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) SHARED_FLAGS += -DXF86VMODE X11_LDFLAGS += -lXxf86vm endif -ifeq ($(wildcard /usr/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) -+ifeq ($(wildcard $(X11BASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) ++ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) SHARED_FLAGS += -DXF86DGA X11_LDFLAGS += -lXxf86dga endif diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg index 281882f..3a5baed 100644 --- a/games/el/files/patch-Makefile.bsdg +++ b/games/el/files/patch-Makefile.bsdg @@ -15,7 +15,7 @@ -PLATFORM=-march=i686 -XDIR=-L/usr/X11R6/lib -+XDIR=-L$(X11BASE)/lib -L$(LOCALBASE)/lib ++XDIR=-L$(LOCALBASE)/lib CWARN= #-Wdeclaration-after-statement -Wall -Werror CPPWARN= @@ -28,7 +28,7 @@ -_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) +CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/ +_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -+CXXFLAGS+=-I$(LOCALBASE)/include -I$(X11BASE)/include $(OPTIONS) ++CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS) +_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) -LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng diff --git a/games/ember/Makefile b/games/ember/Makefile index fe8597b..8020a28 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -9,7 +9,7 @@ PORTNAME= ember PORTVERSION= 0.5.1 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://amber.worldforge.org/ember/releases/stable/ MASTER_SITE_SUBDIR=worldforge DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ @@ -49,9 +49,9 @@ post-patch: @${REINPLACE_CMD} -e '\ s|sdl-config|${SDL_CONFIG}|g; \ s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \ - s|-lGL|-L${X11BASE}/lib -lGL|g' \ + s|-lGL|-L${LOCALBASE}/lib -lGL|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|^CFLAGS =.*|& $${SDL_CFLAGS} -I${X11BASE}/include|g' \ + @${REINPLACE_CMD} -e 's|^CFLAGS =.*|& $${SDL_CFLAGS} -I${LOCALBASE}/include|g' \ ${WRKSRC}/src/framework/Makefile.in @${REINPLACE_CMD} -e 's|<SDL/|<|g' \ ${WRKSRC}/src/components/ogre/OgreSetup.cpp \ diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 3ef3875..9631324 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --target="" \ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR} -CXXFLAGS= -I${X11BASE}/include ${PTHREAD_CFLAGS} +CXXFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR} ${PTHREAD_LIBS} MAN6= enigma.6 diff --git a/games/ensemblist/files/patch-Makefile b/games/ensemblist/files/patch-Makefile index 16bb158..753d85f 100644 --- a/games/ensemblist/files/patch-Makefile +++ b/games/ensemblist/files/patch-Makefile @@ -6,8 +6,8 @@ DATADIR=$(DESTDIR)/usr/share/$(NAME) -COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR) -LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -+COMPILE_FLAGS=$(CFLAGS) -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include `$(LOCALBASE)/bin/libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR) $(PTHREAD_CFLAGS) -+LINK_FLAGS=-lm -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lXmu -lGL -lglut -lGLU -lpng `$(LOCALBASE)/bin/libmikmod-config --libs` $(PTHREAD_LIBS) ++COMPILE_FLAGS=$(CFLAGS) -Wall -I$(LOCALBASE)/include -I$(LOCALBASE)/include `$(LOCALBASE)/bin/libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR) $(PTHREAD_CFLAGS) ++LINK_FLAGS=-lm -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lXmu -lGL -lglut -lGLU -lpng `$(LOCALBASE)/bin/libmikmod-config --libs` $(PTHREAD_LIBS) endif APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL #uncomment the following if you want to compile on MacOS/X diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile index 3f74d42..030acbd 100644 --- a/games/etuxracer/Makefile +++ b/games/etuxracer/Makefile @@ -9,8 +9,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=tuxracer +MASTER_SITES= SF/tuxracer DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ ${PORTNAME}-data-${PORTVERSION}.tar.gz @@ -20,7 +19,7 @@ COMMENT= A 3d penguin racing game using OpenGL LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:261 AUTOMAKE_ARGS= -a @@ -28,8 +27,8 @@ CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}" MAKE_ENV= ${CONFIGURE_ENV} CONFIGURE_ARGS= --with-tcl-inc="${LOCALBASE}/include/tcl8.3" \ --with-tcl-libs="${LOCALBASE}/lib" \ - --with-gl-libs="${X11BASE}/lib" \ - --with-gl-inc="${X11BASE}/include" \ + --with-gl-libs="${LOCALBASE}/lib" \ + --with-gl-inc="${LOCALBASE}/include" \ --with-data-dir=${PREFIX}/share/tuxracer WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION} diff --git a/games/evq3/Makefile b/games/evq3/Makefile index 80ac2e5..76fa680 100644 --- a/games/evq3/Makefile +++ b/games/evq3/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_ZIP= yes USE_DOS2UNIX= yes -USE_GL= yes +USE_GL= gl USE_XORG= xxf86dga USE_SCONS= yes SCONS_ARGS= warnings=0 @@ -63,8 +63,8 @@ PLIST_SUB+= GAMELIBS="@comment " .if defined(WITH_LUA) USE_LUA= 5.0 SCONS_ARGS+= lua=1 -CPPPATH= ${LOCALBASE}/include ${X11BASE}/include ${LUA_INCDIR} -LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib ${LUA_LIBDIR} +CPPPATH= ${LOCALBASE}/include ${LUA_INCDIR} +LIBPATH= ${LOCALBASE}/lib ${LUA_LIBDIR} .endif .if defined(WITHOUT_OPTIMIZED_CFLAGS) diff --git a/games/excido/files/patch-Makefile b/games/excido/files/patch-Makefile index 5131416..bfd0bbf 100644 --- a/games/excido/files/patch-Makefile +++ b/games/excido/files/patch-Makefile @@ -4,10 +4,10 @@ -CC=g++ -CFLAGS=`sdl-config --cflags` #-g -Wall #-O2 -#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2 -+CXXFLAGS += -I${X11BASE}/include `${SDL_CONFIG} --cflags` ++CXXFLAGS += -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}} -LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU -+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU ++LIBS = -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU -PREFIX=/usr/local BINDIR=$(PREFIX)/bin/ diff --git a/games/exult/Makefile b/games/exult/Makefile index 14cbadc..4f559b5 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -7,10 +7,9 @@ PORTNAME= exult PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Ultima VII engine @@ -18,7 +17,6 @@ COMMENT= Ultima VII engine BUILD_DEPENDS= timidity:${PORTSDIR}/audio/timidity RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity -USE_XLIB= yes USE_SDL= sdl mixer USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 @@ -33,7 +31,7 @@ SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|desktop||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/games/ezquake/files/patch-Makefile b/games/ezquake/files/patch-Makefile index e2de786..4a52f6e 100644 --- a/games/ezquake/files/patch-Makefile +++ b/games/ezquake/files/patch-Makefile @@ -84,4 +84,4 @@ +GL_LIBS = -ljpeg ifeq ($(OS),freebsd) - X11BASE ?= /usr/X11R6 + LOCALBASE ?= /usr/X11R6 diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile index cd02f52..a02d4c0 100644 --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -9,8 +9,7 @@ PORTNAME= falconseye PORTVERSION= 1.9.3 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= falconseye +MASTER_SITES= SF/falconseye DISTNAME= nethack_source_331_jtp_${PORTVERSION:S/.//g} MAINTAINER= kris@FreeBSD.org @@ -25,7 +24,7 @@ USE_SDL= sdl USE_PERL5_BUILD=yes USE_ZIP= yes USE_XORG= x11 xpm xaw -MAKE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" X11BASE="${X11BASE}" +MAKE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" WRKSRC= ${WRKDIR} post-patch: diff --git a/games/falconseye/files/patch-sys_unix_Makefile_src b/games/falconseye/files/patch-sys_unix_Makefile_src index 0a5f9aa..c29bd48 100644 --- a/games/falconseye/files/patch-sys_unix_Makefile_src +++ b/games/falconseye/files/patch-sys_unix_Makefile_src @@ -14,8 +14,8 @@ # compile normally -CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include -LFLAGS = -L/usr/X11/lib -+CFLAGS += -I../include -I${X11BASE}/include -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -+LFLAGS = -L${X11BASE}/lib ++CFLAGS += -I../include -I${LOCALBASE}/include -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H ++LFLAGS = -L${LOCALBASE}/lib # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include # LFLAGS = -b i486-linuxaout -L/usr/X11/lib diff --git a/games/falconseye/files/x-config b/games/falconseye/files/x-config index ad90b1f..acfae43 100644 --- a/games/falconseye/files/x-config +++ b/games/falconseye/files/x-config @@ -1,6 +1,6 @@ VARDATND = x11tiles pet_mark.xbm rip.xpm -CFLAGS+=-DX11_GRAPHICS -I${X11BASE}/include -LFLAGS =-L${X11BASE}/lib +CFLAGS+=-DX11_GRAPHICS -I${LOCALBASE}/include +LFLAGS =-L${LOCALBASE}/lib WINSRC = $(WINTTYSRC) $(WINX11SRC) WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile index 068873e..c6b1056 100644 --- a/games/fgfs-base/Makefile +++ b/games/fgfs-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= fgfs-base PORTVERSION= 0.9.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \ ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ @@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \ MAINTAINER= jylefort@FreeBSD.org COMMENT= FlightGear scenery, textures and aircraft models -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB NO_BUILD= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/data diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile index 2073e04..2252dd2 100644 --- a/games/fgsd/Makefile +++ b/games/fgsd/Makefile @@ -9,16 +9,15 @@ PORTNAME= fgsd DISTVERSION= 0.3.1a PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= jylefort@FreeBSD.org COMMENT= A scenery designer for the FlightGear flight simulator -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear -RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear +RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \ flu:${PORTSDIR}/x11-toolkits/flu \ ungif:${PORTSDIR}/graphics/libungif \ @@ -26,12 +25,11 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \ CGAL:${PORTSDIR}/math/cgal \ jpeg:${PORTSDIR}/graphics/jpeg \ png:${PORTSDIR}/graphics/png \ - glut:${PORTSDIR}/graphics/libglut -USE_GL= yes +USE_GL= glut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib" PLIST_FILES= bin/fgsd share/pixmaps/fgsd.xpm DESKTOP_ENTRIES="FlightGear Scenery Designer" \ diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index a280db4..959a448 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -7,7 +7,7 @@ PORTNAME= fkiss PORTVERSION= 0.33a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.oersted.co.jp/~yav/soft/fkiss/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/a//} @@ -21,7 +21,7 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha NOT_FOR_ARCHS= alpha -USE_XLIB= yes +USE_XORG= x11 xproto WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile index b2d3c5d..bbd825f 100644 --- a/games/flightgear-aircraft/Makefile +++ b/games/flightgear-aircraft/Makefile @@ -7,7 +7,7 @@ PORTNAME= flightgear-aircrafts PORTVERSION= 20060812 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \ ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \ @@ -86,9 +86,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= jylefort@FreeBSD.org COMMENT= Additional aircrafts for the FlightGear flight simulator -RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base +RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/flightgear-aircrafts/Makefile b/games/flightgear-aircrafts/Makefile index b2d3c5d..bbd825f 100644 --- a/games/flightgear-aircrafts/Makefile +++ b/games/flightgear-aircrafts/Makefile @@ -7,7 +7,7 @@ PORTNAME= flightgear-aircrafts PORTVERSION= 20060812 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \ ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \ @@ -86,9 +86,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= jylefort@FreeBSD.org COMMENT= Additional aircrafts for the FlightGear flight simulator -RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base +RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile index f073c34..efbc812 100644 --- a/games/flightgear-atlas/Makefile +++ b/games/flightgear-atlas/Makefile @@ -9,36 +9,35 @@ PORTNAME= flightgear-atlas PORTVERSION= 0.3.0 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= atlas +MASTER_SITES= SF/atlas DISTNAME= Atlas-${PORTVERSION} MAINTAINER= jylefort@FreeBSD.org COMMENT= A map viewer for use with the FlightGear flight simulator -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ glut.4:${PORTSDIR}/graphics/libglut -RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \ - ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base +RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \ + ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base GNU_CONFIGURE= yes USE_GL= yes -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-fgbase="${X11BASE}/share/FlightGear" +CONFIGURE_ARGS= --with-fgbase="${LOCALBASE}/share/FlightGear" post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/src/Makefile.in post-install: - ${INSTALL_DATA} ${WRKSRC}/src/AtlasPalette ${X11BASE}/share/FlightGear + ${INSTALL_DATA} ${WRKSRC}/src/AtlasPalette ${LOCALBASE}/share/FlightGear @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/flightgear-atlas/pkg-plist b/games/flightgear-atlas/pkg-plist index bcde4d7..d7a1656 100644 --- a/games/flightgear-atlas/pkg-plist +++ b/games/flightgear-atlas/pkg-plist @@ -2,5 +2,4 @@ bin/Atlas bin/Map bin/MapPS bin/buildmaps.sh -@cwd %%X11BASE%% share/FlightGear/AtlasPalette diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 068873e..c6b1056 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -7,7 +7,7 @@ PORTNAME= fgfs-base PORTVERSION= 0.9.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \ ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ @@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \ MAINTAINER= jylefort@FreeBSD.org COMMENT= FlightGear scenery, textures and aircraft models -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB NO_BUILD= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/data diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile index 459739c..89ba82f 100644 --- a/games/flightgear-mb339-pan/Makefile +++ b/games/flightgear-mb339-pan/Makefile @@ -7,6 +7,7 @@ PORTNAME= flightgear-mb339-pan PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://hcilab.uniud.it/pan/downloads/ DISTNAME= MB339-PAN @@ -14,11 +15,10 @@ DISTNAME= MB339-PAN MAINTAINER= jylefort@FreeBSD.org COMMENT= A simulation of the MB-339 PAN aerobatic jet -RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base +RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base BROKEN= Size mismatch -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 600d737..67b007d 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -18,20 +18,20 @@ COMMENT?= The FlightGear flight simulator LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut \ openal.0:${PORTSDIR}/audio/openal -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear -RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ - ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \ - ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear +RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ + ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \ + ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base FGVERSION= 0.9.10 -USE_GL= yes +USE_GL= gl USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --datadir=${X11BASE}/share # location of fgfs-base +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --datadir=${LOCALBASE}/share # location of fgfs-base CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if ${PORTNAME} == FlightGear diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 18614aa..839558a 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -28,9 +28,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_XORG= xaw ice -CPPFLAGS= -I${X11BASE}/include -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib" .if defined(WITH_SDL) USE_SDL= yes diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 9013527..94716b0 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -38,7 +38,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ ggz-gtk.1:${PORTSDIR}/games/ggz-gtk-client \ ggzcore.9:${PORTSDIR}/games/ggz-client-libs \ ggzmod.5:${PORTSDIR}/games/ggz-client-libs -USE_XPM= yes +USE_XORG= xpm USE_SDL= mixer USE_GNOME= gtk20 CONFIGURE_ARGS+=--enable-client=gtk diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 5e994b1..5447a76 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -7,7 +7,7 @@ PORTNAME= freesci PORTVERSION= 0.3.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games emulators MASTER_SITES= http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \ http://teksolv.de/~jameson/ @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A portable interpreter for SCI games, such as the Space Quest series USE_BZIP2= yes -USE_XLIB= yes GNU_CONFIGURE= yes WANT_SDL= yes INSTALLS_ICONS= yes diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile index 461eca7..5e91fe3 100644 --- a/games/fuhquake/Makefile +++ b/games/fuhquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuhquake PORTVERSION= 0.31 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \ ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \ @@ -69,14 +69,14 @@ MAKE_ARGS+= -DWITHOUT_${f} .endfor .if defined(WITH_X11) -USE_XLIB= yes +USE_XORG= x11 xxf86dga PLIST_SUB+= X11="" CLIENTS+= x11 .else PLIST_SUB+= X11="@comment " .endif -.if (defined(WITH_XMMS) || exists(${X11BASE}/lib/libxmms.so.4)) && \ +.if (defined(WITH_XMMS) || exists(${LOCALBASE}/lib/libxmms.so.4)) && \ defined(CLIENTS) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms MAKE_ARGS+= -DWITH_XMMS \ diff --git a/games/fuhquake/files/Makefile b/games/fuhquake/files/Makefile index e1bb027..c9d31b2 100644 --- a/games/fuhquake/files/Makefile +++ b/games/fuhquake/files/Makefile @@ -11,7 +11,7 @@ # $FreeBSD$ # -DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${X11BASE}/include -DDATADIR='"${DATADIR}"' -DX11BASE='"${X11BASE}"' +DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${LOCALBASE}/include -DDATADIR='"${DATADIR}"' -DLOCALBASE='"${LOCALBASE}"' .if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) DO_CFLAGS += -Did386 @@ -28,7 +28,7 @@ DO_CFLAGS += -O -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpen .if defined(WITH_XMMS) XMMS_CFLAGS != glib-config --cflags DO_CFLAGS += -D__XMMS__ ${XMMS_CFLAGS} ${PTHREAD_CFLAGS} -XMMS_LIBS = -L${X11BASE}/lib -lxmms ${PTHREAD_LIBS} +XMMS_LIBS = -L${LOCALBASE}/lib -lxmms ${PTHREAD_LIBS} .endif ######################################################################## @@ -186,8 +186,8 @@ CL_GLX_OBJS = \ vid_glx.o CL_COMMON_LIBS = -lm -CL_X11_LIBS = -L${X11BASE}/lib -lX11 -lXext -CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${X11BASE}/lib -lGL -lXxf86dga -lXxf86vm +CL_X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext +CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lGL -lXxf86dga -lXxf86vm .c.o: ${CC} ${DO_CFLAGS} -c $< -o $*.o diff --git a/games/fuhquake/files/patch-mp3_player.c b/games/fuhquake/files/patch-mp3_player.c index 76f5918..93b58cb 100644 --- a/games/fuhquake/files/patch-mp3_player.c +++ b/games/fuhquake/files/patch-mp3_player.c @@ -8,7 +8,7 @@ #include <sys/wait.h> -cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"}; -+cvar_t mp3_dir = {"mp3_xmms_dir", X11BASE "/bin"}; ++cvar_t mp3_dir = {"mp3_xmms_dir", LOCALBASE "/bin"}; cvar_t mp3_xmms_session = {"mp3_xmms_session", "0"}; #endif diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile index fdaeb97..53b55e2 100644 --- a/games/galaxymage/Makefile +++ b/games/galaxymage/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco post-configure: @${REINPLACE_CMD} -e 's@%%DATADIR%%@${DATADIR}@g' ${WRKSRC}/GalaxyMage.py ${WRKSRC}/src/Resources.py - @${REINPLACE_CMD} -e 's@%%X11BASE%%@${X11BASE}@g' ${WRKSRC}/src/Translate.py + @${REINPLACE_CMD} -e 's@%%LOCALBASE%%@${LOCALBASE}@g' ${WRKSRC}/src/Translate.py do-install: @${INSTALL_SCRIPT} ${WRKSRC}/GalaxyMage.py ${PREFIX}/bin/GalaxyMage diff --git a/games/galaxymage/files/patch-src_Translate.py b/games/galaxymage/files/patch-src_Translate.py index dce3e47..f6d7d0e 100644 --- a/games/galaxymage/files/patch-src_Translate.py +++ b/games/galaxymage/files/patch-src_Translate.py @@ -5,7 +5,7 @@ def getLanguageDict(self,lang): - return gettext.translation('GalaxyMage',os.path.join(os.getcwd(),'locale'), languages=[lang]) -+ return gettext.translation('GalaxyMage',os.path.join('%%X11BASE%%/share/locale'), languages=[lang]) ++ return gettext.translation('GalaxyMage',os.path.join('%%LOCALBASE%%/share/locale'), languages=[lang]) def __init__(self): #fill our language dictionnary with each language diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index fd78e68..c14a23b 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -1,3 +1,4 @@ + # New ports collection makefile for: gcompris2 # Date created: 23 April 2003 # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> @@ -7,10 +8,9 @@ PORTNAME= gcompris DISTVERSION= 8.3.2-2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gcompris +MASTER_SITES= SF/gcompris MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome2 educational games and activities for kids ages 2 to 10 @@ -26,7 +26,6 @@ RUN_DEPENDS= gnuchess:${PORTSDIR}/games/gnuchess \ ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 WRKSRC= ${WRKDIR}/${PORTNAME}-8.3.2 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/games/geki2/Makefile b/games/geki2/Makefile index daaa559..dbf67d6 100644 --- a/games/geki2/Makefile +++ b/games/geki2/Makefile @@ -16,12 +16,9 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION} MAINTAINER= edwin@mavetju.org COMMENT= 2D length scroll shooting game -BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl -RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl +BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl +RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib - .include <bsd.port.mk> diff --git a/games/geki3/Makefile b/games/geki3/Makefile index 43fa1a2..484d231 100644 --- a/games/geki3/Makefile +++ b/games/geki3/Makefile @@ -16,12 +16,9 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION} MAINTAINER= edwin@mavetju.org COMMENT= 2D horizontal scroll shooting game -BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl -RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl +BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl +RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib - .include <bsd.port.mk> diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile index c16a042..5b0761e 100644 --- a/games/gemdropx/Makefile +++ b/games/gemdropx/Makefile @@ -7,7 +7,7 @@ PORTNAME= gemdropx PORTVERSION= 0.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/gemdropx/src/ @@ -16,7 +16,6 @@ COMMENT= An interesting one-player puzzle game for X USE_SDL= mixer USE_GMAKE= yes -USE_X_PREFIX= yes MAKE_ENV= JOY=NO \ SDL_CONFIG="${SDL_CONFIG}" diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile index 91a569b..49e1d8a 100644 --- a/games/ggz-sdl-games/Makefile +++ b/games/ggz-sdl-games/Makefile @@ -13,15 +13,15 @@ CATEGORIES= games MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= The GGZ Gaming Zone - SDL-based games -USE_GL= yes +USE_GL= gl USE_SDL= image mixer sdl ttf GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug USE_GGZ= client -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-install: ${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${PREFIX}/share/ggz/geekgame.dsc diff --git a/games/gillo/Makefile b/games/gillo/Makefile index b4b0e8e..c24ef87 100644 --- a/games/gillo/Makefile +++ b/games/gillo/Makefile @@ -9,19 +9,18 @@ PORTNAME= gillo DISTVERSION= 1.0beta1 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Players are cars throwing a magnetic fuzzy ball into a goal BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \ - ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode \ - ${X11BASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib + ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \ + ${LOCALBASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib USE_BZIP2= yes -USE_GL= yes +USE_GL= gl USE_SDL= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -35,7 +34,7 @@ post-patch: ${WRKSRC}/src/Jamfile do-build: - cd ${WRKSRC} && ${SETENV} "C++=${CC}" "X11BASE=${X11BASE}" \ + cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \ "CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \ ${JAM} -dx -sPREFIX=${PREFIX} diff --git a/games/gillo/files/patch-Jamrules b/games/gillo/files/patch-Jamrules index 195a5d6..e7e8e2c 100644 --- a/games/gillo/files/patch-Jamrules +++ b/games/gillo/files/patch-Jamrules @@ -8,7 +8,7 @@ -if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; } -else CCFLAGS += -O3 ; +CCFLAGS += $(CFLAGS) %%SDL_CFLAGS%% ; -+HDRS = $(X11BASE)/include ; ++HDRS = $(LOCALBASE)/include ; +#if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; } +#else CCFLAGS += -O3 ; C++FLAGS += $(CCFLAGS) ; diff --git a/games/gillo/files/patch-src_Jamfile b/games/gillo/files/patch-src_Jamfile index c81bffa..0b9f4e2 100644 --- a/games/gillo/files/patch-src_Jamfile +++ b/games/gillo/files/patch-src_Jamfile @@ -5,6 +5,6 @@ Main gillo3 : camera.cpp cameraball.cpp cameratrack.cpp car.cpp context.cpp cube.cpp entity.cpp event.cpp field.cpp game.cpp goal.cpp goalkeeper.cpp img.cpp main.cpp menu.cpp omnicar.cpp overlay.cpp player.cpp pwrup.cpp rect.cpp simpleball.cpp sound.cpp video.cpp viewport.cpp prefix.c iballpicker.cpp ; -LINKLIBS on gillo3 = -lpthread -lGL -lGLU -lSDL -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl ; -+LINKLIBS on gillo3 = -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(X11BASE)/lib %%SDL_LDFLAGS%% ; ++LINKLIBS on gillo3 = -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% ; InstallBin $(BINDIR) : gillo3$(SUFEXE) ; diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile index 8ee4bf9..f6159dc 100644 --- a/games/gl-117/Makefile +++ b/games/gl-117/Makefile @@ -10,22 +10,16 @@ PORTNAME= gl-117 PORTVERSION= 1.3.2 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTVERSIONSUFFIX= -src MAINTAINER= erik@smluc.org COMMENT= An OpenGL & SDL action flight simulator -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_SDL= mixer sdl -USE_GL= yes +USE_GL= glut USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-include=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ - --with-opengl-dir=${X11BASE} +CONFIGURE_ARGS= --with-opengl-dir=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile index 5c4e326..8fa2331 100644 --- a/games/glasteroids/Makefile +++ b/games/glasteroids/Makefile @@ -7,7 +7,7 @@ PORTNAME= glasteroids PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.honors.montana.edu/~jjc/Glasteroids/ DISTNAME= Glasteriods @@ -15,12 +15,9 @@ DISTNAME= Glasteriods MAINTAINER= ports@FreeBSD.org COMMENT= 3D Asteroids game for X Window System -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - WRKSRC= ${WRKDIR}/Glasteroids -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= glut MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" MAKEFILE= ${FILESDIR}/Makefile.FreeBSD diff --git a/games/glasteroids/files/Makefile.FreeBSD b/games/glasteroids/files/Makefile.FreeBSD index 73f971e..b023c00 100644 --- a/games/glasteroids/files/Makefile.FreeBSD +++ b/games/glasteroids/files/Makefile.FreeBSD @@ -10,8 +10,8 @@ PROG = Glasteroids LIBS = -lglut -lGLU -lGL -lXmu -lX11 -lXext -lm -lXi ${PTHREAD_LIBS} -INCDIR = -I${X11BASE}/include -LIBDIR = -L${X11BASE}/lib +INCDIR = -I${LOCALBASE}/include +LIBDIR = -L${LOCALBASE}/lib PREFIX ?= /usr/X11R6 X11BASE ?= /usr/X11R6 diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index ec386e4..926bcc0 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -30,7 +30,7 @@ MAN6= glaxium.6 USE_DOS2UNIX=variables.cpp scene.cpp post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/games/glaxium|/glaxium|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gcc -g -o|$$(CC) -o|g ; \ s|/games/glaxium|/glaxium|g' ${WRKSRC}/Makefile.in diff --git a/games/glbsp/files/patch-GUI_unx.mak b/games/glbsp/files/patch-GUI_unx.mak index c7eb739..12d06d0 100644 --- a/games/glbsp/files/patch-GUI_unx.mak +++ b/games/glbsp/files/patch-GUI_unx.mak @@ -7,7 +7,7 @@ -FLTK_PREFIX=../fltk-1.1.6 -FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib -FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \ -+FLTK_PREFIX=${X11BASE} ++FLTK_PREFIX=${LOCALBASE} +FLTK_CFLAGS=-I$(FLTK_PREFIX)/include +FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images \ -lfltk -lX11 -lXext @@ -20,7 +20,7 @@ +CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS) CXXFLAGS=$(CFLAGS) -LDFLAGS=-L/usr/X11R6/lib -+LDFLAGS=-L${X11BASE}/lib ++LDFLAGS=-L${LOCALBASE}/lib LIBS=-lm $(FLTK_LIBS) OBJS=$(SYSDIR)/main.o \ diff --git a/games/glife/Makefile b/games/glife/Makefile index 46f6c01..5beb993 100644 --- a/games/glife/Makefile +++ b/games/glife/Makefile @@ -7,16 +7,14 @@ PORTNAME= glife PORTVERSION= 0.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= gLife-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Conway's Game of Life for GNOME -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack libglade CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/glmaze/files/patch-Makefile b/games/glmaze/files/patch-Makefile index e6423f4..6d9e0ab 100644 --- a/games/glmaze/files/patch-Makefile +++ b/games/glmaze/files/patch-Makefile @@ -28,11 +28,11 @@ .c.o: - $(CC) -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) -I${X11BASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) -I${LOCALBASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $< glmaze: $(OBJECTS) - $(CC) $(OBJECTS) -o $@ $(SDL_LIBS) -lGL -lGLU -lm -+ $(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${X11BASE}/lib $(SDL_LIBS) -lGL -lGLU -lm ++ $(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${LOCALBASE}/lib $(SDL_LIBS) -lGL -lGLU -lm clean: @echo Cleaning up... diff --git a/games/glob2/Makefile b/games/glob2/Makefile index 9c8bee1..d1b548c 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -22,12 +22,12 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= image net sdl ttf -USE_GL= yes +USE_GL= gl USE_GMAKE= yes USE_SCONS= yes SCONS_BUILDENV= ${SCONS_ENV} -LINKFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include +LINKFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/games/glpuzzle/Makefile b/games/glpuzzle/Makefile index da193d0..aaac10f 100644 --- a/games/glpuzzle/Makefile +++ b/games/glpuzzle/Makefile @@ -20,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_SDL= sdl mixer -USE_GL= yes +USE_GL= gl USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" \ - CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \ - LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib" + CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \ + LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib" post-patch: .for i in font image puzzles sound diff --git a/games/gltron/Makefile b/games/gltron/Makefile index 2232542..a7ba939 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -9,8 +9,7 @@ PORTNAME= gltron PORTVERSION= 0.70 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= -source.tar.gz MAINTAINER= lx@FreeBSD.org @@ -18,7 +17,7 @@ COMMENT= A 3D worm game for two players for X Window System LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_GL= yes +USE_GL= gl USE_SDL= sdl sound USE_GMAKE= yes GNU_CONFIGURE= yes @@ -26,8 +25,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-warn -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if defined(WITH_SDL_NET) USE_SDL+= net diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile index 7752085..be3d075 100644 --- a/games/gnmm/Makefile +++ b/games/gnmm/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnmm PORTVERSION= 0.1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION} DIST_SUBDIR= gnome @@ -19,7 +18,6 @@ COMMENT= A "nine mens' morris" implementation for the GNOME Desktop Environment USE_GETTEXT= yes USE_ICONV= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index 6160023..6a1266e 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -7,7 +7,7 @@ PORTNAME= gno3dtet PORTVERSION= 1.96.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games gnome MASTER_SITES= http://eseb.net/ftp/gno3dtet/ EXTRACT_SUFX= .tgz @@ -17,7 +17,6 @@ COMMENT= GNOME version of the classic 3D-ified T*tris EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2 USE_GMAKE= yes USE_AUTOTOOLS= autoheader:261 automake:19 aclocal:19 autoconf:261 diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index 689969d..e1682a0 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-games-extra-data PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/sol:${PORTSDIR}/games/gnome-games USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gnomeprefix gnometarget CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index a8113c9..314e9c9 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-games PORTVERSION= 2.22.1.1 +PORTREVISION= 1 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +24,6 @@ USE_PYTHON= yes USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils pygnomedesktop gnomedocutils diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile index 05856f7..583f8c5 100644 --- a/games/gnomeattacks/Makefile +++ b/games/gnomeattacks/Makefile @@ -7,15 +7,13 @@ PORTNAME= gnomeattacks PORTVERSION= 0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= GNOME 2 game featuring a bizarre flying GNOME logo -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomevfs2 libgnomeui diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile index 5b94b6c..2c3a7c3 100644 --- a/games/gnomebreakout/Makefile +++ b/games/gnomebreakout/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomebreakout PORTVERSION= 0.5.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= http://www.users.on.net/~mipearson/ DISTNAME= gnome-breakout-${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= gnome-breakout-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME version of the classic breakout game -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile index 87a8c7c..554fbe8 100644 --- a/games/gnomechess/Makefile +++ b/games/gnomechess/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomechess PORTVERSION= 0.3.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-chess/0.3 @@ -19,7 +19,6 @@ COMMENT= A GUI chess front-end to crafy, for the GNOME Desktop Environment BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty -USE_X_PREFIX= yes USE_GNOME= gnomecanvas gnomehack gnomeprefix libglade USE_GMAKE= yes INSTALLS_OMF= yes diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile index 0f941b4..2d5030c 100644 --- a/games/gnomermind/Makefile +++ b/games/gnomermind/Makefile @@ -7,16 +7,14 @@ PORTNAME= gnomermind PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A puzzle game for Gnome, loosely based on the classic MasterMind game USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gdkpixbuf gnomehack gnomelibs gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile index 0493165..ade9d49 100644 --- a/games/gnomesudoku/Makefile +++ b/games/gnomesudoku/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnomesudoku PORTVERSION= 0.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnome-sudoku +MASTER_SITES= SF/gnome-sudoku DISTNAME= gnome-sudoku-${PORTVERSION} MAINTAINER= tg@FreeBSD.org @@ -21,13 +20,12 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric .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) MAKE_ENV+= DISPLAY="localhost:1001" .endif .endif -USE_X_PREFIX= yes USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes USE_GNOME= gnomehack gnomeprefix pygnome2 pygnomedesktop @@ -40,7 +38,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: @@ -54,7 +52,7 @@ pre-install: ${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-install: diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile index 40d3b6f..69a0b73 100644 --- a/games/gnurobots/Makefile +++ b/games/gnurobots/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnurobots PORTVERSION= 1.0D -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gnurobots @@ -18,8 +18,7 @@ COMMENT= GNU diversion wherein Scheme-coded robots explore a world LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile GNU_CONFIGURE= yes -USE_XPM= yes -USE_XLIB= yes +USE_XORG= x11 xpm pre-patch: ${CP} ${WRKSRC}/getopt/getopt.h ${WRKSRC}/include diff --git a/games/golddig/files/patch-ad b/games/golddig/files/patch-ad index cddd087..6efae3fb 100644 --- a/games/golddig/files/patch-ad +++ b/games/golddig/files/patch-ad @@ -29,10 +29,10 @@ #CFLAGS = -O2 #CFLAGS = -O -CFLAGS = -O -W -Wreturn-type -Wunused -g -finline-functions -+CFLAGS += -W -Wreturn-type -Wunused -finline-functions -I${X11BASE}/include ++CFLAGS += -W -Wreturn-type -Wunused -finline-functions -I${LOCALBASE}/include #CFLAGS = -g -LDFLAGS = -g -+LDFLAGS = -L ${X11BASE}/lib ++LDFLAGS = -L ${LOCALBASE}/lib all: ${GAME} ${EDITOR} diff --git a/games/goonies/files/patch-build-linux-Makefile b/games/goonies/files/patch-build-linux-Makefile index 4589a37..e4155eb 100644 --- a/games/goonies/files/patch-build-linux-Makefile +++ b/games/goonies/files/patch-build-linux-Makefile @@ -14,8 +14,8 @@ -CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` -I/usr/local/include/SDL -I/usr/X11R6/include -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU +CC ?= c++ -+CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${X11BASE}/include -+LDFLAGS += `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU ++CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include ++LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU RM = rm -f CP = cp -r LN = ln -s diff --git a/games/gracer/Makefile b/games/gracer/Makefile index 8c030e6..c226fca 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -9,28 +9,27 @@ PORTNAME= gracer PORTVERSION= 0.1.5 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= nox@FreeBSD.org COMMENT= A 3D motor sport simulator -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tcl82.1:${PORTSDIR}/lang/tcl82 \ - glut.4:${PORTSDIR}/graphics/libglut + tcl82.1:${PORTSDIR}/lang/tcl82 +USE_GL= glut USE_PERL5_BUILD=yes USE_AUTOTOOLS= autoconf:213 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tcl8.2 \ - -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib" USE_GMAKE= yes # for plib (sound): -CONFIGURE_ARGS+= --with-plib=${X11BASE}/plib +CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib MAN6= gracer.6 diff --git a/games/grande/Makefile b/games/grande/Makefile index ac521a3..c135de1f 100644 --- a/games/grande/Makefile +++ b/games/grande/Makefile @@ -7,7 +7,7 @@ PORTNAME= grande PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://kxl.orz.hm/download/ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION} @@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A Zanac type game -BUILD_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl -RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl +BUILD_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl +RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl NO_CDROM= Possible copyright infringement -USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/games/gretools/Makefile b/games/gretools/Makefile index 9fa431a..4567777 100644 --- a/games/gretools/Makefile +++ b/games/gretools/Makefile @@ -7,7 +7,7 @@ PORTNAME= gretools PORTVERSION= 1.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION:R} @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME vocabulary builder -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget pygnome2 USE_PYTHON= yes USE_GMAKE= yes diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index 9525f08..43cb696 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -6,7 +6,7 @@ PORTNAME= gtetrinet PORTVERSION= 0.7.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games gnome ipv6 MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -17,7 +17,6 @@ COMMENT= A version of the popular TetriNET multiplayer tetris clone USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= esound gnomehack gnomeprefix gnometarget libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile index ac84548..8509302 100644 --- a/games/gtkabale/Makefile +++ b/games/gtkabale/Makefile @@ -7,14 +7,13 @@ PORTNAME= gtkabale PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A lazy version of solitaire game -USE_X_PREFIX= yes USE_GNOME= imlib GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile index a0d5c36..511828e 100644 --- a/games/gtkatlantic/Makefile +++ b/games/gtkatlantic/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkatlantic PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://gtkatlantic.gradator.net/downloads/v0.4/ @@ -18,7 +18,6 @@ USE_BZIP2= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile index 32012f3..369d65b 100644 --- a/games/gtkpool/Makefile +++ b/games/gtkpool/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkpool PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://gtkpool.seul.org/ @@ -16,7 +16,6 @@ COMMENT= A 2D pool game using the GTK+ toolkit GNU_CONFIGURE= yes USE_GNOME= gtk12 -USE_X_PREFIX= yes post-patch: @${REINPLACE_CMD} -e 's,-O2 -O0 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11,${CXXFLAGS} `gtk-config --cflags` `gtk-config --libs`,' ${WRKSRC}/configure diff --git a/games/gtkradiant/files/patch-SConstruct b/games/gtkradiant/files/patch-SConstruct index 8e8575e..fa6ddeb 100644 --- a/games/gtkradiant/files/patch-SConstruct +++ b/games/gtkradiant/files/patch-SConstruct @@ -13,7 +13,7 @@ # there is a default hardcoded value, you can override on command line, those are saved between runs # we only handle strings -serialized=['CC', 'CXX', 'JOBS', 'BUILD', 'SETUP'] -+serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'X11BASE', 'JOBS', 'BUILD', 'SETUP'] ++serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'LOCALBASE', 'JOBS', 'BUILD', 'SETUP'] # help ------------------------------------------- @@ -60,8 +60,8 @@ + CCFLAGS += '-fPIC ' + CXXFLAGS += '-fPIC ' + CPPPATH.append(LOCALBASE + '/include') -+ CPPPATH.append(X11BASE + '/include') -+ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + X11BASE + '/lib ' ++ CPPPATH.append(LOCALBASE + '/include') ++ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + LOCALBASE + '/lib ' CPPPATH.append('libs') diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile index e231c90..ef3ed12 100644 --- a/games/gtktetcolor/Makefile +++ b/games/gtktetcolor/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtktetcolor PORTVERSION= 0.6.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_SUNSITE} \ http://www.dvgu.ru/ifit/~panov/gtktetcolor/ @@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= games MAINTAINER= ports@FreeBSD.org COMMENT= A game for GNOME that resembles well-known tetris and columns -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/games/gturing/Makefile b/games/gturing/Makefile index ed65b75..3ec9059 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -7,14 +7,13 @@ PORTNAME= gturing PORTVERSION= 0.1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games gnome MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/ MAINTAINER= ports@FreeBSD.org COMMENT= A simple turing machine simulator for GNOME 2 -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/games/gweled/Makefile b/games/gweled/Makefile index 4eb3d7f..7923084 100644 --- a/games/gweled/Makefile +++ b/games/gweled/Makefile @@ -7,7 +7,7 @@ PORTNAME= gweled PORTVERSION= 0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games gnome MASTER_SITES= http://sebdelestaing.free.fr/gweled/Release/ @@ -16,7 +16,6 @@ COMMENT= GNOME version of the game called "Bejeweled" or "Diamond Mine" LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui librsvg2 GNU_CONFIGURE= yes diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-aa index a15e20f..8792e86 100644 --- a/games/heretic/files/patch-aa +++ b/games/heretic/files/patch-aa @@ -53,7 +53,7 @@ -CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ - -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) +CFLAGS += $(CDEFS.udp) $(COPT.arch) \ -+ -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) ++ -I. -I.. -I${LOCALBASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) # Uncomment the line below if you want to use original "[" and "]" keys # for inventory access, instead of "k" and "l". @@ -68,7 +68,7 @@ endif -X_LDFLAGS = -L/usr/X11R6/lib -+X_LDFLAGS = -L${X11BASE}/lib ++X_LDFLAGS = -L${LOCALBASE}/lib X11LIBS = -lXext -lX11 -GLLIBS = -lSDL -lpthread diff --git a/games/heroes/Makefile b/games/heroes/Makefile index 6ae0039..251a20c 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -7,7 +7,7 @@ PORTNAME= heroes PORTVERSION= 0.21 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ @@ -30,7 +30,6 @@ DATASRC= ${WRKDIR}/${DATADISTNAME} SOUNDSRC= ${WRKDIR}/${SOUNDISTNAME} MUSICSRC= ${WRKDIR}/${MUSICDISTNAME} -USE_X_PREFIX= yes USE_SDL= mixer sdl USE_GMAKE= yes USE_ICONV= yes diff --git a/games/hex/Makefile b/games/hex/Makefile index fd6269b..e4f4d2e 100644 --- a/games/hex/Makefile +++ b/games/hex/Makefile @@ -7,14 +7,13 @@ PORTNAME= hex PORTVERSION= 0.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.earth.li/projectpurple/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Clone of "Puzzle Bobble" for X11 that uses GTK/Imlib -USE_X_PREFIX= yes USE_GNOME= imlib MAKE_ENV= GRAPHICPATH="${GRAPHICPATH}" LEVELPATH="${LEVELPATH}" diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile index 8a0d67a..d3a4f72 100644 --- a/games/hexxagon/Makefile +++ b/games/hexxagon/Makefile @@ -7,7 +7,7 @@ PORTNAME= hexxagon PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/ @@ -18,7 +18,6 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes GNU_CONFIGURE= yes DESKTOP_ENTRIES="Hexxagon" "Strategy Game" "" \ diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile index 838a8ec..e7ead06 100644 --- a/games/hohlin/Makefile +++ b/games/hohlin/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/hoh-install-${PORTVERSION}/ USE_BZIP2= YES USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/} diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile index 82547fb..ee44b33 100644 --- a/games/icbm3d/Makefile +++ b/games/icbm3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= icbm3d PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/icbm3d/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= "Inter-Continental Ballistic Missiles, 3D" - 3D game of defense WRKSRC= ${WRKDIR}/icbm3d -USE_X_PREFIX= yes +USE_XORG= x11 MAKEFILE= makefile ALL_TARGET= icbm3d diff --git a/games/icbm3d/files/patch-aa b/games/icbm3d/files/patch-aa index 1d20749..b9f9350 100644 --- a/games/icbm3d/files/patch-aa +++ b/games/icbm3d/files/patch-aa @@ -7,7 +7,7 @@ -CC=gcc +CC?=gcc +PREFIX?=/usr/X11R6 -+X11BASE?=/usr/X11R6 ++LOCALBASE?=/usr/X11R6 MATHLIB=-lm INSTALLROOT=$(PREFIX) @@ -15,8 +15,8 @@ -XLIB=-L$(PREFIX)/lib -lX11 #-lcompat -CFLAGS=-I$(PREFIX)/include -O2 -+XLIB=-L$(X11BASE)/lib -lX11 #-lcompat -+CFLAGS+=-I$(X11BASE)/include ++XLIB=-L$(LOCALBASE)/lib -lX11 #-lcompat ++CFLAGS+=-I$(LOCALBASE)/include # End of makefile user-definable variables----------------------------------- diff --git a/games/imaze/Makefile b/games/imaze/Makefile index 5bbeb5a..ce62776 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -7,7 +7,7 @@ PORTNAME= imaze PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://home.tu-clausthal.de/student/iMaze/files/ PKGNAMESUFFIX= -${TOOLKIT} @@ -25,9 +25,8 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview TOOLKIT= xview .endif -USE_X_PREFIX= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= ${TOOLKIT} X11Dir=${X11BASE} CFlags="${CFLAGS}" +CONFIGURE_ARGS= ${TOOLKIT} X11Dir=${LOCALBASE} CFlags="${CFLAGS}" CONFIGURE_WRKSRC=${WRKSRC}/source BUILD_WRKSRC= ${WRKSRC}/source MAKE_ENV= SOUNDDIR=${SOUNDDIR} diff --git a/games/ioquake3/files/patch-Makefile b/games/ioquake3/files/patch-Makefile index f1123b4b..30b4fbf 100644 --- a/games/ioquake3/files/patch-Makefile +++ b/games/ioquake3/files/patch-Makefile @@ -107,7 +107,7 @@ + BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -DLIBDIR='\"$(LIBDIR)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - GL_CFLAGS = -I/usr/X11R6/include -+ GL_CFLAGS = -I$(X11BASE)/include ++ GL_CFLAGS = -I$(LOCALBASE)/include DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe @@ -188,7 +188,7 @@ + endif + + ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ifeq ($(USE_OPENAL),1) diff --git a/games/iourbanterror/files/patch-Makefile b/games/iourbanterror/files/patch-Makefile index 1efcfda..b71f958 100644 --- a/games/iourbanterror/files/patch-Makefile +++ b/games/iourbanterror/files/patch-Makefile @@ -213,7 +213,7 @@ + endif + + ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ifeq ($(USE_OPENAL),1) diff --git a/games/jfduke3d/Makefile b/games/jfduke3d/Makefile index f4a1705..8d0e2ca 100644 --- a/games/jfduke3d/Makefile +++ b/games/jfduke3d/Makefile @@ -24,9 +24,8 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= uses x86 assembly code USE_ZIP= yes -USE_GCC= 3.2+ USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_GNOME= gtk20 USE_SDL= mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION} @@ -38,7 +37,7 @@ post-patch: s|^(CC=).*|\1${CC}|; \ s|^(CFLAGS=).*|\1${CFLAGS}|; \ s|^(NASMFLAGS=).*|\1 -s -f elf|; \ - s|/usr/X11R6|${X11BASE}|; \ + s|/usr/X11R6|${LOCALBASE}|; \ s|sdl-config|${SDL_CONFIG}|' \ ${WRKSRC}/Makefile \ ${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile \ diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile index da193d0..aaac10f 100644 --- a/games/jigzo/Makefile +++ b/games/jigzo/Makefile @@ -20,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_SDL= sdl mixer -USE_GL= yes +USE_GL= gl USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" \ - CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \ - LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib" + CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \ + LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib" post-patch: .for i in font image puzzles sound diff --git a/games/joequake/files/patch-Makefile.linux b/games/joequake/files/patch-Makefile.linux index be4c3e0..199e157 100644 --- a/games/joequake/files/patch-Makefile.linux +++ b/games/joequake/files/patch-Makefile.linux @@ -14,7 +14,7 @@ +CC ?= gcc +#_E := @ +LOCALBASE ?= /usr/local -+X11BASE ?= /usr/X11R6 ++LOCALBASE ?= /usr/X11R6 +USE_OPTIMIZED_CFLAGS ?= YES -default_target: glx @@ -63,7 +63,7 @@ GLX_CFLAGS := $(CFLAGS) \ - -DGLQUAKE -I/usr/X11R6/include -+ -DGLQUAKE -I$(X11BASE)/include ++ -DGLQUAKE -I$(LOCALBASE)/include + +ifeq ($(strip $(USE_X86_ASM)),YES) +GLX_CFLAGS += -Did386 @@ -73,7 +73,7 @@ - -lGL -L/usr/X11R6/lib -lX11 \ - -lXext -lXxf86dga -lXxf86vm \ - -lpng -ljpeg -+ -L$(X11BASE)/lib -lGL -lX11 \ ++ -L$(LOCALBASE)/lib -lGL -lX11 \ + -lXext -lXxf86dga -lXxf86vm \ + -L$(LOCALBASE)/lib -lpng -ljpeg @@ -96,7 +96,7 @@ X11_S_OBJS := $(addprefix $(X11_DIR)/, $(addsuffix .o, $(X11_S_FILES))) -X11_CFLAGS := $(CFLAGS) -+X11_CFLAGS := $(CFLAGS) -I$(X11BASE)/include ++X11_CFLAGS := $(CFLAGS) -I$(LOCALBASE)/include + +ifeq ($(strip $(USE_X86_ASM)),YES) +X11_CFLAGS += -Did386 @@ -105,7 +105,7 @@ X11_LDFLAGS := $(LDFLAGS) \ - -L/usr/X11R6/lib -lX11 -lXext \ - -lpng -+ -L$(X11BASE)/lib -lX11 -lXext \ ++ -L$(LOCALBASE)/lib -lX11 -lXext \ + -L$(LOCALBASE)/lib -lpng x11: _DIR := $(X11_DIR) @@ -120,7 +120,7 @@ SVGA_LDFLAGS := $(LDFLAGS) \ - -L/usr/X11R6/lib -lX11 -lpthread \ - -lvga -lpng -+ -L$(X11BASE)/lib -lX11 -lpthread \ ++ -L$(LOCALBASE)/lib -lX11 -lpthread \ + -L$(LOCALBASE)/lib -lvga -lpng +ifeq ($(OSTYPE),Linux) diff --git a/games/kiki/Makefile b/games/kiki/Makefile index e21fd3c..7287606 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -9,8 +9,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src EXTRACT_SUFX= .tgz @@ -21,23 +20,22 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut USE_PYTHON= 2.3 USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl mixer image USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h -USE_GCC= 3.4+ MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" WRKSRC= ${WRKDIR}/kiki post-patch: - @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${X11BASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile - @${REINPLACE_CMD} -e '/^X11_INCLUDES/ s|/.*/|${X11BASE}/include|' ${WRKSRC}/linux/Makefile + @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile + @${REINPLACE_CMD} -e '/^X11_INCLUDES/ s|/.*/|${LOCALBASE}/include|' ${WRKSRC}/linux/Makefile @${REINPLACE_CMD} -e '/PYTHON/ s|/usr|${LOCALBASE}|' ${WRKSRC}/linux/Makefile @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/linux/Makefile @${REINPLACE_CMD} -e 's|CXXFLAGS =|CXXFLAGS +=|' ${WRKSRC}/linux/Makefile @${REINPLACE_CMD} -e 's|PYTHON_VERSION|PYTHON_VER|' ${WRKSRC}/linux/Makefile - @${REINPLACE_CMD} -e '/^GLLIBS/ s|$$| -L${X11BASE}/lib|' ${WRKSRC}/linux/Makefile + @${REINPLACE_CMD} -e '/^GLLIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/linux/Makefile @${REINPLACE_CMD} -e 's|getenv("KIKI_HOME")|"${DATADIR}"|' ${WRKSRC}/src/main/KikiController.cpp do-build: diff --git a/games/kmquake2/files/patch-Makefile b/games/kmquake2/files/patch-Makefile index fa5149d..25d27ca 100644 --- a/games/kmquake2/files/patch-Makefile +++ b/games/kmquake2/files/patch-Makefile @@ -56,7 +56,7 @@ +Q2DIR?=$(LOCALBASE)/share/quake2 LIBDIR?=$(LOCALBASE)/lib/kmquake2 - XCFLAGS=-I$(X11BASE)/include + XCFLAGS=-I$(LOCALBASE)/include @@ -91,7 +95,7 @@ endif @@ -150,7 +150,7 @@ -$(BINDIR)/baseq2/kmq2game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS) - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -lGL +$(BINDIR)/baseq2/kmq2game.$(SHLIBEXT) : $(GAME_OBJS) -+ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -L$(X11BASE)/lib -lGL ++ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -L$(LOCALBASE)/lib -lGL $(BUILDDIR)/game/acebot_ai.o : $(GAME_DIR)/acesrc/acebot_ai.c $(DO_SHLIB_CC) diff --git a/games/libdungeonmaker/Makefile b/games/libdungeonmaker/Makefile index 3e14d55..748a148 100644 --- a/games/libdungeonmaker/Makefile +++ b/games/libdungeonmaker/Makefile @@ -8,15 +8,14 @@ PORTNAME= libdungeonmaker PORTVERSION= 2.05 CATEGORIES= games devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} +MASTER_SITES= SF MASTER_SITE_SUBDIR= dungeonmaker DISTNAME= dungeonmaker-${PORTVERSION} MAINTAINER= aaron@FreeBSD.org COMMENT= A program/library that "grows" dungeons for use in isometric games -INSTALLS_SHLIB= yes -USE_GCC= 3.2+ +USE_LDCONFIG= yes SUB_FILES= pkg-message PLIST_SUB+= HAS_DOCS=${HAS_DOCS} diff --git a/games/libfov/Makefile b/games/libfov/Makefile index a973777..b532a52 100644 --- a/games/libfov/Makefile +++ b/games/libfov/Makefile @@ -8,14 +8,13 @@ PORTNAME= libfov PORTVERSION= 1.0.2 CATEGORIES= games devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= libfov +MASTER_SITES= SFE/libfov MAINTAINER= aaron@FreeBSD.org COMMENT= C library for calculating fields of view on low resolution rasters WRKSRC= ${WRKDIR}/${DISTNAME}/fov -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: @${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile index 156accb..d53923e 100644 --- a/games/libmaitretarot/Makefile +++ b/games/libmaitretarot/Makefile @@ -19,6 +19,6 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 libxml2 lthack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile index 2c78e61..018f8d0 100644 --- a/games/libmt_client/Makefile +++ b/games/libmt_client/Makefile @@ -21,6 +21,6 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 libxml2 lthack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile index dfefeb9..0bf9b01 100644 --- a/games/libshhcards/Makefile +++ b/games/libshhcards/Makefile @@ -7,7 +7,7 @@ PORTNAME= libshhcards PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://shh.thathost.com/pub-unix/files/ DISTNAME= shhcards-${PORTVERSION} @@ -15,8 +15,7 @@ DISTNAME= shhcards-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library for displaying game cards on X Window System -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm MAKEFILE= ${FILESDIR}/Makefile.lib USE_LDCONFIG= yes diff --git a/games/libshhcards/files/Makefile.lib b/games/libshhcards/files/Makefile.lib index 05e563d..f548897 100644 --- a/games/libshhcards/files/Makefile.lib +++ b/games/libshhcards/files/Makefile.lib @@ -12,7 +12,7 @@ INCS= shhcards.h INCSDIR=${PREFIX}/include INCDIR= ${INCSDIR} # for pre-bsd.incs.mk API -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include SRCS= shhcards.c diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile index c6d4a8a..a235123 100644 --- a/games/lincity-ng/Makefile +++ b/games/lincity-ng/Makefile @@ -19,14 +19,13 @@ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs USE_BZIP2= yes -USE_GCC= 3.2+ USE_SDL= sdl mixer image ttf gfx USE_GL= yes USE_GNOME= libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libphysfs=${PREFIX} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/games/linux-goodway/Makefile b/games/linux-goodway/Makefile index 03f7a64..d61bacb 100644 --- a/games/linux-goodway/Makefile +++ b/games/linux-goodway/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= icoconvert:${PORTSDIR}/graphics/icoconvert RUN_DEPENDS= X-Plane:${PORTSDIR}/games/linux-x-plane WRKSRC= ${WRKDIR}/GoodWay${GWVERSION}F -USE_X_PREFIX= yes +USE_XLIB= yes USE_ZIP= yes USE_LINUX= yes RESTRICTED= "Redistribution prohibited" @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 GWVERSION= ${PORTVERSION:S|.||g} -XDIR= ${X11BASE}/lib/x-plane +XDIR= ${LOCALBASE}/lib/x-plane GWDIR= ${PREFIX}/lib/goodway GWDIR_REL= ${GWDIR:S,^${PREFIX}/,,} @@ -59,11 +59,11 @@ post-patch: do-build: .for t in athlon-xp i586 pentium-3 - @if [ -e ${X11BASE}/lib/x-plane/X-Plane-${t} ]; then \ - ${ECHO_CMD} 'GNL_XPlaneEXE=${X11BASE}/lib/x-plane/X-Plane-${t}' > ${WRKSRC}/Properties3.prf; \ + @if [ -e ${LOCALBASE}/lib/x-plane/X-Plane-${t} ]; then \ + ${ECHO_CMD} 'GNL_XPlaneEXE=${LOCALBASE}/lib/x-plane/X-Plane-${t}' > ${WRKSRC}/Properties3.prf; \ fi .endfor - @${ECHO_CMD} 'GNL_XPlaneDir=${X11BASE}/lib/x-plane' >> ${WRKSRC}/Properties3.prf + @${ECHO_CMD} 'GNL_XPlaneDir=${LOCALBASE}/lib/x-plane' >> ${WRKSRC}/Properties3.prf @icoconvert ${WRKSRC}/ICON1.ICO @${MKDIR} ${WRKSRC}/.icons @${MV} ${WRKSRC}/ICON1_*.png ${WRKSRC}/.icons diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile index 1bb4ccf..16d632e 100644 --- a/games/linux-ssamtse/Makefile +++ b/games/linux-ssamtse/Makefile @@ -19,9 +19,9 @@ COMMENT= Serious Sam - The Second Encounter NO_BUILD= yes USE_BZIP2= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_PACKAGE= yes # distfiles must be downloaded manually, wierd legal issues etc etc etc. SSAMDIR= ${PREFIX}/ssam diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile index 8036ac1..2255467 100644 --- a/games/linux-steam/Makefile +++ b/games/linux-steam/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LINUX_BASE_PORT} IS_INTERACTIVE= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes PKGMESSAGE= ${WRKDIR}/pkg-message INSTALLDIR?= steam diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile index cbe1b46..a56f85c 100644 --- a/games/linux-ut2003-demo/Makefile +++ b/games/linux-ut2003-demo/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .sh.bin MAINTAINER= alepulver@FreeBSD.org COMMENT= Unreal Tournament 2003 demo -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes NO_PACKAGE= Distfile is 130MB, set FORCE_PACKAGE if you really want to build this package RESTRICTED= Redistribution is limited, see license diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile index 92450a2..fdbcba0 100644 --- a/games/linux-ut2004-demo/Makefile +++ b/games/linux-ut2004-demo/Makefile @@ -19,7 +19,7 @@ MAINTAINER= jylefort@FreeBSD.org COMMENT= Unreal Tournament 2004 demo ONLY_FOR_ARCHS= i386 amd64 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes NO_PACKAGE= Distfile size is 275MB, set FORCE_PACKAGE if you really want to build this package RESTRICTED= Redistribution is limited, see license diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile index 3a00767..f0b26d9 100644 --- a/games/linux-virtual-jay-peak/Makefile +++ b/games/linux-virtual-jay-peak/Makefile @@ -17,7 +17,7 @@ COMMENT= A simulation of snowboarding at the Jay Peak resort in Vermont WRKSRC= ${WRKDIR}/soulride ONLY_FOR_ARCHS= i386 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes NO_BUILD= yes SUB_FILES= virtual-jay-peak diff --git a/games/linux-x-plane-net-installer/Makefile b/games/linux-x-plane-net-installer/Makefile index 4995f43..f57fa2f 100644 --- a/games/linux-x-plane-net-installer/Makefile +++ b/games/linux-x-plane-net-installer/Makefile @@ -22,7 +22,7 @@ BROKEN= Unfetchable DEPRECATED= ${BROKEN} EXPIRATION_DATE=2007-04-10 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes NO_BUILD= yes RESTRICTED= "Redistribution prohibited" diff --git a/games/linux-x-plane/Makefile b/games/linux-x-plane/Makefile index c56492f..0bd9b07 100644 --- a/games/linux-x-plane/Makefile +++ b/games/linux-x-plane/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.1:${PORTSDIR}/audio/linux-openal IGNOREFILES= ${DISTFILES} # user-created distribution NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_BZIP2= yes USE_LINUX= yes NO_BUILD= yes diff --git a/games/macopix/Makefile b/games/macopix/Makefile index d508dfe..46d06cf 100644 --- a/games/macopix/Makefile +++ b/games/macopix/Makefile @@ -7,6 +7,7 @@ PORTNAME= macopix PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/ .if defined(WITH_GTK1) @@ -36,7 +37,6 @@ RESTRICTED_FILES= \ macopix-mascot-HxB-euc-ja-0.30.tar.gz USE_GETTEXT= yes -USE_X_PREFIX= yes .if defined(WITH_GTK1) USE_GNOME= gtk12 gdkpixbuf .else diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile index 362bf8d..43201cb 100644 --- a/games/maelstrom/Makefile +++ b/games/maelstrom/Makefile @@ -7,7 +7,7 @@ PORTNAME= maelstrom PORTVERSION= 3.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.devolution.com/~slouken/projects/Maelstrom/src/ DISTNAME= Maelstrom-${PORTVERSION} @@ -15,9 +15,8 @@ DISTNAME= Maelstrom-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Asteroids-style game for X Window System -USE_X_PREFIX= yes USE_SDL= sdl net -USE_XPM= yes +USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/games/maelstrom/files/Makeflags b/games/maelstrom/files/Makeflags index de83567..f2721eb 100644 --- a/games/maelstrom/files/Makeflags +++ b/games/maelstrom/files/Makeflags @@ -20,12 +20,12 @@ OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \ Utils.o shared.o myerror.o SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o -X11INCLUDE = -I${X11BASE}/include +X11INCLUDE = -I${LOCALBASE}/include INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE) CFLAGS += $(INCLUDES) $(FEATURES) \ -pedantic -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\" EXTRALIBS = -X11LINKDIR = -L${X11BASE}/lib +X11LINKDIR = -L${LOCALBASE}/lib X11LIBS = -lXpm $(XPMLINKDIR) -lX11 -lXext $(X11LINKDIR) CSUMLIB = LIBS = $(EXTRALIBS) $(X11LIBS) $(CSUMLIB) diff --git a/games/mangband/files/patch-ab b/games/mangband/files/patch-ab index 9b94e2b..cda4eb1 100644 --- a/games/mangband/files/patch-ab +++ b/games/mangband/files/patch-ab @@ -15,8 +15,8 @@ # -CFLAGS = -Wall -g -pipe -D"USE_X11" -D"USE_GCU" -I/usr/include/ncurses -LIBS = -L/usr/X11R6/lib -lX11 -lncurses -+CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${X11BASE}/include -+LIBS = -L${X11BASE}/lib -lX11 -lncurses ++CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${LOCALBASE}/include ++LIBS = -L${LOCALBASE}/lib -lX11 -lncurses ## diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile index 472879e..d2161b9 100644 --- a/games/marsnomercy/Makefile +++ b/games/marsnomercy/Makefile @@ -18,7 +18,7 @@ COMMENT= A turn-based strategy game setting on Mars BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons -USE_GL= yes +USE_GL= gl USE_SDL= sdl image ttf MAKE_ENV= CC="${CC}" CXX="${CXX}" SCONS_ARGS= prefix=${PREFIX} diff --git a/games/marsnomercy/files/patch-SConstruct b/games/marsnomercy/files/patch-SConstruct index 5def552..1ab7e68 100644 --- a/games/marsnomercy/files/patch-SConstruct +++ b/games/marsnomercy/files/patch-SConstruct @@ -6,7 +6,7 @@ else: + # Section used for FreeBSD port + LOCALBASE = os.environ['LOCALBASE'] -+ X11BASE = os.environ['X11BASE'] ++ LOCALBASE = os.environ['LOCALBASE'] # determine compiler and linker flags for SDL - env.ParseConfig('sdl-config --cflags') - env.ParseConfig('sdl-config --libs') @@ -19,8 +19,8 @@ - + env.Replace(CC = os.environ['CC']) + env.Replace(CXX = os.environ['CXX']) -+ env.Replace(CPPPATH = [X11BASE + '/include',LOCALBASE+ '/include']) -+ env.Replace(LIBPATH = [X11BASE + '/lib',LOCALBASE+ '/lib']) ++ env.Replace(CPPPATH = [LOCALBASE + '/include',LOCALBASE+ '/include']) ++ env.Replace(LIBPATH = [LOCALBASE + '/lib',LOCALBASE+ '/lib']) + env.Append(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`') # generate help for options diff --git a/games/merlin/Makefile b/games/merlin/Makefile index c4ea71f..0e43283 100644 --- a/games/merlin/Makefile +++ b/games/merlin/Makefile @@ -7,7 +7,7 @@ PORTNAME= merlin PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.doc.ic.ac.uk/~np2/software/download/ DISTNAME= ${PORTNAME} @@ -19,7 +19,6 @@ RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 NO_WRKSUBDIR= yes NO_BUILD= yes -USE_X_PREFIX= yes post-patch: @${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" \ diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile index 37c450b..1803b7a 100644 --- a/games/mindfocus/Makefile +++ b/games/mindfocus/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ixtl@utmc.or.jp COMMENT= Lovely characters stay on top of active window USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm RESTRICTED= 'contains commercial character data' post-install: diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile index 8e977b7..2fbd583 100644 --- a/games/mindguard/Makefile +++ b/games/mindguard/Makefile @@ -40,15 +40,15 @@ DOCS= algorithms.html antarctic.html author.html \ versions.html do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mindguard ${X11BASE}/bin/mindguard - ${MKDIR} ${X11BASE}/share/mindguard + ${INSTALL_PROGRAM} ${WRKSRC}/mindguard ${PREFIX}/bin/mindguard + ${MKDIR} ${PREFIX}/share/mindguard .for i in ${CARRIERS} - ${INSTALL_DATA} ${WRKSRC}/carriers/$i ${X11BASE}/share/mindguard + ${INSTALL_DATA} ${WRKSRC}/carriers/$i ${PREFIX}/share/mindguard .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${X11BASE}/share/doc/mindguard + ${MKDIR} ${PREFIX}/share/doc/mindguard .for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/$i ${X11BASE}/share/doc/mindguard + ${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/mindguard .endfor .endif diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-aa index ea0f125..a1d794d 100644 --- a/games/mindguard/files/patch-aa +++ b/games/mindguard/files/patch-aa @@ -10,7 +10,7 @@ mindguard: mindguard.c mindguard.h - $(CC) `gtk-config --cflags` mindguard.c -o mindguard `gtk-config --libs` -+ $(CC) -DX11BASE=\"${X11BASE}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs` ++ $(CC) -DLOCALBASE=\"${PREFIX}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs` install: mindguard install-bin install-carriers install-docs diff --git a/games/mindguard/files/patch-ab b/games/mindguard/files/patch-ab index cb83fcf..94079c9 100644 --- a/games/mindguard/files/patch-ab +++ b/games/mindguard/files/patch-ab @@ -5,7 +5,7 @@ break; case 2: - strcpy(car_path, "/usr/local/share/MindGuard/carriers/"); -+ strcpy(car_path, X11BASE "/share/mindguard/"); ++ strcpy(car_path, LOCALBASE "/share/mindguard/"); break; default: break; diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index 5978097..a22ea99 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -18,7 +18,7 @@ COMMENT= An arcade style game with stereo sound for X Window System USE_GMAKE= yes MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \ - X11_PATH="${X11BASE}" + X11_PATH="${LOCALBASE}" WANT_SDL= yes OPTIONS= SDL "SDL support" on diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile index 2b3206f..f852a10 100644 --- a/games/monster-masher/Makefile +++ b/games/monster-masher/Makefile @@ -7,7 +7,7 @@ PORTNAME= monster PORTVERSION= 1.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games gnome MASTER_SITES= http://www.cs.aau.dk/~olau/monster-masher/source/ PKGNAMESUFFIX= -masher @@ -18,7 +18,6 @@ COMMENT= Gnomemm puzzle game where you have to clean the caves of monsters LIB_DEPENDS= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 -USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack gnometarget intlhack USE_GMAKE= yes diff --git a/games/nehquake/files/patch-Makefile b/games/nehquake/files/patch-Makefile index 1d40a6b..a83f953 100644 --- a/games/nehquake/files/patch-Makefile +++ b/games/nehquake/files/patch-Makefile @@ -67,8 +67,8 @@ -GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm -GLCFLAGS=-DGLQUAKE -I/usr/include -I/usr/X11R6/include -+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -+GLCFLAGS=-DGLQUAKE -I$(X11BASE)/include ++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++GLCFLAGS=-DGLQUAKE -I$(LOCALBASE)/include DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $< diff --git a/games/nethack32/files/patch-ab b/games/nethack32/files/patch-ab index a22424c..9f6970d 100644 --- a/games/nethack32/files/patch-ab +++ b/games/nethack32/files/patch-ab @@ -6,8 +6,8 @@ -CFLAGS = -O -I../include -LFLAGS = -+CFLAGS += -O -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib ++CFLAGS += -O -I../include -I${LOCALBASE}/include ++LFLAGS = -L${LOCALBASE}/lib # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired diff --git a/games/nethack33/files/patch-ad b/games/nethack33/files/patch-ad index 2053453..f0f1ab1 100644 --- a/games/nethack33/files/patch-ad +++ b/games/nethack33/files/patch-ad @@ -11,7 +11,7 @@ # CFLAGS = -g -I../include +CFLAGS += -I../include +ifeq ("$(GRAPHICS)","X11_GRAPHICS") -+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include ++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS @@ -65,7 +65,7 @@ # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib ++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 diff --git a/games/nethack34/files/patch-ad b/games/nethack34/files/patch-ad index 86219e9..b66b315 100644 --- a/games/nethack34/files/patch-ad +++ b/games/nethack34/files/patch-ad @@ -14,7 +14,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src -CFLAGS = -O -I../include +CFLAGS += -I../include +ifeq ("$(GRAPHICS)","X11_GRAPHICS") -+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include ++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS @@ -71,7 +71,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib ++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile index 37c103a..1561df2 100644 --- a/games/netrek-BRMH-bin/Makefile +++ b/games/netrek-BRMH-bin/Makefile @@ -7,7 +7,7 @@ PORTNAME= netrek-BRMH PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://ftp.netrek.org/pub/netrek/mirrors/ftp.csua.berkeley.edu.old/netrek/ \ @@ -17,7 +17,6 @@ EXTRACT_SUFX= .gz MAINTAINER= ports@FreeBSD.org COMMENT= A 16-player network space battle/conquest game with a Star Trek theme -USE_X_PREFIX= YES NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_FILES= bin/netrek diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile index c7951fd..50bc022 100644 --- a/games/netrek-COW3-bin/Makefile +++ b/games/netrek-COW3-bin/Makefile @@ -7,7 +7,7 @@ PORTNAME= netrek-COW PORTVERSION= 3.00.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://ftp.netrek.org/pub/netrek/clients/cow/COW-bin/old/ DISTFILES= COW.3.00pl0.FreeBSD.gz @@ -15,7 +15,6 @@ DISTFILES= COW.3.00pl0.FreeBSD.gz MAINTAINER= ports@FreeBSD.org COMMENT= A 16-player network space battle/conquest game with a Star Trek theme -USE_X_PREFIX= YES NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_FILES= bin/netrek diff --git a/games/newvox/Makefile b/games/newvox/Makefile index f6d78d1..f387f2e 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -7,7 +7,7 @@ PORTNAME= newvox PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.libsdl.org/projects/newvox/src/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Voxel-style landscape rendering fly-by USE_SDL= sdl -USE_X_PREFIX= yes GNU_CONFIGURE= yes do-install: diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile index c206cd7..1404c86 100644 --- a/games/nexuiz/Makefile +++ b/games/nexuiz/Makefile @@ -7,9 +7,9 @@ PORTNAME= nexuiz PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -49,7 +49,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis \ .endif .if !defined(WITHOUT_CLIENT) -USE_GL= yes +USE_GL= glut +USE_XORG= x11 xpm xxf86vm xxf86dga xext ALL_TARGET+= cl-release PLIST_SUB+= CLIENT="" .else @@ -74,7 +75,7 @@ PLIST_SUB+= SERVER="@comment " post-extract: @${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \ -d ${WRKDIR}/Nexuiz/sources - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c do-build: diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index bafb98c..d615d09 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -26,8 +26,8 @@ MAN6= nighthawk.6 CFLAGS+= -DINSTALL_DIR=\\\"\${DATADIR}\\\" \ -DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \ - -I${X11BASE}/include -LDFLAGS= -lm -L${X11BASE}/lib -lX11 -lGL -lGLU -lglut + -I${LOCALBASE}/include +LDFLAGS= -lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut post-patch: ${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/games/noegnud-littlehack/files/noegnud-littlehack.patch b/games/noegnud-littlehack/files/noegnud-littlehack.patch index 7cc51e5..67ba867 100644 --- a/games/noegnud-littlehack/files/noegnud-littlehack.patch +++ b/games/noegnud-littlehack/files/noegnud-littlehack.patch @@ -64,7 +64,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha # compile normally -COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags` -+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include ++COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS) DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS) @@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha +CFLAGS += $(STD_CFLAGS) -LFLAGS = -L/usr/X11R6/lib -+LFLAGS = -L${X11BASE}/lib -lgnuregex ++LFLAGS = -L${LOCALBASE}/lib -lgnuregex # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include diff --git a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch index 6b9ea1c..e6d94e1 100644 --- a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch +++ b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch @@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac # compile normally -COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags` -+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include ++COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS) DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS) @@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac +CFLAGS += $(STD_CFLAGS) -LFLAGS = -L/usr/X11R6/lib -+LFLAGS = -L${X11BASE}/lib -lgnuregex ++LFLAGS = -L${LOCALBASE}/lib -lgnuregex # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include diff --git a/games/noegnud-nethack/files/noegnud-nethack.patch b/games/noegnud-nethack/files/noegnud-nethack.patch index 94d7198..f9ae4b4 100644 --- a/games/noegnud-nethack/files/noegnud-nethack.patch +++ b/games/noegnud-nethack/files/noegnud-nethack.patch @@ -64,7 +64,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4 # compile normally -COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags` -+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include ++COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS) DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS) @@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4 +CFLAGS += $(STD_CFLAGS) -LFLAGS = -L/usr/X11R6/lib -+LFLAGS = -L${X11BASE}/lib -lgnuregex ++LFLAGS = -L${LOCALBASE}/lib -lgnuregex # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include diff --git a/games/noegnud-slashem/files/noegnud-slashem.patch b/games/noegnud-slashem/files/noegnud-slashem.patch index 1afe738..0b61d3d 100644 --- a/games/noegnud-slashem/files/noegnud-slashem.patch +++ b/games/noegnud-slashem/files/noegnud-slashem.patch @@ -24,7 +24,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem # compile normally -COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags` -+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include ++COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS) DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS) @@ -33,7 +33,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem +CFLAGS += $(STD_CFLAGS) -LFLAGS = -L/usr/X11R6/lib -+LFLAGS = -L${X11BASE}/lib ++LFLAGS = -L${LOCALBASE}/lib # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include # LFLAGS = -b i486-linuxaout -L/usr/X11/lib @@ -100,8 +100,8 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem # compile normally -CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include -LFLAGS = -L/usr/X11R6/lib -+CFLAGS += -O2 -fomit-frame-pointer -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib ++CFLAGS += -O2 -fomit-frame-pointer -I../include -I${LOCALBASE}/include ++LFLAGS = -L${LOCALBASE}/lib # OR compile backwards compatible a.out format # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include # LFLAGS = -b i486-linuxaout -L/usr/X11/lib diff --git a/games/oolite/files/patch-makefile b/games/oolite/files/patch-makefile index 2c0d06d..93cd7f9 100644 --- a/games/oolite/files/patch-makefile +++ b/games/oolite/files/patch-makefile @@ -18,8 +18,8 @@ - ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` - oolite_LIB_DIRS += -L/usr/X11R6/lib/ + ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs` -+ ADDITIONAL_CFLAGS = -I${X11BASE}/include -DLINUX `sdl-config --cflags` -+ ADDITIONAL_OBJCFLAGS = -I${X11BASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` -+ oolite_LIB_DIRS += -L${X11BASE}/lib/ ++ ADDITIONAL_CFLAGS = -I${LOCALBASE}/include -DLINUX `sdl-config --cflags` ++ ADDITIONAL_OBJCFLAGS = -I${LOCALBASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` ++ oolite_LIB_DIRS += -L${LOCALBASE}/lib/ endif OBJC_PROGRAM_NAME = oolite diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile index feb8f7b..6a4b3f4 100644 --- a/games/oonsoo/Makefile +++ b/games/oonsoo/Makefile @@ -7,7 +7,7 @@ PORTNAME= oonsoo PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} \ http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/ @@ -17,12 +17,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A solitaire card game for X +USE_XORG= x11 PLIST_FILES= bin/oonsoo -USE_XLIB= yes MAKEFILE= Makefile.Linux MAKE_ARGS= CC="${CXX}" CPPFLAGS="${CXXFLAGS} -ansi" \ - SYS_INCLUDE="-I${X11BASE}/include" \ - SYS_LIBS="-L${X11BASE}/lib -lX11" + SYS_INCLUDE="-I${LOCALBASE}/include" \ + SYS_LIBS="-L${LOCALBASE}/lib -lX11" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/oonsoo ${PREFIX}/bin diff --git a/games/openarena/files/patch-Makefile b/games/openarena/files/patch-Makefile index ac77e4c..ca72658 100644 --- a/games/openarena/files/patch-Makefile +++ b/games/openarena/files/patch-Makefile @@ -79,7 +79,7 @@ - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - - GL_CFLAGS = -I/usr/X11R6/include -+ GL_CFLAGS = -I$(X11BASE)/include ++ GL_CFLAGS = -I$(LOCALBASE)/include DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe @@ -160,7 +160,7 @@ + endif + + ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ifeq ($(USE_OPENAL),1) diff --git a/games/openglad/Makefile b/games/openglad/Makefile index d599b68..e809a96 100644 --- a/games/openglad/Makefile +++ b/games/openglad/Makefile @@ -9,8 +9,7 @@ PORTNAME= openglad PORTVERSION= 0.98 PORTREVISION= 5 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= snowstorm +MASTER_SITES= SF/snowstorm MAINTAINER= ports@FreeBSD.org COMMENT= SDL port of an old DOS game called Gladiator @@ -19,7 +18,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_SDL= sdl mixer -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" PLIST_SUB= DOCDIR=share/doc/${PORTNAME} NOT_FOR_ARCHS= sparc64 diff --git a/games/palomino/Makefile b/games/palomino/Makefile index 305a3be..f30fa2f 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -15,11 +15,9 @@ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= infofarmer@FreeBSD.org COMMENT= Action flight simulator with its own 3D engine -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_ZIP= yes USE_PYTHON= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -36,7 +34,7 @@ post-patch: @${REINPLACE_CMD} -Ee 's!(-O[0-9s]?|-funroll-loops|-fno-inline)!!g'\ ${WRKSRC}/gfx/tools/cc-config.sh @${REINPLACE_CMD} -e 's|-march=$$ARCH||' ${WRKSRC}/gfx/tools/cc-config.sh - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g'\ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g'\ ${WRKSRC}/gfx/tools/cc-config.sh ${WRKSRC}/gfx/tools/ld-config.sh do-install: diff --git a/games/pets/Makefile b/games/pets/Makefile index 2875cf5..1e0ca58 100644 --- a/games/pets/Makefile +++ b/games/pets/Makefile @@ -8,7 +8,7 @@ PORTNAME= pets PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.loria.fr/~rougier/pub/Software/ @@ -17,7 +17,6 @@ COMMENT= Funny pets to follow your mouse pointer WRKSRC= ${WRKDIR}/pet-${PORTVERSION} -USE_X_PREFIX= yes USE_GNOME= gtk20 pkgconfig SUB_FILES= pkg-message diff --git a/games/pinball/Makefile b/games/pinball/Makefile index e13b1b7..327cb13 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -9,8 +9,7 @@ PORTNAME= pinball PORTVERSION= 0.3.1 PORTREVISION= 8 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= thierry@FreeBSD.org COMMENT= Emilia Pinball is a free pinball game @@ -25,9 +24,9 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro USE_SDL= image mixer sdl USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug @@ -35,8 +34,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug CONFIGURE_ARGS+= --with-allegro EXTRA_LIBS= -lGL -lGLU .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -DRZR_LIBSTATIC" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${EXTRA_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -DRZR_LIBSTATIC" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS}" ALLEGRO_CONFIG= ${LOCALBASE}/bin/allegro-config DOCS= README diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile index f5a0ff6..15f9103 100644 --- a/games/planeshift/Makefile +++ b/games/planeshift/Makefile @@ -25,8 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= automake:15:env autoconf:261:env -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib CRYSTAL= ${LOCALBASE} CEL= ${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/games/pmars/Makefile b/games/pmars/Makefile index 3d2c064..1ab72d9 100644 --- a/games/pmars/Makefile +++ b/games/pmars/Makefile @@ -7,10 +7,9 @@ PORTNAME= pmars PORTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= corewar +MASTER_SITES= SF/corewar MAINTAINER= alepulver@FreeBSD.org COMMENT= A portable corewar system with ICWS'94 extensions @@ -70,11 +69,11 @@ MAKE_ARGS+= CFLAGS+="-DSMALLMEM" .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 TARGETS+= x11 X11_ARGS+= CFLAGS+="-DXWINGRAPHX" \ - CFLAGS+="-I${X11BASE}/include" \ - LIB+="-L${X11BASE}/lib -lX11" + CFLAGS+="-I${LOCALBASE}/include" \ + LIB+="-L${LOCALBASE}/lib -lX11" PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " diff --git a/games/pongix/Makefile b/games/pongix/Makefile index 9f95058..f10c53c 100644 --- a/games/pongix/Makefile +++ b/games/pongix/Makefile @@ -17,8 +17,8 @@ COMMENT= Free pong-like game USE_SDL= sdl image net USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile index 20a757b..84d963f 100644 --- a/games/pouetchess/Makefile +++ b/games/pouetchess/Makefile @@ -16,7 +16,7 @@ MAINTAINER= amdmi3@amdmi3.ru COMMENT= An open-source 3D chess game USE_SDL= sdl image -USE_GL= yes +USE_GL= gl USE_GMAKE= yes WRKSRC= ${WRKDIR}/pouetChess_0.11 @@ -36,11 +36,11 @@ post-patch: "s|$$(${PRINTF} '\r')$$||" {} \; @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${X11BASE}/lib|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/CXX / d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/CXXFLAGS.*+=/ d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|:=|+=|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|$$| -I${X11BASE}/include|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|$$| -I${LOCALBASE}/include|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|config\.ini|${PREFIX}/etc/pouetChess.conf|' ${WRKSRC}/src/globalInfos.cpp @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/src/globalInfos.h diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile index 0a69bed..0f6a23e 100644 --- a/games/ppracer/Makefile +++ b/games/ppracer/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_SDL= mixer sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} @@ -28,7 +28,7 @@ USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(c|cpp|h) post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,RacingMode::,,' ${WRKSRC}/src/racingmode.h .include <bsd.port.mk> diff --git a/games/q2p/files/patch-Makefile b/games/q2p/files/patch-Makefile index 337e42f..0539957 100644 --- a/games/q2p/files/patch-Makefile +++ b/games/q2p/files/patch-Makefile @@ -161,7 +161,7 @@ +GAME_NAME=game.$(SHLIB_EXT) BASE_CFLAGS+=-I$(LOCALBASE)/include \ - -I$(X11BASE)/include \ + -I$(LOCALBASE)/include \ @@ -168,15 +165,14 @@ ifeq ($(strip $(OPTIMIZE)),YES) diff --git a/games/q2pro/files/patch-build__pre.mk b/games/q2pro/files/patch-build__pre.mk index 3ea5554..087a65b 100644 --- a/games/q2pro/files/patch-build__pre.mk +++ b/games/q2pro/files/patch-build__pre.mk @@ -10,8 +10,8 @@ -LDFLAGS_LINUX=#blank +DATADIR?=$(Q2DIR) +LIBDIR?=$(PREFIX)/lib/q2pro -+CFLAGS_LINUX=-I$(LOCALBASE)/include -I$(X11BASE)/include -DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"' -+LDFLAGS_LINUX=-L$(LOCALBASE)/lib -L$(X11BASE)/lib ++CFLAGS_LINUX=-I$(LOCALBASE)/include -DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"' ++LDFLAGS_LINUX=-L$(LOCALBASE)/lib SRCFILES_LINUX=#blank ASMFILES_LINUX=#blank diff --git a/games/q3base/Makefile b/games/q3base/Makefile index 5e9452a..f32f854 100644 --- a/games/q3base/Makefile +++ b/games/q3base/Makefile @@ -36,7 +36,7 @@ USE_SDL+= image .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's/echo aout/echo elf/' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\($${exec_prefix}/lib\)/quake3|\1/q3base|' \ ${WRKSRC}/src/Makefile.in diff --git a/games/q3cellshading/files/patch-code-unix-Makefile b/games/q3cellshading/files/patch-code-unix-Makefile index f7132cd..c3ab9b0 100644 --- a/games/q3cellshading/files/patch-code-unix-Makefile +++ b/games/q3cellshading/files/patch-code-unix-Makefile @@ -89,7 +89,7 @@ -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe -+GL_CFLAGS = -I$(X11BASE)/include ++GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror @@ -131,7 +131,7 @@ #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ diff --git a/games/qgo/Makefile b/games/qgo/Makefile index 2dd93e2..8e0f1ff 100644 --- a/games/qgo/Makefile +++ b/games/qgo/Makefile @@ -8,6 +8,7 @@ PORTNAME= qgo PORTVERSION= 1.5.4.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E} @@ -17,11 +18,11 @@ COMMENT= A Go board and SGF editor written with the Qt library WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} +USE_XORG= x11 ice xext USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include post-patch: @${REINPLACE_CMD} -e \ diff --git a/games/qix/Makefile b/games/qix/Makefile index 73983e3..203e76e 100644 --- a/games/qix/Makefile +++ b/games/qix/Makefile @@ -7,7 +7,7 @@ PORTNAME= qix PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jmz @@ -15,15 +15,17 @@ MASTER_SITE_SUBDIR= jmz MAINTAINER= jmz@FreeBSD.org COMMENT= The classic arcade game -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ + xset:${PORTSDIR}/x11/xset USE_DISPLAY= yes .if defined(WITHOUT_X11) MAKE_ARGS= NO_X11=yes .else -USE_X_PREFIX= yes +USE_XORG= x11 PLIST= pkg-plist.x11 .endif diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index 14db55b..6447c8c 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -65,7 +65,7 @@ PLIST_SUB+= GAME="@comment " .if defined(WITH_GL) USE_GL= yes -CONFIGURE_ARGS+=--with-opengl=${X11BASE} +CONFIGURE_ARGS+=--with-opengl=${LOCALBASE} PLIST_SUB+= GL="" .else CONFIGURE_ARGS+=--with-opengl=no diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile index 2f3b02c..9f93516 100644 --- a/games/quake2lnx/Makefile +++ b/games/quake2lnx/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2lnx PORTVERSION= 0.16.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games ipv6 MASTER_SITES= http://offload1.icculus.org/quake2/files/ DISTNAME= quake2-r${PORTVERSION} @@ -55,7 +55,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} # ### .if defined(WITH_X11) -USE_XLIB= yes +USE_XORG= x11 xxf86dga MAKE_ARGS+= BUILD_X11=YES REF_TARGETS+= softx PLIST_SUB+= X11="" diff --git a/games/quake2lnx/files/patch-Makefile b/games/quake2lnx/files/patch-Makefile index 86435fa..9d786bf 100644 --- a/games/quake2lnx/files/patch-Makefile +++ b/games/quake2lnx/files/patch-Makefile @@ -152,8 +152,8 @@ -XCFLAGS=-I/usr/X11R6/include -XLDFLAGS=-L/usr/X11R6/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -AALDFLAGS=-lm -laa -+XCFLAGS=-I${X11BASE}/include -+XLDFLAGS=-L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++XCFLAGS=-I${LOCALBASE}/include ++XLDFLAGS=-L${LOCALBASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm +AACFLAGS=-I${PREFIX}/include +AALDFLAGS=-L${PREFIX}/lib -laa @@ -161,7 +161,7 @@ +SDLCFLAGS=$(shell ${SDL_CONFIG} --cflags) ifeq ($(strip $(STATICSDL)),YES) - SDLLDFLAGS += -L/usr/X11R6/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a -+ SDLLDFLAGS += -L${X11BASE}/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a ++ SDLLDFLAGS += -L${LOCALBASE}/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a SDLLDFLAGS += $(SDLDIR)/libesd.a $(SDLDIR)/libartsc.a -Wl,-Bdynamic SDLLDFLAGS += -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm -lXv \ -lXinerama @@ -177,8 +177,8 @@ -GLXCFLAGS=-I/usr/X11R6/include -DOPENGL -GLXLDFLAGS=-L/usr/X11R6/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -+GLXCFLAGS=-I${X11BASE}/include -DOPENGL -+GLXLDFLAGS=-L${X11BASE}/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm ++GLXCFLAGS=-I${LOCALBASE}/include -DOPENGL ++GLXLDFLAGS=-L${LOCALBASE}/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm SDLGLCFLAGS=$(SDLCFLAGS) -DOPENGL SDLGLLDFLAGS=$(SDLLDFLAGS) diff --git a/games/quake3/files/patch-code-unix-Makefile b/games/quake3/files/patch-code-unix-Makefile index e9c97bb..56eb13a 100644 --- a/games/quake3/files/patch-code-unix-Makefile +++ b/games/quake3/files/patch-code-unix-Makefile @@ -80,7 +80,7 @@ -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe -+GL_CFLAGS = -I$(X11BASE)/include ++GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror @@ -122,7 +122,7 @@ #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 803942d..e53b89f 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -74,7 +74,7 @@ PLIST_SUB+= VORBIS="@comment " .if defined(WITH_XMMS) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms -CONFIGURE_ARGS+=--with-xmms-prefix=${X11BASE} +CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE} PLIST_SUB+= XMMS="" .else CONFIGURE_ARGS+=--disable-xmms diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile index 25e64f3..817329f 100644 --- a/games/quetoo/Makefile +++ b/games/quetoo/Makefile @@ -19,12 +19,12 @@ COMMENT= Fast, stable, compatible, and secure Quake II client USE_BZIP2= yes USE_SDL= sdl -USE_GL= yes +USE_GL= glut USE_DOS2UNIX= src/vanctf/g_local.h GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ - OPENGL_CFLAGS="-I${X11BASE}/include" OPENGL_LIBS="-L${X11BASE}/lib" + OPENGL_CFLAGS="-I${LOCALBASE}/include" OPENGL_LIBS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LIBDIR= ${PREFIX}/lib/${PORTNAME} diff --git a/games/race/Makefile b/games/race/Makefile index add2d7f..045019b 100644 --- a/games/race/Makefile +++ b/games/race/Makefile @@ -17,9 +17,9 @@ COMMENT= OpenGL Racing Game USE_SDL= mixer image sdl USE_BZIP2= yes -USE_GL= yes -CFLAGS+= "-I${X11BASE}/include" -MAKE_ENV= CC="${CC} ${CFLAGS}" LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" +USE_GL= glut +CFLAGS+= "-I${LOCALBASE}/include" +MAKE_ENV= CC="${CC} ${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-patch: @${REINPLACE_CMD} -e "s|^CC|#CC|g" \ diff --git a/games/redeclipse/files/patch-src_Makefile b/games/redeclipse/files/patch-src_Makefile index d7c8164..bbef901 100644 --- a/games/redeclipse/files/patch-src_Makefile +++ b/games/redeclipse/files/patch-src_Makefile @@ -4,14 +4,14 @@ -CXXOPTFLAGS= -O3 -fomit-frame-pointer -INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags` -CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES) -+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` ++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` +CXXFLAGS+= -Wall -fsigned-char $(INCLUDES) -PLATFORM_PREFIX=native +PLATFORM_PREFIX=FreeBSD -CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU -+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU ++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU CLIENT_OBJS= \ shared/tools.o \ shared/geom.o \ diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile index b0d1997..b2e7819 100644 --- a/games/ri-li/Makefile +++ b/games/ri-li/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_SDL= sdl mixer -CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure diff --git a/games/robocode/Makefile b/games/robocode/Makefile index ddc8881..96a836f 100644 --- a/games/robocode/Makefile +++ b/games/robocode/Makefile @@ -7,9 +7,9 @@ PORTNAME= robocode PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= games java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=robocode +MASTER_SITES= SF/robocode DISTNAME= ${PORTNAME}-setup-${PORTVERSION} EXTRACT_SUFX= .jar @@ -24,7 +24,6 @@ JAVA_RUN= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_ZIP= yes -USE_XLIB= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 18b081a..8b6c099 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -7,7 +7,7 @@ PORTNAME= rocksndiamonds PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \ http://homepages.compuserve.de/rocksndiamonds/ @@ -18,7 +18,7 @@ COMMENT= Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff USE_GMAKE= yes MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \ - X11_PATH="${X11BASE}" + X11_PATH="${LOCALBASE}" MAN1= rocksndiamonds.1 @@ -27,8 +27,7 @@ LIB_DEPENDS+= smpeg:${PORTSDIR}/multimedia/smpeg USE_SDL= image mixer net sdl ALL_TARGET= sdl .else -USE_XLIB= yes -USE_XORG= x11 +USE_XORG= x11 xpm xt ALL_TARGET= x11 .endif diff --git a/games/rtb/Makefile b/games/rtb/Makefile index 474f91b..9769d8d 100644 --- a/games/rtb/Makefile +++ b/games/rtb/Makefile @@ -7,10 +7,9 @@ PORTNAME= RealTimeBattle PORTVERSION= 1.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME:L} +MASTER_SITES= SF${PORTNAME:} DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext MAINTAINER= ports@FreeBSD.org @@ -19,9 +18,7 @@ COMMENT= Robot programming game for UNIX BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnometarget gtk20 -USE_GCC= 3.4+ USE_PERL5= yes USE_PYTHON= yes USE_GMAKE= yes diff --git a/games/rubix/Makefile b/games/rubix/Makefile index bad00d9..66808f2 100644 --- a/games/rubix/Makefile +++ b/games/rubix/Makefile @@ -7,7 +7,7 @@ PORTNAME= rubix PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://sed.free.fr/rubix/ @@ -15,10 +15,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Another Rubik's cube game with a rather interesting interface USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes +USE_XORG= x11 MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DENGLISH" \ - XINC="-I${X11BASE}/include" XLIB="-L${X11BASE}/lib -lX11" + XINC="-I${LOCALBASE}/include" XLIB="-L${LOCALBASE}/lib -lX11" ALL_TARGET= ${PORTNAME} PORTDOCS= ${DOCFILES} diff --git a/games/sarien/Makefile b/games/sarien/Makefile index 846b589..4a58c44 100644 --- a/games/sarien/Makefile +++ b/games/sarien/Makefile @@ -7,17 +7,16 @@ PORTNAME= sarien PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Sierra AGI games interpreter GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 CFLAGS+= -I${LOCALBASE}/include diff --git a/games/sauerbraten/files/patch-src_Makefile b/games/sauerbraten/files/patch-src_Makefile index d7c8164..bbef901 100644 --- a/games/sauerbraten/files/patch-src_Makefile +++ b/games/sauerbraten/files/patch-src_Makefile @@ -4,14 +4,14 @@ -CXXOPTFLAGS= -O3 -fomit-frame-pointer -INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags` -CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES) -+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` ++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` +CXXFLAGS+= -Wall -fsigned-char $(INCLUDES) -PLATFORM_PREFIX=native +PLATFORM_PREFIX=FreeBSD -CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU -+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU ++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU CLIENT_OBJS= \ shared/tools.o \ shared/geom.o \ diff --git a/games/scare/Makefile b/games/scare/Makefile index 330e265..3c2adfa 100644 --- a/games/scare/Makefile +++ b/games/scare/Makefile @@ -27,8 +27,8 @@ BINFILES= scare .if defined(WITH_XGLK) PKGNAMESUFFIX= -glk -BUILD_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk -RUN_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk +BUILD_DEPENDS+= ${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk +RUN_DEPENDS+= ${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk ALL_TARGET= all glkscare diff --git a/games/scare/files/xglk.patch b/games/scare/files/xglk.patch index ef555fe..519ee48 100644 --- a/games/scare/files/xglk.patch +++ b/games/scare/files/xglk.patch @@ -5,7 +5,7 @@ # for Glk, comment out the include line. GLKPATH = $(GLKDIR)/$(GLK) -sinclude $(GLKPATH)/Make.$(GLK) -+.include "$(X11BASE)/share/xglk/Make.$(GLK)" ++.include "$(LOCALBASE)/share/xglk/Make.$(GLK)" GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS) # Always use the Bourne shell. @@ -14,7 +14,7 @@ os_glk.o: os_glk.c $(HEADERS) $(CC) $(GLKARCH) $(CFLAGS) -Wno-write-strings \ - -I $(GLKDIR)/$(GLK) -c -o $@ $< -+ -DLINUX_GRAPHICS -I${X11BASE}/include/xglk -c -o $@ $< ++ -DLINUX_GRAPHICS -I${LOCALBASE}/include/xglk -c -o $@ $< # Option to build an IFP plugin version of SCARE. scare_plugin.c: scare.hdr diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile index e689cd3..03872e3 100644 --- a/games/scid/files/patch-Makefile +++ b/games/scid/files/patch-Makefile @@ -34,9 +34,9 @@ -# TCL_INCLUDE = -I /usr/local/include/tcl8.0 -I /usr/local/include/tk8.0 -# TCL_LIBRARY = -L /usr/local/lib -ltcl80 -ldl -# TK_LIBRARY = $(TCL_LIBRARY) -ltk80 -L /usr/X11/lib -lX11 -+TCL_INCLUDE = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include ++TCL_INCLUDE = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include +TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl84 -+TK_LIBRARY = $(TCL_LIBRARY) -ltk84 -L${X11BASE}/lib -lX11 ++TK_LIBRARY = $(TCL_LIBRARY) -ltk84 -L${LOCALBASE}/lib -lX11 ######################################## diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 64b1815..e4a853a 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -53,7 +53,7 @@ post-patch: ${WRKSRC}/src/3dsparse/aseFile.tab.cpp \ ${WRKSRC}/src/ode/config.h \ ${WRKSRC}/src/zlib/zutil.h - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/configure.ac pre-configure: diff --git a/games/scourge/Makefile b/games/scourge/Makefile index 0b929c0..ba15a96 100644 --- a/games/scourge/Makefile +++ b/games/scourge/Makefile @@ -20,12 +20,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data USE_AUTOTOOLS= autoconf:261:env automake:19:env -USE_GL= yes +USE_GL= gl USE_SDL= sdl mixer net ttf USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/sdb/Makefile b/games/sdb/Makefile index 9503d24..595d057 100644 --- a/games/sdb/Makefile +++ b/games/sdb/Makefile @@ -21,8 +21,8 @@ USE_GMAKE= yes BUILD_WRKSRC= ${WRKSRC}/src -CPPFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include -LDFLAGS= `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU +CPPFLAGS= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include +LDFLAGS= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" PLIST_FILES= bin/sdb diff --git a/games/sdlquake2/files/patch-Makefile b/games/sdlquake2/files/patch-Makefile index 5b764d4..202e3e5 100644 --- a/games/sdlquake2/files/patch-Makefile +++ b/games/sdlquake2/files/patch-Makefile @@ -6,8 +6,8 @@ +CC?=gcc +SDL_CONFIG?=sdl-config +LOCALBASE?=/usr/local -+X11BASE?=/usr/X11R6 -+CFLAGS+=-O3 -ffast-math -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' $(shell $(SDL_CONFIG) --cflags) -I$(X11BASE)/include ++LOCALBASE?=/usr/X11R6 ++CFLAGS+=-O3 -ffast-math -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' $(shell $(SDL_CONFIG) --cflags) -I$(LOCALBASE)/include + +LIBS=-lm -lz + @@ -53,7 +53,7 @@ ref_sdlgl.so: $(sdlgl_OBJ) - $(CC) -shared -g -o $@ $(shell sdl-config --libs) -lGL -ljpeg -lpng12 $^ -+ $(CC) -shared -g -o $@ $(shell $(SDL_CONFIG) --libs) -L$(X11BASE)/lib -lGL -ljpeg -lpng $^ ++ $(CC) -shared -g -o $@ $(shell $(SDL_CONFIG) --libs) -L$(LOCALBASE)/lib -lGL -ljpeg -lpng $^ ALLOBJ:=$(quake2_OBJ) $(sdlgl_OBJ) diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile index 3168a3d..e4c19e1 100644 --- a/games/shaaft/Makefile +++ b/games/shaaft/Makefile @@ -9,8 +9,7 @@ PORTNAME= shaaft PORTVERSION= 0.5.0 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= criticalmass +MASTER_SITES= SF/criticalmass DISTNAME= Shaaft-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -41,7 +40,7 @@ BROKEN= Does not compile on sparc64 post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \ s|^CXXFLAGS|#CXXFLAGS|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|-lSDL | |g ; \ s|-lpng12|-lpng|g' ${WRKSRC}/configure @${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile index 9547544..d38b6c4 100644 --- a/games/shootingstar/Makefile +++ b/games/shootingstar/Makefile @@ -17,11 +17,11 @@ COMMENT= SDL/OpenGL top-down shooter GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl mixer image -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" \ SDL_CONFIG="${SDL_CONFIG}" .include <bsd.port.mk> diff --git a/games/sol/Makefile b/games/sol/Makefile index 10b35b6..940d929 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -7,7 +7,7 @@ PORTNAME= sol PORTVERSION= 1.0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://shh.thathost.com/pub-unix/files/ @@ -22,7 +22,7 @@ LIB_DEPENDS= shhopt.1:${PORTSDIR}/devel/libshhopt \ CONFLICTS= gnome-games-* USE_GMAKE= yes -USE_XORG= xpm +USE_XORG= xpm x11 xaw MAN6= sol.6 diff --git a/games/sol/files/patch-aa b/games/sol/files/patch-aa index 4d8940a..f94aa9f 100644 --- a/games/sol/files/patch-aa +++ b/games/sol/files/patch-aa @@ -7,8 +7,8 @@ -INCDIR = -I/usr/local/include -I/usr/X11R6/include \ - -I/usr/local/include/X11 -LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 -+INCDIR = -I${LOCALBASE}/include -I${X11BASE}/include -+LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib EXTRA_LIBS = -lSM -lICE # Irix at Ifi diff --git a/games/solarconquest/files/patch-makefile b/games/solarconquest/files/patch-makefile index 349e95e..16aa0fd 100644 --- a/games/solarconquest/files/patch-makefile +++ b/games/solarconquest/files/patch-makefile @@ -3,8 +3,8 @@ @@ -1,5 +1,5 @@ -LIBRARIES = `sdl-config --libs` -L/usr/X11R6/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg -CFLAGS = -w -O3 -I/usr/include/GL `sdl-config --cflags` -+LIBRARIES = `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg -+CXXFLAGS += `${SDL_CONFIG} --cflags` -I${X11BASE}/include ++LIBRARIES = `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg ++CXXFLAGS += `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include all: - g++ $(CFLAGS) -o solar ./source/main.cpp $(LIBRARIES) diff --git a/games/spacearyarya/Makefile b/games/spacearyarya/Makefile index afa0448..cb8b107 100644 --- a/games/spacearyarya/Makefile +++ b/games/spacearyarya/Makefile @@ -7,7 +7,7 @@ PORTNAME= spacearyarya PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \ ftp://ftp.uni-erlangen.de/.mirrors/ftpbsd/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \ @@ -18,12 +18,11 @@ DISTNAME= SpaceAryarya-KXL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Space Harrier, the ancient video game like game -BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl -RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl +BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl +RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl NO_CDROM= Possible copyright infringement -USE_X_PREFIX= yes GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile index 0eb0472..47f8db5 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -7,7 +7,7 @@ PORTNAME= spellcast PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.eblong.com/zarf/ftp/ DISTNAME= ${PORTNAME} @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Multiplayer fight with spells turn based game for X Window System -USE_X_PREFIX= yes +USE_XORG= x11 MAN6= spellcast.6 do-install: diff --git a/games/spellcast/files/patch-aa b/games/spellcast/files/patch-aa index dedeb30..ef61d96 100644 --- a/games/spellcast/files/patch-aa +++ b/games/spellcast/files/patch-aa @@ -5,13 +5,13 @@ #OTHERLIBS = -lbsdmalloc -CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \ -+CFLAGS += -I${X11BASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \ ++CFLAGS += -I${LOCALBASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \ -DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR) -LFLAGS = -g +LFLAGS = -XLIB = -L/usr/local/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 OBJS = engine.o espells.o execute.o execute2.o emonster.o etran.o XOBJS = main.o xtext.o xquery.o xloop.o xgest.o xbutton.o xtalk.o diff --git a/games/speyes/Makefile b/games/speyes/Makefile index d39d0c5..13ca504 100644 --- a/games/speyes/Makefile +++ b/games/speyes/Makefile @@ -16,6 +16,6 @@ COMMENT= WindowMaker dockapp/xeyes clone using SouthPark characters PLIST_FILES= bin/speyes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm .include <bsd.port.mk> diff --git a/games/ssamtse/Makefile b/games/ssamtse/Makefile index 1bb4ccf..16d632e 100644 --- a/games/ssamtse/Makefile +++ b/games/ssamtse/Makefile @@ -19,9 +19,9 @@ COMMENT= Serious Sam - The Second Encounter NO_BUILD= yes USE_BZIP2= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_PACKAGE= yes # distfiles must be downloaded manually, wierd legal issues etc etc etc. SSAMDIR= ${PREFIX}/ssam diff --git a/games/ssc/Makefile b/games/ssc/Makefile index c9ef114..8b61584 100644 --- a/games/ssc/Makefile +++ b/games/ssc/Makefile @@ -9,8 +9,7 @@ PORTNAME= ssc PORTVERSION= 0.8 PORTREVISION= 5 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME}x +MASTER_SITES= SF/${PORTNAME}x MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL arcade space shoot-em-up with interesting physics @@ -21,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_GCC= 3.2 USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_SDL= mixer sdl GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include" \ - LDFLAGS=-L${X11BASE}/lib +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS=-L${LOCALBASE}/lib ONLY_FOR_ARCHS= i386 .include <bsd.port.pre.mk> diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index d3a9524..1a33fd3 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -7,7 +7,7 @@ PORTNAME= stratagus PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF EXTRACT_SUFX= -src.tar.gz @@ -20,8 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_GMAKE= yes USE_LUA= 5.0 USE_SDL= sdl -USE_XLIB= yes -USE_GL= yes +USE_GL= gl GNU_CONFIGURE= yes CFLAGS+= -I${LUA_INCDIR} CONFIGURE_ENV= LDFLAGS="-L${LUA_LIBDIR} -lm" diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile index 8e79468..29cbc7c 100644 --- a/games/stvef-paks/Makefile +++ b/games/stvef-paks/Makefile @@ -19,12 +19,12 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux .pk3 files # Make this a BUILD_DEPENDS too, so that it can create the # directory hierarchy for us. -BUILD_DEPENDS= ${X11BASE}/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/games/stvef-server +BUILD_DEPENDS= ${LOCALBASE}/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/games/stvef-server RUN_DEPENDS= ${BUILD_DEPENDS} ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes EXTRACT_ONLY= # Don't extract anything GAMEDIR= ${PREFIX}/games/stvef/ diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile index 03e0a54..5ec35c1 100644 --- a/games/stvef-server/Makefile +++ b/games/stvef-server/Makefile @@ -17,7 +17,7 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux ONLY_FOR_ARCHS= i386 USE_ZIP= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/Linux INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile index 7456dfd..4ccdb87 100644 --- a/games/sxsame/Makefile +++ b/games/sxsame/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A tile-removing puzzle game for the X Window system USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm INSTALL_TARGET= install install.dir BINOWN= root BINGRP= games diff --git a/games/tank/Makefile b/games/tank/Makefile index 1ec3d66..e26d25a 100644 --- a/games/tank/Makefile +++ b/games/tank/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= -src.tar.gz MAINTAINER= erik@smluc.org COMMENT= A 3-D network tank game that uses OpenGL/Mesa -BUILD_DEPENDS= ${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux +BUILD_DEPENDS= ${LOCALBASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux USE_GMAKE= yes MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/games/tank/files/patch-Makefile.Linux.Mesa b/games/tank/files/patch-Makefile.Linux.Mesa index 92cd5a5..2f4debb 100644 --- a/games/tank/files/patch-Makefile.Linux.Mesa +++ b/games/tank/files/patch-Makefile.Linux.Mesa @@ -10,7 +10,7 @@ MESA = Mesa -INCLUDE = -I/usr/include -I$(MESA)/include -I$(MESA)/include/GL -+INCLUDE = -I$(X11BASE)/include -I$(X11BASE)/include/GL ++INCLUDE = -I$(LOCALBASE)/include -I$(LOCALBASE)/include/GL -CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \ - -pedantic -funroll-loops -mieee-fp @@ -18,7 +18,7 @@ + -pedantic -funroll-loops -LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib -+LDFLAGS = -L$(X11BASE)/lib ++LDFLAGS = -L$(LOCALBASE)/lib TAR = tar COMPRESS = compress -v diff --git a/games/tenebrae/files/patch-linux__Makefile.i386linux b/games/tenebrae/files/patch-linux__Makefile.i386linux index 73e7e69..9e038de 100644 --- a/games/tenebrae/files/patch-linux__Makefile.i386linux +++ b/games/tenebrae/files/patch-linux__Makefile.i386linux @@ -17,11 +17,11 @@ +#CC = /usr/bin/gcc -X11_LIBS = -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm -+X11_LIBS = -L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm # to enable OpenGL code in source -OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -+OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${X11BASE}/include ++OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${LOCALBASE}/include OPENGL_LIBS = -lGL -lGLU -PNG_LIBS = -lpng -lz diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile index d7e1e10..203174e 100644 --- a/games/thevalley/Makefile +++ b/games/thevalley/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_SDL= sdl USE_PERL5_BUILD=yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" + CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" PLIST_FILES= bin/valley diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile index abe0c96..0fff303 100644 --- a/games/tomatoes/Makefile +++ b/games/tomatoes/Makefile @@ -21,7 +21,7 @@ TDATA= ${WRKDIR}/tomatoes-${PORTVERSION} USE_BZIP2= yes USE_SDL= mixer image -USE_GL= yes +USE_GL= gl USE_GMAKE= yes MAKEFILE= makefile MAKE_ARGS= CC="${CXX}" \ @@ -39,9 +39,9 @@ PLIST_FILES= bin/tomatoes \ PLIST_DIRS= %%DATADIR%%/music \ %%DATADIR%% -SDL_CFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include +SDL_CFLAGS= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include SDL_LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer \ - -L${X11BASE}/lib -lGL -lGLU + -L${LOCALBASE}/lib -lGL -lGLU .include <bsd.port.pre.mk> diff --git a/games/tome/Makefile b/games/tome/Makefile index ad59939..9ee6adc 100644 --- a/games/tome/Makefile +++ b/games/tome/Makefile @@ -7,7 +7,7 @@ PORTNAME= tome PORTVERSION= 2.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://t-o-m-e.net/dl/src/ DISTNAME= tome-234-src @@ -30,15 +30,15 @@ DESKTOP_ENTRIES= "ToME" "Roguelike game based on JRR Tolkien's work" \ .include <bsd.port.pre.mk> .ifndef (WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .endif post-patch: .ifdef (WITHOUT_X11) ${REINPLACE_CMD} -e 's/-DUSE_X11//g' ${WRKSRC}/${MAKEFILE} ${REINPLACE_CMD} -e 's/-lX11//g' ${WRKSRC}/${MAKEFILE} - ${REINPLACE_CMD} -e 's@-L$$(X11BASE)/lib@@g' ${WRKSRC}/${MAKEFILE} - ${REINPLACE_CMD} -e 's@-I$$(X11BASE)/include@@g' ${WRKSRC}/${MAKEFILE} + ${REINPLACE_CMD} -e 's@-L$$(LOCALBASE)/lib@@g' ${WRKSRC}/${MAKEFILE} + ${REINPLACE_CMD} -e 's@-I$$(LOCALBASE)/include@@g' ${WRKSRC}/${MAKEFILE} .endif .include <bsd.port.post.mk> diff --git a/games/toycars/Makefile b/games/toycars/Makefile index 822d288..7d2d4d0f 100644 --- a/games/toycars/Makefile +++ b/games/toycars/Makefile @@ -22,8 +22,8 @@ USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}lib" PORTDOCS= README diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 875c852..cff3863 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -8,8 +8,7 @@ PORTNAME= trackballs PORTVERSION= 1.1.4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ganael.laplanche@martymac.com COMMENT= SDL-based Marble Madness clone @@ -17,7 +16,7 @@ COMMENT= SDL-based Marble Madness clone LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_GL= yes +USE_GL= gl USE_SDL= image mixer sdl ttf USE_GETTEXT= yes USE_GMAKE= yes @@ -30,8 +29,8 @@ MAKE_ARGS= mkinstalldirs="${MKDIR}" MAN6= ${PORTNAME}.6 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -lintl post-patch: @${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \ diff --git a/games/tremor/Makefile b/games/tremor/Makefile index 5e9dad9..8bd425d 100644 --- a/games/tremor/Makefile +++ b/games/tremor/Makefile @@ -7,7 +7,7 @@ PORTNAME= tremor PORTVERSION= 3.2.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \ http://tremor.quakedev.com/:data @@ -25,9 +25,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip USE_BZIP2= yes -USE_GCC= 3.4+ -USE_GL= gl -USE_XORG= xxf86dga +USE_GL= gl glu +USE_XORG= x11 xxf86dga USE_GMAKE= yes ALL_TARGET= release diff --git a/games/tremor/files/patch-Makefile b/games/tremor/files/patch-Makefile index 64c76ac..033c883 100644 --- a/games/tremor/files/patch-Makefile +++ b/games/tremor/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Jan 17 06:19:35 2007 -+++ Makefile Wed Feb 14 15:40:17 2007 -@@ -21,51 +21,44 @@ +--- ./Makefile.orig 2007-01-17 10:19:35.000000000 +0100 ++++ ./Makefile 2008-04-13 17:38:19.000000000 +0200 +@@ -21,51 +21,42 @@ BUILD_DEBUG_DIR=debug_build BUILD_RELEASE_DIR=release_build @@ -40,7 +40,6 @@ -X11BASE=/usr/X11R6 +LOCALBASE?=/usr/local +GAMEBASE=$(LOCALBASE) -+X11BASE?=/usr/X11R6 SYSBINDIR=$(LOCALBASE)/bin -DATADIR= $(GAMEBASE)/games/quake - @@ -54,7 +53,7 @@ -BASE_CFLAGS+= \ +BASE_CFLAGS+= $(CFLAGS) \ -I$(LOCALBASE)/include \ - -I$(X11BASE)/include \ +- -I$(X11BASE)/include \ -Dstricmp=strcasecmp \ -DGLQUAKE -ifeq ($(ARCH),i386) @@ -65,7 +64,7 @@ DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb -Wall RELEASE_CFLAGS+=$(BASE_CFLAGS) \ -fno-strict-aliasing \ -@@ -76,9 +69,6 @@ +@@ -76,9 +67,6 @@ -falign-loops=2 \ -falign-jumps=2 \ -falign-functions=2 @@ -75,7 +74,13 @@ endif ifeq ($(strip $(STRIP)),YES) -@@ -107,7 +97,7 @@ +@@ -102,12 +90,11 @@ + + X_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \ + -lX11 -lXext -lXxf86vm -lXxf86dga +-GLX_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \ +- -L$(LOCALBASE)/lib$(ARCH_LIBDIR) \ ++GLX_LDFLAGS=-L$(LOCALBASE)/lib$(ARCH_LIBDIR) \ -lGL -lGLU -ljpeg `libpng-config --libs` @@ -84,7 +89,7 @@ SDL_CFLAGS=$(shell $(SDL_CONFIG) --cflags) SDL_LDFLAGS=$(shell $(SDL_CONFIG) --libs) -@@ -405,4 +395,4 @@ +@@ -405,4 +392,4 @@ @echo @printf "Type tremor as user to start playing.\n" @echo ..... diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile index 1eefd81..3cb730e 100644 --- a/games/tremulous/Makefile +++ b/games/tremulous/Makefile @@ -7,7 +7,7 @@ PORTNAME= tremulous PORTVERSION= 1.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S|$|${PORTNAME}/|} \ http://0day.icculus.org/mirrors/tremulous/ \ @@ -74,8 +74,8 @@ MAKE_ENV+= USE_SDL_AUDIO=1 USE_SDL= sdl MAKE_ENV+= USE_SDL_VIDEO=1 . else -USE_GL= yes -USE_XLIB= yes +USE_GL= gl +USE_XORG= x11 xxf86dga . endif # Vorbis . if defined(WITH_VORBIS) diff --git a/games/tremulous/files/patch-Makefile b/games/tremulous/files/patch-Makefile index 270ac4a..705c84b 100644 --- a/games/tremulous/files/patch-Makefile +++ b/games/tremulous/files/patch-Makefile @@ -77,7 +77,7 @@ + BASE_CFLAGS = -I$(LOCALBASE)/include -DARCH='\"$(ARCH)\"' -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - GL_CFLAGS = -I/usr/X11R6/include -+ GL_CFLAGS = -I$(X11BASE)/include ++ GL_CFLAGS = -I$(LOCALBASE)/include DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe @@ -159,7 +159,7 @@ + endif + + ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ifeq ($(USE_OPENAL),1) diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile index d5c9c3b..6d56190 100644 --- a/games/tux-aqfh/Makefile +++ b/games/tux-aqfh/Makefile @@ -7,25 +7,23 @@ PORTNAME= tux_aqfh PORTVERSION= 1.0.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://tuxaqfh.sourceforge.net/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL adventure game -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-plib=${X11BASE} +CONFIGURE_ARGS= --with-plib=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lusbhid ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS} post-patch: @${REINPLACE_CMD} -e \ diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile index b3c03d3..e107661 100644 --- a/games/tuxkart/Makefile +++ b/games/tuxkart/Makefile @@ -7,22 +7,21 @@ PORTNAME= tuxkart PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://tuxkart.sourceforge.net/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL action kart racing game -BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= gl USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lusbhid" -CONFIGURE_ARGS= --with-plib=${X11BASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lusbhid" +CONFIGURE_ARGS= --with-plib=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \ diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile index 3f74d42..030acbd 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -9,8 +9,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 PORTREVISION= 6 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=tuxracer +MASTER_SITES= SF/tuxracer DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ ${PORTNAME}-data-${PORTVERSION}.tar.gz @@ -20,7 +19,7 @@ COMMENT= A 3d penguin racing game using OpenGL LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:261 AUTOMAKE_ARGS= -a @@ -28,8 +27,8 @@ CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}" MAKE_ENV= ${CONFIGURE_ENV} CONFIGURE_ARGS= --with-tcl-inc="${LOCALBASE}/include/tcl8.3" \ --with-tcl-libs="${LOCALBASE}/lib" \ - --with-gl-libs="${X11BASE}/lib" \ - --with-gl-inc="${X11BASE}/include" \ + --with-gl-libs="${LOCALBASE}/lib" \ + --with-gl-inc="${LOCALBASE}/include" \ --with-data-dir=${PREFIX}/share/tuxracer WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION} diff --git a/games/tvp/Makefile b/games/tvp/Makefile index cfc6277..c9c32d7 100644 --- a/games/tvp/Makefile +++ b/games/tvp/Makefile @@ -14,17 +14,15 @@ MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/ MAINTAINER= ports@FreeBSD.org COMMENT= Play the cardgame President (or Ass) against 3 AIs - USE_TK= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/tcl8.4 \ -I${LOCALBASE}/include/tk8.4" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \ + LIBS="-L${LOCALBASE}/lib \ -ltcl84 -ltk84 -lX11 -lm" #CFLAGS+= -lX11 -lm -ltcl84 -ltk84 \ -# -L${LOCALBASE}/lib -L${X11BASE}/lib +# -L${LOCALBASE}/lib USE_PERL5_BUILD=yes MAN6= tvp.6 diff --git a/games/uqm/Makefile b/games/uqm/Makefile index 63addab..ab47a06 100644 --- a/games/uqm/Makefile +++ b/games/uqm/Makefile @@ -92,7 +92,7 @@ do-configure: @${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/sc2/config.state @${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/sc2/config.state @${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/sc2/config.state - cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} PREFIX=${PREFIX} ./build.sh uqm config + cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config do-build: cd ${WRKSRC}/sc2 && ./build.sh uqm diff --git a/games/uqm/files/patch-build-unix-config_proginfo_host b/games/uqm/files/patch-build-unix-config_proginfo_host index c25505c..fe744a2 100644 --- a/games/uqm/files/patch-build-unix-config_proginfo_host +++ b/games/uqm/files/patch-build-unix-config_proginfo_host @@ -28,8 +28,8 @@ FreeBSD|OpenBSD) - LIB_opengl_CFLAGS="-I/usr/X11R6/include -D_THREAD_SAFE" - LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lX11 -lXext -pthread -lGL" -+ LIB_opengl_CFLAGS="-I${X11BASE}/include -D_THREAD_SAFE" -+ LIB_opengl_LDFLAGS="-L${X11BASE}/lib -lX11 -lXext -pthread -lGL" ++ LIB_opengl_CFLAGS="-I${LOCALBASE}/include -D_THREAD_SAFE" ++ LIB_opengl_LDFLAGS="-L${LOCALBASE}/lib -lX11 -lXext -pthread -lGL" ;; MINGW32*|CYGWIN*) LIB_opengl_CFLAGS="" diff --git a/games/vamos/Makefile b/games/vamos/Makefile index 1135639..4c10020 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -24,8 +24,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" -CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ - ac_cv_header_boost_test_unit_test_hpp=no +CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no USE_LDCONFIG= yes INFO= vamos diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile index 46d18a8..df0eb31 100644 --- a/games/vectoroids/Makefile +++ b/games/vectoroids/Makefile @@ -7,14 +7,13 @@ PORTNAME= vectoroids PORTVERSION= 1.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/ MAINTAINER= ports@FreeBSD.org COMMENT= A vector-based, pretty, Asteroids clone -USE_X_PREFIX= yes USE_SDL= image mixer sdl USE_GMAKE= yes diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile index 44da79a..54892ef 100644 --- a/games/warsow/files/patch-Makefile +++ b/games/warsow/files/patch-Makefile @@ -1,10 +1,12 @@ ---- Makefile Thu Jun 8 22:44:02 2006 -+++ Makefile Sat Aug 19 20:50:05 2006 -@@ -19,14 +19,14 @@ +--- Makefile.orig 2006-06-08 22:44:02.000000000 +0200 ++++ Makefile 2008-04-11 13:18:40.000000000 +0200 +@@ -18,15 +18,15 @@ + CC?=gcc - CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D__linux__ -Wall +-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D__linux__ -Wall -CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops ++CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -D__linux__ -Wall +CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops CFLAGS_DEBUG=-O0 -ggdb -DDEBUG CFLAGS_COMMON+=$(CFLAGS_RELEASE) diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile index c5b951e..f5d6779 100644 --- a/games/wmeyes/Makefile +++ b/games/wmeyes/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The world's most useless WindowMaker dock app USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes PORTDOCS= README diff --git a/games/wmfortune/Makefile b/games/wmfortune/Makefile index f2da82e..6d186be 100644 --- a/games/wmfortune/Makefile +++ b/games/wmfortune/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmfortune PORTVERSION= 0.241 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games windowmaker afterstep MASTER_SITES= http://dockapps.org/files/90/128/ @@ -16,8 +16,7 @@ COMMENT= A dockapp that outputs fortune messages PLIST_FILES= bin/wmfortune USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmfortune ${PREFIX}/bin diff --git a/games/wmfortune/files/patch-Makefile b/games/wmfortune/files/patch-Makefile index b90d32a..45e2de1 100644 --- a/games/wmfortune/files/patch-Makefile +++ b/games/wmfortune/files/patch-Makefile @@ -8,8 +8,8 @@ $FreeBSD$ -############################ +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -I/usr/local/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include -I/usr/local/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 +OBJS = wmfortune.o dockapp.o diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile index 8e6566b..8379208 100644 --- a/games/wmminichess/Makefile +++ b/games/wmminichess/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmminichess PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.insanum.com/miniCHESS/ DISTNAME= miniCHESS-${PORTVERSION} @@ -18,8 +18,7 @@ COMMENT= Window Maker chess dockapp game RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess USE_GMAKE= YES -USE_X_PREFIX= YES -USE_XPM= YES +USE_XORG= xpm MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \ INSTALL_DATA="${INSTALL_DATA}" diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile index 6aeac4b..ff93d23 100644 --- a/games/wmpuzzle/Makefile +++ b/games/wmpuzzle/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmpuzzle PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games windowmaker afterstep MASTER_SITES= http://www.godisch.de/debian/wmpuzzle/ @@ -16,8 +16,7 @@ COMMENT= A dockable puzzle game for WindowMaker and AfterStep WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -26,8 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= wmpuzzle.6 PLIST_FILES= bin/wmpuzzle -CPPFLAGS= -I${X11BASE}/include -DBSD -LDFLAGS= -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -DBSD +LDFLAGS= -L${LOCALBASE}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmpuzzle ${PREFIX}/bin diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile index b0085c0..43f6673 100644 --- a/games/wmqstat/Makefile +++ b/games/wmqstat/Makefile @@ -16,7 +16,7 @@ COMMENT= A dockapp for monitoring of various Internet game servers RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat -USE_XORG= xpm +USE_XORG= xpm x11 xext PLIST_FILES= bin/${PORTNAME} PORTDOCS= README diff --git a/games/wmqstat/files/patch-Makefile b/games/wmqstat/files/patch-Makefile index 6968db3..28882d2 100644 --- a/games/wmqstat/files/patch-Makefile +++ b/games/wmqstat/files/patch-Makefile @@ -1,15 +1,17 @@ ---- Makefile.orig Fri Apr 25 05:00:09 2003 -+++ Makefile Fri Apr 25 05:00:40 2003 +--- ./Makefile.orig 2003-04-24 21:31:39.000000000 +0200 ++++ ./Makefile 2008-04-13 13:00:54.000000000 +0200 @@ -1,14 +1,11 @@ -CC = cc -+CC ?= cc - +- -X11BASE = /usr/X11R6 - LDIR = -L${X11BASE}/lib - IDIR = -I${X11BASE}/include +-LDIR = -L${X11BASE}/lib +-IDIR = -I${X11BASE}/include ++CC ?= cc -INSTALL = install -- ++LDIR = -L${LOCALBASE}/lib ++IDIR = -I${LOCALBASE}/include + LIBS = -lX11 -lXpm -lXext -CFLAGS = -O -pipe -s -Wall @@ -17,13 +19,12 @@ OBJS = appcore/wmqstat.o\ appcore/srv_proc.o\ -@@ -22,9 +19,6 @@ - +@@ -23,8 +20,5 @@ all: ${OBJS} ${CC} ${CFLAGS} -o wmqstat ${OBJS} ${LDIR} ${LIBS} -- + -install: - ${INSTALL} -o root -g wheel -m 755 wmqstat ${X11BASE}/bin - +- clean: rm -f wmqstat appcore/*.o wmgeneral/*.o core diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile index 09955aa..4b1b93f 100644 --- a/games/wmshuffle/Makefile +++ b/games/wmshuffle/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmshuffle PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games windowmaker afterstep MASTER_SITES= http://www.linuks.mine.nu/dockapp/ \ http://freebsd.nsu.ru/distfiles/ @@ -16,8 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dockable Shuffle game for WindowMaker and AfterStep USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm post-install: @${MKDIR} ${DATADIR} diff --git a/games/wmshuffle/files/patch-aa b/games/wmshuffle/files/patch-aa index d8a5491..a717532 100644 --- a/games/wmshuffle/files/patch-aa +++ b/games/wmshuffle/files/patch-aa @@ -4,8 +4,8 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 OBJS = wmshuffle.o ./wmgeneral/wmgeneral.o diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile index 0156be2..efc22be 100644 --- a/games/wmtictactoe/Makefile +++ b/games/wmtictactoe/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmtictactoe PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games windowmaker afterstep MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jim @@ -19,8 +19,7 @@ COMMENT= A dockable TicTacToe game for WindowMaker and AfterStep PLIST_FILES= bin/wmtictactoe USE_GMAKE= yes WRKSRC= ${WRKDIR}/wmtictactoe.app/wmtictactoe -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm post-install: @${ECHO} "===> Run 'wmtictactoe --help' for the available options" diff --git a/games/wmtictactoe/files/patch-aa b/games/wmtictactoe/files/patch-aa index 634a6e7..9a25147 100644 --- a/games/wmtictactoe/files/patch-aa +++ b/games/wmtictactoe/files/patch-aa @@ -4,8 +4,8 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS += -c -Wall -+INCLUDES = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCLUDES = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 OBJS = wmtictactoe.o ../wmgeneral/wmgeneral.o diff --git a/games/wmtimebomb/files/patch-aa b/games/wmtimebomb/files/patch-aa index 37475fc..e512956 100644 --- a/games/wmtimebomb/files/patch-aa +++ b/games/wmtimebomb/files/patch-aa @@ -4,11 +4,11 @@ -XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lgif -WMAKER = -L/usr/local/lib -lWMaker -lWINGs -lwraster -lPropList +XPMLIB = `pkg-config --libs WINGs wmlib wrlib` -+WMAKER = -L${X11BASE}/lib -lWMaker ++WMAKER = -L${LOCALBASE}/lib -lWMaker LOCAL_LIBRARIES = $(WMAKER) $(XPMLIB) $(XLIB) -+EXTRA_INCLUDES= `pkg-config --cflags WINGs wmlib wrlib` -I${X11BASE}/include ++EXTRA_INCLUDES= `pkg-config --cflags WINGs wmlib wrlib` -I${LOCALBASE}/include + SRCS = timebomb.c OBJS = timebomb.o diff --git a/games/wolf3d/files/patch-Makefile b/games/wolf3d/files/patch-Makefile index ad46434..db0d3b6 100644 --- a/games/wolf3d/files/patch-Makefile +++ b/games/wolf3d/files/patch-Makefile @@ -31,8 +31,8 @@ SLFLAGS = $(LFLAGS) -lvga -XLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11 -lXext -DLFLAGS = $(LFLAGS) `sdl-config --libs` -L/usr/X11R6/lib -lX11 -lXext -+XLFLAGS = $(LFLAGS) -L$(X11BASE)/lib -lX11 -lXext -+DLFLAGS = $(LFLAGS) `$(SDL_CONFIG) --libs` -L$(X11BASE)/lib -lX11 -lXext ++XLFLAGS = $(LFLAGS) -L$(LOCALBASE)/lib -lX11 -lXext ++DLFLAGS = $(LFLAGS) `$(SDL_CONFIG) --libs` -L$(LOCALBASE)/lib -lX11 -lXext NASM = nasm diff --git a/games/worldofpadman/files/patch-Makefile b/games/worldofpadman/files/patch-Makefile index 1375957..bbaf239 100644 --- a/games/worldofpadman/files/patch-Makefile +++ b/games/worldofpadman/files/patch-Makefile @@ -131,7 +131,7 @@ + BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - GL_CFLAGS = -I/usr/X11R6/include -+ GL_CFLAGS = -I$(X11BASE)/include ++ GL_CFLAGS = -I$(LOCALBASE)/include DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe @@ -228,7 +228,7 @@ + endif + + ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ifeq ($(USE_OPENAL),1) diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index a07f582..61d791f 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -7,7 +7,7 @@ PORTNAME= xarchon PORTVERSION= 0.50 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ftp://ftp.seul.org/pub/xarchon/ \ http://xarchon.seul.org/ @@ -16,10 +16,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A chess-like strategy game with battle options -USE_XLIB= yes USE_GNOME= esound gtk12 USE_GMAKE= yes -USE_XPM= yes +USE_XORG= x11 xpm ice GNU_CONFIGURE= yes MAN6= xarchon.6 diff --git a/games/xataxx/files/patch-aa b/games/xataxx/files/patch-aa index a889bc3..ca0d01a 100644 --- a/games/xataxx/files/patch-aa +++ b/games/xataxx/files/patch-aa @@ -11,7 +11,7 @@ /* DATADIR is where the boards and bitmaps will be installed */ -DATADIR = /afs/andrew.cmu.edu/usr0/games/lib/xataxx -+DATADIR = $(X11BASE)/share/xataxx ++DATADIR = $(LOCALBASE)/share/xataxx LOCAL_LIBRARIES = $(XLIB) SRCS = bits.c board.c colbits.c demo.c display.c main.c nubot.c parse.c zot.c diff --git a/games/xbl/Makefile b/games/xbl/Makefile index 667e916..e3ad50e 100644 --- a/games/xbl/Makefile +++ b/games/xbl/Makefile @@ -7,16 +7,16 @@ PORTNAME= xbl PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www710.univ-lyon1.fr/~exco/XBL/ GENTOO/distfiles MAINTAINER= ports@FreeBSD.org COMMENT= A 3D block-dropping game -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -USE_X_PREFIX= yes +USE_XORG= x11 xext GNU_CONFIGURE= yes MAN1= xbl.1 diff --git a/games/xblood/Makefile b/games/xblood/Makefile index 8f6c708..8511fb9 100644 --- a/games/xblood/Makefile +++ b/games/xblood/Makefile @@ -7,15 +7,14 @@ PORTNAME= xblood PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ MAINTAINER= ports@FreeBSD.org COMMENT= Makes the root window bloody -USE_X_PREFIX= yes - +USE_XORG= x11 MAN1= xblood.1 MANCOMPRESSED= yes PLIST_FILES= bin/xblood diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 47e3283..5b3b567 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -24,9 +24,6 @@ STRIP= MAN6= xboard.6 zic2xpm.6 INFO= xboard -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include - .if defined(WITH_XAW3D) CONFIGURE_ARGS+= "--with-Xaw3d" LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d diff --git a/games/xboing/files/patch-ac b/games/xboing/files/patch-ac index 0d9f524..c93c8dd 100644 --- a/games/xboing/files/patch-ac +++ b/games/xboing/files/patch-ac @@ -5,7 +5,7 @@ XCOMM placed. Default will be the current directory. - XBOING_DIR = . -+ XBOING_DIR = ${X11BASE}/lib/X11/xboing ++ XBOING_DIR = ${LOCALBASE}/lib/X11/xboing XCOMM These are some defines that must be set. Some may be overwritten in the XCOMM machine arch section. @@ -13,7 +13,7 @@ - XPMLIB = -L/usr/X11/lib -lXpm - XPMINCLUDE = -I/usr/X11/include/X11 + XPMLIB = -lXpm -+ XPMINCLUDE = -I${X11BASE}/include/X11 ++ XPMINCLUDE = -I${LOCALBASE}/include/X11 XBOINGINCLUDE = -I./include LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels SOUNDS_DIR = $(XBOING_DIR)/sounds diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index 6cf7112..0d62591 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= bin/xbomb \ PLIST_DIRS= lib/X11/xbomb do-build: - cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DX11BASE=\"${X11BASE}\" \ + cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DLOCALBASE=\"${LOCALBASE}\" \ `pkg-config --cflags xaw8` *.c -o xbomb \ `pkg-config --libs xaw8` diff --git a/games/xbomb/files/patch-hiscore.c b/games/xbomb/files/patch-hiscore.c index 5ea85294..6d7a940 100644 --- a/games/xbomb/files/patch-hiscore.c +++ b/games/xbomb/files/patch-hiscore.c @@ -5,9 +5,9 @@ /*+ The names of the high score tables. +*/ -static char *filenames[NTYPES]={"/var/tmp/xbomb6.hi","/var/tmp/xbomb4.hi","/var/tmp/xbomb3.hi"}; -+static char *filenames[NTYPES]={X11BASE"/lib/X11/xbomb/xbomb6.hi", -+ X11BASE"/lib/X11/xbomb/xbomb4.hi", -+ X11BASE"/lib/X11/xbomb/xbomb3.hi"}; ++static char *filenames[NTYPES]={LOCALBASE"/lib/X11/xbomb/xbomb6.hi", ++ LOCALBASE"/lib/X11/xbomb/xbomb4.hi", ++ LOCALBASE"/lib/X11/xbomb/xbomb3.hi"}; /*+ The names of the positions in the high score tables. +*/ static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"}; diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile index a57b38e..8518138 100644 --- a/games/xbomber/Makefile +++ b/games/xbomber/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbomber PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.billsgames.com/unix/x/xbomber/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -16,8 +16,8 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= A game based on "Super Bomberman" for the Super Nintendo WRKSRC= ${WRKDIR}/${PORTNAME} +USE_XORG= x11 -USE_X_PREFIX= yes MAKEFILE= makefile do-install: diff --git a/games/xbomber/files/patch-aa b/games/xbomber/files/patch-aa index f2dcd11..d4e650e 100644 --- a/games/xbomber/files/patch-aa +++ b/games/xbomber/files/patch-aa @@ -8,7 +8,7 @@ +CC?=gcc MATHLIB=-lm -CFLAGS=-I/usr/X11/include -+CFLAGS+=-I${X11BASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\" ++CFLAGS+=-I${LOCALBASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\" # Change this to "touch" if your system doesn't have the "strip" command: POSTPROCESS=strip @@ -22,7 +22,7 @@ # uncomment for FreeBSD -#XLIB=-L /usr/X11R6/lib -lX11 -lcompat -+XLIB=-L${X11BASE}/lib -lX11 -lcompat ++XLIB=-L${LOCALBASE}/lib -lX11 -lcompat # End of makefile user-definable variables----------------------------------- diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile index 8fe9be1..4b2e7e8 100644 --- a/games/xbubble/Makefile +++ b/games/xbubble/Makefile @@ -6,7 +6,7 @@ PORTNAME= xbubble PORTVERSION= 0.5.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles @@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png MAN6= xbubble.6 -USE_X_PREFIX= yes +USE_XORG= x11 xmu GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/games/xcheckers/Makefile b/games/xcheckers/Makefile index 9494083..f2d19b2 100644 --- a/games/xcheckers/Makefile +++ b/games/xcheckers/Makefile @@ -23,7 +23,7 @@ post-patch: @${REINPLACE_CMD} '/^#/d' ${WRKSRC}/Local.config pre-install: - @${REINPLACE_CMD} 's:@X11BASE@:${X11BASE}:g' \ + @${REINPLACE_CMD} 's:@LOCALBASE@:${LOCALBASE}:g' \ ${WRKSRC}/xcheckers.src/xcheckers.man .include <bsd.port.mk> diff --git a/games/xcheckers/files/patch-xcheckers.src_xcheckers.man b/games/xcheckers/files/patch-xcheckers.src_xcheckers.man index a5cd640..5d4a4da 100644 --- a/games/xcheckers/files/patch-xcheckers.src_xcheckers.man +++ b/games/xcheckers/files/patch-xcheckers.src_xcheckers.man @@ -8,7 +8,7 @@ $FreeBSD$ .I ~/.xcheckersrc and in -.I /usr/lib/X11/app-defaults/XCheckers. -+.I @X11BASE@/lib/X11/app-defaults/XCheckers. ++.I @LOCALBASE@/lib/X11/app-defaults/XCheckers. (First mentioned places overriding) .TP @@ -17,13 +17,13 @@ $FreeBSD$ .SH FILES -.I /usr/lib/X11/app-defaults/XCheckers, -+.I @X11BASE@/lib/X11/app-defaults/XCheckers, ++.I @LOCALBASE@/lib/X11/app-defaults/XCheckers, .br -.I /usr/lib/X11/xcheckers/scene.xpm, -+.I @X11BASE@/share/xcheckers/scene.xpm, ++.I @LOCALBASE@/share/xcheckers/scene.xpm, .br -.I /usr/lib/X11/xcheckers/stars.xpm -+.I @X11BASE@/share/xcheckers/stars.xpm ++.I @LOCALBASE@/share/xcheckers/stars.xpm .SH SEE ALSO .BR simplech (6), diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile index 86141b6..25d24f6 100644 --- a/games/xcogitate/Makefile +++ b/games/xcogitate/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcogitate PORTVERSION= 1.02 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mph @@ -16,12 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A logic game with board and stones PLIST_FILES= bin/xcogitate -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/XCOGITATE_SOURCE do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include -o xcogitate xcogitate.c -L${X11BASE}/lib -lX11 -lXpm + cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -o xcogitate xcogitate.c -L${LOCALBASE}/lib -lX11 -lXpm do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xcogitate ${PREFIX}/bin diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile index 81ef274..6e2592d 100644 --- a/games/xdeblock/Makefile +++ b/games/xdeblock/Makefile @@ -18,7 +18,7 @@ COMMENT= Block action game WRKSRC= ${WRKDIR}/xdeblo_v1.0 USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes post-patch: diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile index f92feff..e5de4bd 100644 --- a/games/xdemineur/Makefile +++ b/games/xdemineur/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Another minesweeper game for the X Window System USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xdemineur.1 PLIST_FILES= bin/xdemineur diff --git a/games/xdesktopwaves/Makefile b/games/xdesktopwaves/Makefile index dc24ca2..f1976b7 100644 --- a/games/xdesktopwaves/Makefile +++ b/games/xdesktopwaves/Makefile @@ -7,17 +7,15 @@ PORTNAME= xdesktopwaves PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Simulation of water waves on the desktop -USE_X_PREFIX= yes - MAN1= xdesktopwaves.1 +USE_XORG= x11 xext PLIST_FILES= bin/xdesktopwaves diff --git a/games/xdesktopwaves/files/patch-makefile b/games/xdesktopwaves/files/patch-makefile index ab57a74a..a4eacbc 100644 --- a/games/xdesktopwaves/files/patch-makefile +++ b/games/xdesktopwaves/files/patch-makefile @@ -7,22 +7,22 @@ -CC = gcc -CFLAGS = -I/usr/X11R6/include -O2 +#CC = gcc -+CFLAGS += -I$(X11BASE)/include ++CFLAGS += -I$(LOCALBASE)/include #============================= Linker configuration ============================ -LINK = gcc -LFLAGS = -L/usr/X11R6/lib +LINK = $(CC) -+LFLAGS = -L$(X11BASE)/lib ++LFLAGS = -L$(LOCALBASE)/lib LIBS = -lm -lX11 -lXext #============================ Installer configuration ========================== -BINDIR = /usr/X11R6/bin -MAN1DIR = /usr/X11R6/man/man1 -+BINDIR = $(X11BASE)/bin -+MAN1DIR = $(X11BASE)/man/man1 ++BINDIR = $(LOCALBASE)/bin ++MAN1DIR = $(LOCALBASE)/man/man1 INSTALL = install RM = rm -f -v diff --git a/games/xevil/Makefile b/games/xevil/Makefile index 27662ad..ba410fb 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -7,7 +7,7 @@ PORTNAME= xevil PORTVERSION= 2.02.r2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.xevil.com/download/stable/ DISTNAME= xevilsrc${PORTVERSION:S/.r/r/} @@ -15,9 +15,8 @@ DISTNAME= xevilsrc${PORTVERSION:S/.r/r/} MAINTAINER= ports@FreeBSD.org COMMENT= A fast-action, networked, anti-social, kill-everything game -USE_X_PREFIX= yes USE_ZIP= yes -USE_XPM= yes +USE_XORG= xpm MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MAKEFILE= makefile ALL_TARGET= freebsd diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-aa index 5ef4b4f..a786c4e 100644 --- a/games/xevil/files/patch-aa +++ b/games/xevil/files/patch-aa @@ -29,7 +29,7 @@ -INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \ + @$(MAKE) CC="${CXX}" \ +CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \ -+INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \ ++INCL_DIRS="-I$(LOCALBASE)/include" LIBS_DIRS="-L$(LOCALBASE)/lib" \ OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \ LIBS="-lXpm -lX11 -lm" $(TARGETS) diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile index 830ba9c..4f740d1 100644 --- a/games/xeyesplus/Makefile +++ b/games/xeyesplus/Makefile @@ -7,7 +7,7 @@ PORTNAME= xeyes+ PORTVERSION= 2.02 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.asahi-net.or.jp/~fj9y-ynym/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -15,14 +15,13 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Horrible eyes looking at your mouse cursor -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm PLIST_FILES= bin/xeyes+ do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include -DXPM -DUSLEEP \ - -o xeyes+ xeyes+.c -L${X11BASE}/lib -lX11 -lXpm -lm + cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -DXPM -DUSLEEP \ + -o xeyes+ xeyes+.c -L${LOCALBASE}/lib -lX11 -lXpm -lm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xeyes+ ${PREFIX}/bin diff --git a/games/xfireworks/Makefile b/games/xfireworks/Makefile index 2fa8b486..92265d1 100644 --- a/games/xfireworks/Makefile +++ b/games/xfireworks/Makefile @@ -7,15 +7,14 @@ PORTNAME= xfireworks PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ MAINTAINER= ports@FreeBSD.org COMMENT= Fireworks on X -USE_X_PREFIX= yes - +USE_XORG= x11 MAN1= xfireworks.1 do-install: diff --git a/games/xfireworks/files/patch-aa b/games/xfireworks/files/patch-aa index 508d6c9..dd7d742 100644 --- a/games/xfireworks/files/patch-aa +++ b/games/xfireworks/files/patch-aa @@ -1,8 +1,8 @@ ---- Makefile~ Fri Nov 3 05:36:55 2000 -+++ Makefile Fri Nov 3 05:38:11 2000 -@@ -1,7 +1,7 @@ - VERSION = XFireworks-1.3 - PKGNAME = xfireworks-1.3 +--- ./Makefile.orig 2000-08-06 04:00:44.000000000 +0200 ++++ ./Makefile 2008-04-13 01:15:22.000000000 +0200 +@@ -1,18 +1,18 @@ + VERSION = XFireworks-1.4 + PKGNAME = xfireworks-1.4 -PREFIX = /usr/X11R6 -X11BASE = /usr/X11R6 +#PREFIX = /usr/X11R6 @@ -10,9 +10,12 @@ BINDIR = $(PREFIX)/bin LIBDIR = $(PREFIX)/etc -@@ -10,9 +10,9 @@ - XINCLUDEDIR = $(X11BASE)/include - XLIBDIR = $(X11BASE)/lib + MANDIR = $(PREFIX)/man/man1 + +-XINCLUDEDIR = $(X11BASE)/include +-XLIBDIR = $(X11BASE)/lib ++XINCLUDEDIR = $(LOCALBASE)/include ++XLIBDIR = $(LOCALBASE)/lib -CFLAGS = -O +#CFLAGS = -O diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 58c11a6..4ba26c4 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfrisk PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://tuxick.net/xfrisk/files/ DISTNAME= XFrisk-${PORTVERSION} @@ -19,10 +19,8 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d NO_CDROM= Possible trademark infringement -USE_X_PREFIX= yes NO_INSTALL_MANPAGES= yes WRKSRC= ${WRKDIR}/XFrisk USE_GMAKE= yes -MAKE_ENV+= XDIR=${X11BASE} .include <bsd.port.mk> diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 0412ba5..862b30f 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -7,21 +7,18 @@ PORTNAME= xgalaga PORTVERSION= 2.0.34 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://people.FreeBSD.org/~linimon/public_distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= Galaga resurrected on X -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xmu HAS_CONFIGURE= yes # xgalaga has a very strange usage of these variables... -CONFIGURE_ARGS= --prefix=${X11BASE}/lib/X11/xgalaga \ - --exec_prefix=${X11BASE}/bin \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib +CONFIGURE_ARGS= --prefix=${LOCALBASE}/lib/X11/xgalaga \ + --exec_prefix=${LOCALBASE}/bin .if defined(NOSOUND) CONFIGURE_ARGS+= --without-sound diff --git a/games/xglk/files/patch-Makefile b/games/xglk/files/patch-Makefile index 7afde85..f5ef629 100644 --- a/games/xglk/files/patch-Makefile +++ b/games/xglk/files/patch-Makefile @@ -6,8 +6,8 @@ # for Red Hat Linux -XINCLUDE = -I/usr/X11R6/include/X11 -XLIB = -L/usr/X11R6/lib -lX11 -+XINCLUDE = -I${X11BASE}/include -+XLIB = -L${X11BASE}/lib -lX11 ++XINCLUDE = -I${LOCALBASE}/include ++XLIB = -L${LOCALBASE}/lib -lX11 # for SparcStation / Solaris #XINCLUDE = -I/usr/openwin/include diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile index f955c94..f186f3e 100644 --- a/games/xgospel/Makefile +++ b/games/xgospel/Makefile @@ -6,7 +6,7 @@ PORTNAME= xgospel PORTVERSION= 1.12d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.teaser.fr/~jlgailly/ @@ -15,8 +15,7 @@ COMMENT= An X11 Go (weiqi, baduk) client for the Internet Go Server LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm x11 ice GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x --with-xpm --with-xaw3d diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile index 9bfb0ff..08ff361 100644 --- a/games/xinvaders/Makefile +++ b/games/xinvaders/Makefile @@ -7,7 +7,7 @@ PORTNAME= xinvaders PORTVERSION= 2.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/arcade/invaders @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386 NO_CDROM= "don't sell for profit" USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 xmu xaw xt USE_AUTOTOOLS= automake:14 autoconf:213 AUTOMAKE_ARGS= --include-deps CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile index 18ae5c1..28d688b 100644 --- a/games/xinvaders3d/Makefile +++ b/games/xinvaders3d/Makefile @@ -7,17 +7,16 @@ PORTNAME= xinvaders3d PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org COMMENT= 3D Vector-graphics Space Invaders clone for X +USE_XORG= x11 PLIST_FILES= bin/xinv3d -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME} do-install: diff --git a/games/xinvaders3d/files/patch-aa b/games/xinvaders3d/files/patch-aa index 659bb4a..a09d750 100644 --- a/games/xinvaders3d/files/patch-aa +++ b/games/xinvaders3d/files/patch-aa @@ -6,7 +6,7 @@ -CC = gcc -XLIB = -L/usr/X11R6/lib -I/usr/X11R6/include +CC?= gcc -+XLIB = -L$(X11BASE)/lib -I$(X11BASE)/include ++XLIB = -L$(LOCALBASE)/lib -I$(LOCALBASE)/include LIBS = -lm -lX11 OBJS = game.o aliens.o player.o effects.o \ object.o camera.o main-x11.o vec4x1.o mat4x4.o diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index 244ddfc3..3bb1479 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xjewel PORTVERSION= 1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.warwick.ac.uk/pub/x11/ \ ftp://ftp.x.org/R5contrib/ @@ -16,8 +16,9 @@ EXTRACT_SUFX= .tar.z MAINTAINER= jmz@FreeBSD.org COMMENT= X11 dropping jewels game -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes diff --git a/games/xjig/Makefile b/games/xjig/Makefile index 4e7f69d..2336804 100644 --- a/games/xjig/Makefile +++ b/games/xjig/Makefile @@ -7,7 +7,7 @@ PORTNAME= xjig PORTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= games @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Jigsaw puzzle game for X11 -USE_XLIB= yes +USE_XORG= x11 xproto xext MAKEFILE= Makefile.Linux MAN1= xjig.1 PLIST_FILES= bin/xjig diff --git a/games/xjig/files/patch-aa b/games/xjig/files/patch-aa index ca2c923..8f8f62c 100644 --- a/games/xjig/files/patch-aa +++ b/games/xjig/files/patch-aa @@ -15,10 +15,10 @@ ### Directories for include files of X11 and libraries -X_INCLUDE = /usr/X11R6/include -+X_INCLUDE = $(X11BASE)/include ++X_INCLUDE = $(LOCALBASE)/include -XLIB_DIR = /usr/X11R6/lib -+XLIB_DIR = $(X11BASE)/lib ++XLIB_DIR = $(LOCALBASE)/lib ################################################################### diff --git a/games/xjump/Makefile b/games/xjump/Makefile index 4143501..60364e1 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -7,7 +7,7 @@ PORTNAME= xjump PORTVERSION= 2.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -18,10 +18,9 @@ COMMENT= A simple X game where one tries to jump up as many levels as possible WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/g} PLIST_FILES= bin/xjump -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xaw MAKE_ARGS= CC="${CC} ${CFLAGS}" RECORD_FILE="/var/games/xjump.record" \ - IDIR="-I${X11BASE}/include" LDIR="-L${X11BASE}/lib" + IDIR="-I${LOCALBASE}/include" LDIR="-L${LOCALBASE}/lib" ALL_TARGET= xjump do-install: diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile index b4c05dd..d6a4b03 100644 --- a/games/xjumpx/Makefile +++ b/games/xjumpx/Makefile @@ -7,15 +7,14 @@ PORTNAME= xjumpx PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://fenix.ne.jp/~cdrtk/soft/dl/ MAINTAINER= ports@FreeBSD.org COMMENT= Improved version of xjump -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xaw MAN1= xjumpx.1 MANCOMPRESSED= yes diff --git a/games/xlines/Makefile b/games/xlines/Makefile index 411818b..3f78993 100644 --- a/games/xlines/Makefile +++ b/games/xlines/Makefile @@ -7,7 +7,7 @@ PORTNAME= xlines PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.trolltech.com/contrib/ DISTNAME= ${PORTNAME} @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Remove as many balls from board as you can USE_QT_VER= 3 -USE_X_PREFIX= yes NO_WRKSUBDIR= yes MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa index 9b5e76c..3d0c53c 100644 --- a/games/xlines/files/patch-aa +++ b/games/xlines/files/patch-aa @@ -6,11 +6,11 @@ -LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11 -CC=gcc -MOC=/usr/local/qt/bin/moc -+INCDIR=${X11BASE}/include/ -+CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS ${PTHREAD_CFLAGS} -+LFLAGS=-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS} ++INCDIR=${LOCALBASE}/include/ ++CXXFLAGS+=-I${LOCALBASE}/include -DSHOW_NEXT_COLORS ${PTHREAD_CFLAGS} ++LFLAGS=-L${LOCALBASE}/lib -lqt-mt ${PTHREAD_LIBS} +CC?=gcc -+MOC=${X11BASE}/bin/moc ++MOC=${LOCALBASE}/bin/moc SRC=lines.cpp lines.moc OBJECTS=lines.o diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile index 60c8be6..279eb04 100644 --- a/games/xmastermind/Makefile +++ b/games/xmastermind/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmastermind PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/strategy @@ -17,7 +17,7 @@ COMMENT= Mastermind game for X Window System LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms -USE_X_PREFIX= yes +USE_XORG= x11 xpm pre-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ diff --git a/games/xmastermind/files/patch-aa b/games/xmastermind/files/patch-aa index ee322a4..afb6f35 100644 --- a/games/xmastermind/files/patch-aa +++ b/games/xmastermind/files/patch-aa @@ -5,14 +5,14 @@ CC = gcc -CFLAGS = -O2 -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi -+.if exists(${X11BASE}/include/X11/forms.h) -+XFORMSINC=-I${X11BASE}/include/X11 ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMSINC=-I${LOCALBASE}/include/X11 +.endif -+CFLAGS+= -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi -I${X11BASE}/include ${XFORMSINC} ++CFLAGS+= -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi -I${LOCALBASE}/include ${XFORMSINC} CLIBS = -lm #GRAPHLIBS = -lforms -L/usr/X11R6/lib/ -lX11 -static -GRAPHLIBS = -lforms -L/usr/X11R6/lib/ -lX11 -+GRAPHLIBS = -lforms -L${X11BASE}/lib -lX11 -lXpm ++GRAPHLIBS = -lforms -L${LOCALBASE}/lib -lX11 -lXpm MF = Makefile ALLLIBS = $(GRAPHLIBS) $(CLIBS) diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile index 5276e73..c5cb48d 100644 --- a/games/xmemory/Makefile +++ b/games/xmemory/Makefile @@ -20,9 +20,9 @@ USE_IMAKE= yes MAN1= xmemory.1 post-install: - @${MKDIR} ${X11BASE}/lib/X11/xmemory + @${MKDIR} ${LOCALBASE}/lib/X11/xmemory ${INSTALL_DATA} ${WRKSRC}/home.mem ${WRKSRC}/sports.mem \ - ${X11BASE}/lib/X11/xmemory - ${LN} -sf home.mem ${X11BASE}/lib/X11/xmemory/default.mem + ${LOCALBASE}/lib/X11/xmemory + ${LN} -sf home.mem ${LOCALBASE}/lib/X11/xmemory/default.mem .include <bsd.port.mk> diff --git a/games/xminehunter/files/patch-aa b/games/xminehunter/files/patch-aa index 19500eb..13e1d26 100644 --- a/games/xminehunter/files/patch-aa +++ b/games/xminehunter/files/patch-aa @@ -6,12 +6,12 @@ - -INCLUDES = -I/usr/local/X11R5/include -LIBS = -L/usr/local/X11R5/lib -lXm -lXt -lXpm -lXext -lX11 -+INSTALL_BIN_PATH = ${X11BASE}/bin -+INSTALL_SCORE_PATH = ${X11BASE}/lib/X11/xminehunter ++INSTALL_BIN_PATH = ${LOCALBASE}/bin ++INSTALL_SCORE_PATH = ${LOCALBASE}/lib/X11/xminehunter -+INCLUDES = -I${X11BASE}/include -+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXpm -lXext -lX11 -+LIBS+= -Wl,-rpath,${X11BASE}/lib ++INCLUDES = -I${LOCALBASE}/include ++LIBS = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXpm -lXext -lX11 ++LIBS+= -Wl,-rpath,${LOCALBASE}/lib CC = g++ diff --git a/games/xmines/Makefile b/games/xmines/Makefile index d9c7b92..20fa6b2 100644 --- a/games/xmines/Makefile +++ b/games/xmines/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmines PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/strategy @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Minesweeper game for the X Window System -USE_X_PREFIX= yes +USE_XORG= x11 xt post-install: .if !defined(NOPORTDOCS) diff --git a/games/xmines/files/patch-aa b/games/xmines/files/patch-aa index b31bdc3..d154385 100644 --- a/games/xmines/files/patch-aa +++ b/games/xmines/files/patch-aa @@ -12,8 +12,8 @@ -SCOREFILES = /usr/X386/lib/X11/games +CFLAGS += -DSCOREfILE=\"$(SCOREFILES)/scores\" +CC ?= gcc -+INCLUDE = ${X11BASE}/include -+LIBRARY = ${X11BASE}/lib ++INCLUDE = ${LOCALBASE}/include ++LIBRARY = ${LOCALBASE}/lib +BIN = ${PREFIX}/bin +SCOREFILES = ${PREFIX}/share/xmines diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 25fc5b4..bf04c7d58 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -18,7 +18,7 @@ COMMENT= Challenging 2D motocross platform game LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ curl.4:${PORTSDIR}/ftp/curl -BUILD_DEPENDS= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode +BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode GNU_CONFIGURE= yes USE_GMAKE= yes @@ -30,8 +30,8 @@ USE_DOS2UNIX= src/*.cpp src/*.h CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR} +CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR} +LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/xmris/Makefile b/games/xmris/Makefile index 5defc82..ee56d450 100644 --- a/games/xmris/Makefile +++ b/games/xmris/Makefile @@ -27,6 +27,6 @@ post-configure: -e 's/^INSTMRISFLAGS.*/INSTMRISFLAGS = \$(OWNER) -m 2555/' Makefile post-install: - @${CHMOD} g+w ${X11BASE}/lib/X11/xmris + @${CHMOD} g+w ${LOCALBASE}/lib/X11/xmris .include <bsd.port.mk> diff --git a/games/xoids/Makefile b/games/xoids/Makefile index 2c138ba..e4ae702 100644 --- a/games/xoids/Makefile +++ b/games/xoids/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X Window Asteroids style game with full color pixmaps USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN6= xoids.6 post-extract: diff --git a/games/xoj/Makefile b/games/xoj/Makefile index fb5f845..d1ee62f 100644 --- a/games/xoj/Makefile +++ b/games/xoj/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= O. J. Simpson Simulator root window demo -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xoj diff --git a/games/xonix/Makefile b/games/xonix/Makefile index 76f5f7a..f3c44ef 100644 --- a/games/xonix/Makefile +++ b/games/xonix/Makefile @@ -15,7 +15,7 @@ MAINTAINER= joerg@FreeBSD.org COMMENT= Try to win land without colliding with `flyers' and `eaters' USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xonix.1 .include <bsd.port.mk> diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index c206cd7..1404c86 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -7,9 +7,9 @@ PORTNAME= nexuiz PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -49,7 +49,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis \ .endif .if !defined(WITHOUT_CLIENT) -USE_GL= yes +USE_GL= glut +USE_XORG= x11 xpm xxf86vm xxf86dga xext ALL_TARGET+= cl-release PLIST_SUB+= CLIENT="" .else @@ -74,7 +75,7 @@ PLIST_SUB+= SERVER="@comment " post-extract: @${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \ -d ${WRKDIR}/Nexuiz/sources - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c do-build: diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile index cc304de..ccf4af9 100644 --- a/games/xosmulti/Makefile +++ b/games/xosmulti/Makefile @@ -7,7 +7,7 @@ PORTNAME= xosmulti PORTVERSION= 1.00 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= flathill @@ -18,8 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A little girl cartoon on the top of the active window WRKSRC= ${WRKDIR}/xosmulti -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xt xi do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xosmulti ${PREFIX}/bin diff --git a/games/xosmulti/files/patch-aa b/games/xosmulti/files/patch-aa index 3f3eadd..e7190fb 100644 --- a/games/xosmulti/files/patch-aa +++ b/games/xosmulti/files/patch-aa @@ -29,7 +29,7 @@ -# INC_DIR = -I/usr/X11R6/include -# LIB_DIR = -L/usr/X11R6/lib -+INC_DIR = -I${X11BASE}/include -+LIB_DIR = -L${X11BASE}/lib ++INC_DIR = -I${LOCALBASE}/include ++LIB_DIR = -L${LOCALBASE}/lib all: $(TARGET) diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index d3f4f2a..7791706 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An X11 solitaire game with 14 variations USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN6= xpat2.6 MANCOMPRESSED= no diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index 0cbd0f5..0e4f38f 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -7,10 +7,9 @@ PORTNAME= xpilot-ng PORTVERSION= 4.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xpilot +MASTER_SITES= SF/xpilot PKGNAMESUFFIX?= -server MAINTAINER= ports@FreeBSD.org @@ -44,10 +43,8 @@ MAN6= xpilot-ng-replay.6 \ xpilot-ng-x11.6 \ xpilot-ng-xp-mapedit.6 -USE_X_PREFIX= yes - -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -I${LOCALBASE}/include OPTIONS= SDL "SDL/OpenGL client" on \ SOUND "Sound" off diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile index a0d0fbc..14991d7 100644 --- a/games/xpuzzletama/Makefile +++ b/games/xpuzzletama/Makefile @@ -18,7 +18,7 @@ COMMENT= Puzzle tama, a tetris like game WRKSRC= ${WRKDIR}/${PORTNAME} USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xpuzzletama lib/X11/xpuzzletama/tama_score diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile index 0ba738d..bc9bc4e 100644 --- a/games/xquarto/Makefile +++ b/games/xquarto/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X version of simple but tricky board game USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN6= xquarto.6 PLIST_FILES= bin/xquarto diff --git a/games/xracer/Makefile b/games/xracer/Makefile index e196240..18d8f52 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:213 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --disable-esd PORTDOCS= AUTHORS README README.html diff --git a/games/xrally/Makefile b/games/xrally/Makefile index 090d198..a134a18 100644 --- a/games/xrally/Makefile +++ b/games/xrally/Makefile @@ -10,8 +10,7 @@ PORTNAME= xrally PORTVERSION= 1.1.1 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xrally +MASTER_SITES= SF/xrally DISTNAME= ${PORTNAME}-1.1 MAINTAINER= edwin@mavetju.org @@ -24,11 +23,11 @@ HAS_CONFIGURE= yes USE_XORG= x11 xi xpm USE_BZIP2= yes USE_GMAKE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ - CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + CFLAGS="${PTHREAD_CFLAGS}" MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ - INCLUDES="-I${X11BASE}/include" + CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ + INCLUDES="-I${LOCALBASE}/include" .include <bsd.port.pre.mk> diff --git a/games/xroach/Makefile b/games/xroach/Makefile index 5e69dfc..1fb742a 100644 --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -7,7 +7,7 @@ PORTNAME= xroach PORTVERSION= 4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_BACKUP} DISTNAME= ${PORTNAME} @@ -15,11 +15,11 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Cockroaches hide under your windows +USE_XORG= x11 MAN6= xroach.6 MANCOMPRESSED= maybe PLIST_FILES= bin/xroach -USE_X_PREFIX= yes IGNOREFILES= ${DISTFILES} WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach diff --git a/games/xroach/files/patch-aa b/games/xroach/files/patch-aa index 928b141..a5c1aea 100644 --- a/games/xroach/files/patch-aa +++ b/games/xroach/files/patch-aa @@ -11,14 +11,14 @@ -LDADD= -lX11/X11 -lm +MAN6= xroach.6 + -+DPADD+= ${X11BASE}/lib/libX11.a ${LIBM} -+CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps -+LDADD+= -L${X11BASE}/lib -lX11 -lm ++DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM} ++CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps ++LDADD+= -L${LOCALBASE}/lib -lX11 -lm + -+MANDIR= ${X11BASE}/man/man ++MANDIR= ${LOCALBASE}/man/man + +BINOWN= bin -+BINDIR= ${X11BASE}/bin ++BINDIR= ${LOCALBASE}/bin +BINMODE= 755 .include <bsd.prog.mk> diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa index 7f0e9be..0d0c353 100644 --- a/games/xroads/files/patch-aa +++ b/games/xroads/files/patch-aa @@ -7,7 +7,7 @@ -DATAPATH = /usr/games/xroads/ -BINPATH = /usr/X11R6/bin/ +PREFIX ?= /usr/X11R6 -+X11BASE ?= /usr/X11R6 ++LOCALBASE ?= /usr/X11R6 +DATAPATH = ${PREFIX}/share/xroads +BINPATH = ${PREFIX}/bin # I imagine you would use this BINPATH for Solaris: @@ -18,7 +18,7 @@ #CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" -CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\" -+CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include ++CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${LOCALBASE}/include ########################################################################### # Links necessary for X11 @@ -27,7 +27,7 @@ ### Linux machines use this line: -LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm -+LINK = -L${X11BASE}/lib -lX11 -lm ++LINK = -L${LOCALBASE}/lib -lX11 -lm ### This line should work on Sun machines: #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm diff --git a/games/xrot/Makefile b/games/xrot/Makefile index 961d651..9f537f7 100644 --- a/games/xrot/Makefile +++ b/games/xrot/Makefile @@ -20,7 +20,7 @@ ALL_TARGET= xrot PLIST_FILES= bin/xrot WRKSRC= ${WRKDIR}/xrot USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrot ${PREFIX}/bin diff --git a/games/xsc/Makefile b/games/xsc/Makefile index 9fd02e1..4c269aa 100644 --- a/games/xsc/Makefile +++ b/games/xsc/Makefile @@ -7,17 +7,17 @@ PORTNAME= xsc PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.panix.com/~mbh/xsc/ MAINTAINER= ports@FreeBSD.org COMMENT= A vector graphics space shoot'em up game -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/xsc .include <bsd.port.mk> diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index fe94fbf..5489710 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -7,7 +7,7 @@ PORTNAME= xscorch PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://chaos2.org/xscorch/ \ http://mirror.dok.org/xscorch/ @@ -17,8 +17,7 @@ COMMENT= Multiplayer tank shoot-em-up LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_GNOME= gtk12 WANT_GNOME= yes diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile index acde1cd..9c7c4eb 100644 --- a/games/xscrabble/Makefile +++ b/games/xscrabble/Makefile @@ -16,7 +16,7 @@ COMMENT= X version of the popular board game USE_BZIP2= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes XSCRABBLEDIR= ${PREFIX}/lib/X11/xscrabble diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile index 8ad6cea..e385bd9 100644 --- a/games/xshisen/Makefile +++ b/games/xshisen/Makefile @@ -7,15 +7,14 @@ PORTNAME= xshisen PORTVERSION= 1.51 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.techfirm.co.jp/~masaoki/ MAINTAINER= ports@FreeBSD.org COMMENT= Shisen-sho puzzle game for X11 -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --sharedstatedir="${DATADIR}" INSTALL_TARGET= install-prog diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile index dd2e60d..a4a0233 100644 --- a/games/xshogi/Makefile +++ b/games/xshogi/Makefile @@ -7,7 +7,7 @@ PORTNAME= xshogi PORTVERSION= ${GNUSHOGI_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${GNUSHOGI_MASTER_SITES} MASTER_SITE_SUBDIR= ${GNUSHOGI_MASTER_SITE_SUBDIR} @@ -20,7 +20,7 @@ RUN_DEPENDS= gnushogi:${PORTSDIR}/games/gnushogi BUILD_WRKSRC= ${WRKSRC}/xshogi -USE_X_PREFIX= yes +USE_XORG= xt xaw x11 GNU_CONFIGURE= yes MAN6= xshogi.6 diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile index c4c674c..71f9b77 100644 --- a/games/xsokoban/Makefile +++ b/games/xsokoban/Makefile @@ -17,7 +17,7 @@ COMMENT= A puzzle of pushing objects to the goals USE_IMAKE= yes USE_PERL5_BUILD=yes -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/xsokoban ALL_TARGET= xsokoban MAN1= xsokoban.1 diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile index 32b8eb1..7dd8b42 100644 --- a/games/xteddy/Makefile +++ b/games/xteddy/Makefile @@ -17,8 +17,8 @@ COMMENT= A cuddlesome teddy for the X desktop NO_CDROM= Can only be distributed for free GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_GNOME= imlib MAN6= xteddy.6 diff --git a/games/xtic/Makefile b/games/xtic/Makefile index 7021e14..16a9a4c 100644 --- a/games/xtic/Makefile +++ b/games/xtic/Makefile @@ -17,11 +17,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An X version of a simple but tricky board game USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xtic.1 PLIST_FILES= bin/xtic post-patch: - @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure.h .include <bsd.port.mk> diff --git a/games/xtic/files/patch-aa b/games/xtic/files/patch-aa index 193a8f1..386c6c7 100644 --- a/games/xtic/files/patch-aa +++ b/games/xtic/files/patch-aa @@ -5,4 +5,4 @@ * Change this to the correct place, if needed */ -#define XPMLIBRARY -L/usr/local/lib -lXpm -+#define XPMLIBRARY -L%%X11BASE%%/lib -lXpm ++#define XPMLIBRARY -L%%LOCALBASE%%/lib -lXpm diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile index d7b21ee..7fbc6c0 100644 --- a/games/xtrojka/Makefile +++ b/games/xtrojka/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtrojka PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.funet.fi/pub/unix/games/ DISTNAME= ${PORTNAME} @@ -15,10 +15,10 @@ DISTNAME= ${PORTNAME} MAINTAINER= e@ik.nu COMMENT= Game of skill similar to T*tris +USE_XORG= x11 xt xproto xaw WRKSRC= ${WRKDIR} MAN6= xtrojka.6 MANCOMPRESSED= yes -USE_XLIB= yes pre-install: ${MKDIR} ${PREFIX}/share/xtrojka diff --git a/games/xtrojka/files/patch-aa b/games/xtrojka/files/patch-aa index c84978d..fc405e5 100644 --- a/games/xtrojka/files/patch-aa +++ b/games/xtrojka/files/patch-aa @@ -21,7 +21,7 @@ # add library search path # -CFLAGS+=-L/usr/X11/lib -+CFLAGS+=-L${X11BASE}/lib ++CFLAGS+=-L${LOCALBASE}/lib # on some systems you might add this line, because gcc starts wining # about 'sizeof(Display)', since Display might be an empty struct; @@ -52,7 +52,7 @@ #LIBS=-lnsl +# FreeBSD -+XDIR=${X11BASE}/include ++XDIR=${LOCALBASE}/include +LIBS=-lm + # diff --git a/games/xtron/files/patch-aa b/games/xtron/files/patch-aa index d86897f..4324ff0 100644 --- a/games/xtron/files/patch-aa +++ b/games/xtron/files/patch-aa @@ -11,8 +11,8 @@ +CC?= gcc +CFLAGS?= -O4 -Wall +DEFINES= -DPREFIX=\"${PREFIX}\" -+INCLUDES= -I${X11BASE}/include -I${X11BASE}/include/X11 -+LIBS= -L${X11BASE}/lib ++INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ++LIBS= -L${LOCALBASE}/lib LDLIBS= -lXpm -lX11 DEPEND= makedepend OBJS= wintype.o xtron.o main.o xpm2pixmap.o resource.o diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile index f5f35dc..5b6d026 100644 --- a/games/xtruco/Makefile +++ b/games/xtruco/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtruco PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= games @@ -16,8 +16,8 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Simple version for X Window of the famous card game Super Truco +USE_XORG= x11 PLIST_FILES= bin/xtruco -USE_X_PREFIX= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-aa index fad5bbb..dc7a6b4 100644 --- a/games/xtruco/files/patch-aa +++ b/games/xtruco/files/patch-aa @@ -5,13 +5,13 @@ ################################ -INCLUDES = -I/usr/X11/include -+INCLUDES = -I${X11BASE}/include ++INCLUDES = -I${LOCALBASE}/include # Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines) OPC = -DIPC_OK -LIBRARIES = -lX11 -L/usr/X11/lib -+LIBRARIES = -lX11 -L${X11BASE}/lib ++LIBRARIES = -lX11 -L${LOCALBASE}/lib CFILES = xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\ topwind.c window.c color.c button.c font.c read.c diff --git a/games/xtux/Makefile b/games/xtux/Makefile index 3ed2ac8..6585c84 100644 --- a/games/xtux/Makefile +++ b/games/xtux/Makefile @@ -7,10 +7,9 @@ PORTNAME= xtux PORTVERSION= 2003.03.06 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org @@ -18,8 +17,7 @@ COMMENT= Humorous Arcade game for X WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes MAKE_ENV= CPP="${CC} -E" CC="${CC}" @@ -31,7 +29,7 @@ post-patch: s|^CFLAGS|#CFLAGS|g ; \ s|^CPP|#CPP|g ; \ s|^MAKE|#MAKE|g ; \ - s|/usr/X11R6|$${X11BASE}|g' + s|/usr/X11R6|$${LOCALBASE}|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xtux ${PREFIX}/bin diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile index 9bca551..f0b4e64 100644 --- a/games/xvmahjongg/Makefile +++ b/games/xvmahjongg/Makefile @@ -7,7 +7,7 @@ PORTNAME= xvmahjongg PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://ftp.x.org/R5contrib/ DISTFILES= ${PORTNAME}${PORTVERSION}.tar.Z @@ -18,7 +18,6 @@ COMMENT= Mahjongg for XView with multicolored tiles LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview ALL_TARGET= mahjongg.swap -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mahjongg2.1 MAN6= xvmahjongg.6 diff --git a/games/xvmahjongg/files/patch-ab b/games/xvmahjongg/files/patch-ab index 38eddec..5a10346 100644 --- a/games/xvmahjongg/files/patch-ab +++ b/games/xvmahjongg/files/patch-ab @@ -5,13 +5,13 @@ # Root directory of XView developers package # For OpenWindows users, this is the same as $OPENWINHOME. -XVIEWROOT = ${OPENWINHOME} -+XVIEWROOT = ${X11BASE} ++XVIEWROOT = ${LOCALBASE} # If not in OpenWindows, need to specify directory where libxview # and libolgx are. # For OpenWindows users, this is taken care of via $LD_LIBRARY_PATH. -XVIEWLIBDIR = -+XVIEWLIBDIR = -L${X11BASE}/lib ++XVIEWLIBDIR = -L${LOCALBASE}/lib # e.g., XVIEWLIBDIR = -L/usr/openwin/lib # This -L... stuff may only be appropriate in a SunOS environment, # so do what's appropriate in your environment. The -L<pathname> diff --git a/games/xvmines/files/patch-aa b/games/xvmines/files/patch-aa index 0e79ce3..f2e3dcb 100644 --- a/games/xvmines/files/patch-aa +++ b/games/xvmines/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,7 +1,8 @@ -WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) +#WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) -+WHERE=${X11BASE} ++WHERE=${LOCALBASE} #CC = gcc -CC = cc diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 305206b..e133062 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -7,7 +7,7 @@ PORTNAME= xworm PORTVERSION= 1.02 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.ekran.no/archive/x/ DISTNAME= ${PORTNAME}102 @@ -15,12 +15,12 @@ DISTNAME= ${PORTNAME}102 MAINTAINER= ports@FreeBSD.org COMMENT= Classic game with apples and hungry worm +USE_XORG= x11 xt WRKSRC= ${WRKDIR}/XWorm -USE_X_PREFIX= yes ALL_TARGET= linux -MAKE_ARGS= CC="${CC}" INCDIR="-I${X11BASE}/include" \ +MAKE_ARGS= CC="${CC}" INCDIR="-I${LOCALBASE}/include" \ LINUXFLAGS='${CFLAGS} -DXWORMDIR=\"${DATADIR}\"' \ - LINUXLINK="-L${X11BASE}/lib -lXt -lX11 -lm" + LINUXLINK="-L${LOCALBASE}/lib -lXt -lX11 -lm" DATA= font grid raw PLIST_FILES= bin/xworm ${DATA:S/^/%%DATADIR%%\/xworm./} diff --git a/games/xzip/files/patch-aa b/games/xzip/files/patch-aa index cf0d776..f447320 100644 --- a/games/xzip/files/patch-aa +++ b/games/xzip/files/patch-aa @@ -6,8 +6,8 @@ -XINCLUDE = /usr/include/X11 -XLIB = /usr/lib/X11 -+XINCLUDE = $(X11BASE)/include -+XLIB = $(X11BASE)/lib ++XINCLUDE = $(LOCALBASE)/include ++XLIB = $(LOCALBASE)/lib + +SYSTEMFLAGS = -DAUTO_END_MODE diff --git a/games/yadex/Makefile b/games/yadex/Makefile index dbebe04..f54a836 100644 --- a/games/yadex/Makefile +++ b/games/yadex/Makefile @@ -7,7 +7,7 @@ PORTNAME= yadex PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.teaser.fr/~amajorel/yadex/ \ http://hjem.get2net.dk/RasII/amajorel/yadex/ @@ -16,9 +16,9 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= danfe@FreeBSD.org COMMENT= A WAD-file editor, for games like Doom and Hexen -USE_XLIB= yes USE_GMAKE= yes USE_PERL5_BUILD= yes +USE_XORG= x11 MAKEFILE= GNUmakefile HAS_CONFIGURE= yes CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" PREFIX="${PREFIX}" diff --git a/games/yadex/files/patch-GNUmakefile b/games/yadex/files/patch-GNUmakefile index 394ea89..5e816a6 100644 --- a/games/yadex/files/patch-GNUmakefile +++ b/games/yadex/files/patch-GNUmakefile @@ -6,8 +6,8 @@ else - X11LIBDIR = /usr/X11R6/lib - X11INCLUDEDIR = /usr/X11R6/include -+ X11LIBDIR = $(X11BASE)/lib -+ X11INCLUDEDIR = $(X11BASE)/include ++ X11LIBDIR = $(LOCALBASE)/lib ++ X11INCLUDEDIR = $(LOCALBASE)/include endif endif diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile index aa441a5..cce38eb 100644 --- a/german/ksteak/Makefile +++ b/german/ksteak/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile index 3dd4737..b2b9e88 100644 --- a/german/staroffice5/Makefile +++ b/german/staroffice5/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.' IS_INTERACTIVE= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index 2c69239..7b62679 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -34,7 +34,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT} NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile index 16ed5dd..40c7b78 100644 --- a/german/staroffice70/Makefile +++ b/german/staroffice70/Makefile @@ -36,7 +36,7 @@ NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' IS_INTERACTIVE= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes SOVERSION= ${PORTNAME}${PORTVERSION} WRKSRC= ${WRKDIR}/${SOVERSION} TMPDIR= ${WRKDIR}/tmp diff --git a/german/steak/Makefile b/german/steak/Makefile index ab68b40..2e3a4e2 100644 --- a/german/steak/Makefile +++ b/german/steak/Makefile @@ -7,9 +7,9 @@ PORTNAME= steak PORTVERSION= 1.7.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= german -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= Steak.${PORTVERSION} @@ -19,6 +19,8 @@ COMMENT= An english <-> german dictionary under the GPL RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +USE_XORG= xt + .if defined(WITHOUT_XSTEAK) USE_XORG= x11 .else @@ -38,7 +40,7 @@ post-patch: ${REINPLACE_CMD} -e "s,\$$HOME/bin/Steak/Datensatz,${PREFIX}/share/steak/Datensatz,; \ s,BINDIR=\$$HOME/bin/Steak,BINDIR=${DATADIR},; \ s,$$BINDIR/help.txt,${DATADIR}/help.txt,g" ${WRKSRC}/woerterbuch - ${REINPLACE_CMD} -e "s,/usr/X11R6/,${X11BASE}/,g" ${WRKSRC}/Printbuffer/Makefile + ${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g" ${WRKSRC}/Printbuffer/Makefile do-install: .if !defined(WITHOUT_XSTEAK) diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile index 3b32dcf..926ef32 100644 --- a/graphics/4va/Makefile +++ b/graphics/4va/Makefile @@ -7,7 +7,7 @@ PORTNAME= 4va PORTVERSION= 1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/hacks/X @@ -16,9 +16,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Four-Dimensional graphics tumbler for X11 -USE_XLIB= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - CLIBS="-lm -lX11 -L${X11BASE}/lib" +USE_XORG= x11 + +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + CLIBS="-lm -lX11 -L${LOCALBASE}/lib" MAN1= 4va.1 diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile index 6e77320..31d397b 100644 --- a/graphics/Cgraph/Makefile +++ b/graphics/Cgraph/Makefile @@ -17,7 +17,7 @@ COMMENT= A PostScript plotting library in C WRKSRC= ${WRKDIR}/Cgraph/source -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile index dbd8af4..4ac7b1c 100644 --- a/graphics/EZWGL/Makefile +++ b/graphics/EZWGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= EZWGL PORTVERSION= 1.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/ DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz @@ -18,7 +18,7 @@ COMMENT= The EZ Widget and Graphics Library LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png -USE_X_PREFIX= yes +USE_XORG= x11 xext USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 7e8c4b0..c0ffda1 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 7e8c4b0..c0ffda1 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 7e8c4b0..c0ffda1 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 1d59563..7f92460 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -251,9 +251,9 @@ CONFIGURE_ARGS+= --without-freetype .if !defined(WITHOUT_IMAGEMAGICK_FONTCONFIG) LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --with-fontconfig -CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include" \ - FONTCONFIG_LIBS="-L${X11BASE}/lib" -MAKE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \ + FONTCONFIG_LIBS="-L${LOCALBASE}/lib" +MAKE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" .else CONFIGURE_ARGS+= --without-fontconfig .endif @@ -284,8 +284,8 @@ IGNORE= SVG support requires X11 libraries, please unset WITHOUT_X11 .endif LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+= --with-rsvg -CONFIGURE_ENV+= RSVG_CFLAGS="-I${X11BASE}/include/librsvg-2" \ - RSVG_LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV+= RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2" \ + RSVG_LIBS="-L${LOCALBASE}/lib" .else CONFIGURE_ARGS+= --without-rsvg .endif diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile index 02c5a79..fd8dec8 100644 --- a/graphics/SciPlot/Makefile +++ b/graphics/SciPlot/Makefile @@ -18,7 +18,7 @@ COMMENT= A full-featured Xt widget to display 2D data in a graph USE_MOTIF= yes USE_IMAKE= yes MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INCLUDES= SciPlot.h SciPlotP.h SciPlotUtil.h LIBNAME= lib${PORTNAME:L} # Remove :L for libSciPlot diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 5ba658f..e8a39101 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -9,8 +9,7 @@ PORTNAME= aalib PORTVERSION= 1.4.r5 PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= aa-project +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= shaun@FreeBSD.org @@ -19,13 +18,13 @@ COMMENT= An ascii art library USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INFO= aalib .if !defined(WITHOUT_X11) USE_XORG= x11 -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \ - --x-libraries="${X11BASE}/lib" +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \ + --x-libraries="${LOCALBASE}/lib" .else CONFIGURE_ARGS= --with-x=no .endif diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile index e3c0a1d..d476ec3 100644 --- a/graphics/allegrogl/Makefile +++ b/graphics/allegrogl/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro USE_BZIP2= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= glu USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKEFILE= makefile @@ -44,7 +44,7 @@ post-install: s|%%RM%%|${RM}|g; \ s|%%CFLAGS%%|${CFLAGS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \ < ${FILESDIR}/makefile.ex > ${EXAMPLESDIR}/makefile diff --git a/graphics/allegrogl/files/makefile.ex b/graphics/allegrogl/files/makefile.ex index 0c32c4b..9880ad6 100644 --- a/graphics/allegrogl/files/makefile.ex +++ b/graphics/allegrogl/files/makefile.ex @@ -1,7 +1,7 @@ CC= %%CC%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include -LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU +CFLAGS= %%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include +LDFLAGS= -L%%LOCALBASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU ALLEGRO_CFLAGS!=allegro-config --cflags ALLEGRO_LFLAGS!=allegro-config --libs diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile index 395521d..70b403b 100644 --- a/graphics/animorph/Makefile +++ b/graphics/animorph/Makefile @@ -19,8 +19,8 @@ USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 17da74a..df1b37f 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -7,7 +7,7 @@ PORTNAME= autotrace PORTVERSION= 0.31.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF @@ -21,7 +21,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming" -USE_XLIB= yes MAN1= autotrace.1 diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared index a50576e..e16c072 100644 --- a/graphics/ayam/files/patch-Makefile.shared +++ b/graphics/ayam/files/patch-Makefile.shared @@ -53,7 +53,7 @@ # OpenGL # OpenGL includes -GLINC = -I/usr/X11R6/include/ -+GLINC = -I${X11BASE}/include/ ++GLINC = -I${LOCALBASE}/include/ # MacOSX (Aqua): #GLINC = # link options for linking with OpenGL libraries @@ -62,7 +62,7 @@ # TIFF # TIFF includes -TIFFINC = -I/usr/include/ -+TIFFINC = -I${X11BASE}/include/ ++TIFFINC = -I${LOCALBASE}/include/ # link options for linking with TIFF library TIFFLIB = -ltiff @@ -113,12 +113,12 @@ # X11 # X11 includes -X11INC = -I/usr/X11R6/include -+X11INC = -I${X11BASE}/include ++X11INC = -I${LOCALBASE}/include # MacOSX (Aqua): #X11INC = # link options for linking with X11 -X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 -+X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11 ++X11LIBS = -L${LOCALBASE}/lib -lXmu -lXext -lX11 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 # MacOSX (Aqua): #X11LIBS = diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile index 3324ff6..1411c7c 100644 --- a/graphics/backfract/Makefile +++ b/graphics/backfract/Makefile @@ -7,17 +7,17 @@ PORTNAME= backfract PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.igoweb.org/~wms/comp/backfract/ MAINTAINER= ports@FreeBSD.org COMMENT= Fractal image animated wallpaper program +USE_XORG= x11 PLIST_FILES= bin/backfract GNU_CONFIGURE= yes USE_PERL5_BUILD=yes -USE_X_PREFIX= yes NO_INSTALL_MANPAGE= yes ALL_TARGET= # none diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile index aaee140..3984c5c 100644 --- a/graphics/bbrb/Makefile +++ b/graphics/bbrb/Makefile @@ -7,10 +7,9 @@ PORTNAME= bbrb PORTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A graphical background manager for the Blackbox window manager @@ -18,7 +17,6 @@ COMMENT= A graphical background manager for the Blackbox window manager RUN_DEPENDS= xv:${PORTSDIR}/graphics/xv \ blackbox:${PORTSDIR}/x11-wm/blackbox -USE_X_PREFIX= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 263bbfa..8099226 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ + alut.1:${PORTSDIR}/audio/freealut\ openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ avutil.1:${PORTSDIR}/multimedia/ffmpeg PLIST_FILES= bin/blender @@ -79,7 +79,7 @@ pre-configure: s|-pipe||; \ s|-O2|${CFLAGS}|; \ s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \ - s|/usr/X11R6|${X11BASE}|' \ + s|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/source/nan_compile.mk @${REINPLACE_CMD} -e \ diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index 22552ef..03d1b95 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -19,16 +19,16 @@ OPTIONS+= THREADS "With threading support" off GNU_CONFIGURE= yes USE_GCC= 3.4 -USE_GL= yes +USE_GL= gl USE_PERL5= yes USE_AUTOTOOLS= libltdl:15 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS=--enable-ltdl-install=no -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - GL_LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ + GL_LIBS="-L${LOCALBASE}/lib" MAN1= gldb.1 MAN3= bugle.3 @@ -70,6 +70,6 @@ BROKEN= Fails to link .endif post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/gentokens/find_header.perl + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/gentokens/find_header.perl .include <bsd.port.post.mk> diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index ce50820..5b17f3d 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -31,7 +31,7 @@ USE_GNOME= gnometarget gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${PTHREAD_LIBS}" .if defined(WITHOUT_X11) diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 650bf36..7d9a973 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -22,8 +22,8 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget ltverhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" .if defined(NOPORTDOCS) diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile index 6869636..d591f85 100644 --- a/graphics/cbview/Makefile +++ b/graphics/cbview/Makefile @@ -7,7 +7,7 @@ PORTNAME= cbview PORTVERSION= 0.06 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= http://elvine.org/code/cbview/ @@ -21,7 +21,6 @@ RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ NO_BUILD= yes USE_PERL5= yes -USE_X_PREFIX= yes PLIST_FILES= bin/${PORTNAME} PORTDOCS= COPYING Changes INSTALL README TODO diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile index 2c105c9..149c7ec2 100644 --- a/graphics/chbg/Makefile +++ b/graphics/chbg/Makefile @@ -7,16 +7,14 @@ PORTNAME= chbg PORTVERSION= 1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Change Background Picture with time period -USE_X_PREFIX= yes USE_GNOME= gdkpixbuf USE_GMAKE= yes USE_GETTEXT= yes diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index f34dc3b..b968259 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -7,10 +7,9 @@ PORTNAME= cimg PORTVERSION= 1.2.8 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= graphics devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= CImg-${DISTVERSION} DIST_SUBDIR= ${PKGNAME} @@ -21,12 +20,11 @@ USE_ZIP= yes BUILD_WRKSRC= ${WRKSRC}/examples MAKE_ENV= CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS}" \ - X11PATH=${X11BASE} + X11PATH=${LOCALBASE} .if !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen USE_GMAKE= yes -USE_GCC= 3.4+ REINPLACE_ARGS= -i "" LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard . if !defined(WITHOUT_LAPACK) @@ -38,7 +36,6 @@ LAPACK_DEF= -Dcimg_lapack USE_FORTRAN= yes . if !defined(WITHOUT_OPTIMIZATIONS) -USE_XLIB= yes LIB_DEPENDS+= png:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile index d4a3a13..da19af4 100644 --- a/graphics/claraocr/Makefile +++ b/graphics/claraocr/Makefile @@ -7,7 +7,7 @@ PORTNAME= claraocr PORTVERSION= 0.9.9 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= graphics accessibility MASTER_SITES= ${MASTER_SITE_NETBSD} DISTNAME= clara-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= Optical character recognition (OCR) utility RUN_DEPENDS= pnmenlarge:${PORTSDIR}/graphics/netpbm -USE_XLIB= yes +USE_XORG= x11 USE_PERL5= yes MAKE_ENV= MKDIR="${MKDIR}" diff --git a/graphics/claraocr/files/patch-Makefile b/graphics/claraocr/files/patch-Makefile index 24e8a6a..9cb923d 100644 --- a/graphics/claraocr/files/patch-Makefile +++ b/graphics/claraocr/files/patch-Makefile @@ -23,8 +23,8 @@ -INCLUDE = -I/usr/X11R6/include -LIBPATH = -L/usr/X11R6/lib -CC = gcc -+INCLUDE = -I${X11BASE}/include -+LIBPATH = -L${X11BASE}/lib ++INCLUDE = -I${LOCALBASE}/include ++LIBPATH = -L${LOCALBASE}/lib +CC ?= gcc # diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index 1367e6c..765ea6b 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LIBS} -L${LOCALBASE}/lib" diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 6a1ee5b..72ff669 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -7,7 +7,7 @@ PORTNAME= cqcam PORTVERSION= 0.91 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ @@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg ONLY_FOR_ARCHS= i386 -USE_XLIB= yes +USE_XORG= x11 USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile index c90e70b..1216048 100644 --- a/graphics/crystalentitylayer-devel/Makefile +++ b/graphics/crystalentitylayer-devel/Makefile @@ -24,8 +24,8 @@ CONFLICTS= crystalentitylayer-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile index 59b28f3..1a71141 100644 --- a/graphics/crystalentitylayer/Makefile +++ b/graphics/crystalentitylayer/Makefile @@ -24,8 +24,8 @@ CONFLICTS= crystalentitylayer-devel-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index 446ccb5..57a45d6 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -33,8 +33,8 @@ GNU_CONFIGURE= yes USE_GCC= 3.4+ USE_GL= yes WANT_PERL= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" \ CPPFLAGS="${CPPFLAGS} "LDFLAGS="${LDFLAGS}" @@ -119,8 +119,8 @@ CONFIGURE_ARGS+= --without-3ds .endif .if !defined(WITHOUT_ODE) -BUILD_DEPENDS+= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode -CONFIGURE_ARGS+= --with-ode=${X11BASE} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode +CONFIGURE_ARGS+= --with-ode=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ode .endif diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index db1079a..39222b6 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -125,8 +125,8 @@ CONFIGURE_ARGS+= --without-3ds .endif .if !defined(WITHOUT_ODE) -BUILD_DEPENDS+= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode -CONFIGURE_ARGS+= --with-ode=${X11BASE} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode +CONFIGURE_ARGS+= --with-ode=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ode .endif diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 30a51e8..485d41e 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -44,7 +44,7 @@ GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. post-extract: @${INSTALL_DATA} ${FILESDIR}/Makefile.tmpl ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's;%%LOCALBASE%%;${LOCALBASE};g ; \ - s;%%X11BASE%%;${X11BASE};g' \ + s;%%LOCALBASE%%;${LOCALBASE};g' \ ${WRKSRC}/Makefile @${MV} ${WRKSRC}/gl_src.c ${WRKSRC}/gl_src.c.bogus diff --git a/graphics/dataplot/files/Makefile.tmpl b/graphics/dataplot/files/Makefile.tmpl index 9f5a979..7080252 100644 --- a/graphics/dataplot/files/Makefile.tmpl +++ b/graphics/dataplot/files/Makefile.tmpl @@ -1,13 +1,13 @@ -CFLAGS += -I%%LOCALBASE%%/include -I%%X11BASE%%/include +CFLAGS += -I%%LOCALBASE%%/include DEST = ${PREFIX}/bin -EXTHDRS = %%X11BASE%%/include/X11/X.h \ - %%X11BASE%%/include/X11/Xfuncproto.h \ - %%X11BASE%%/include/X11/Xlib.h \ - %%X11BASE%%/include/X11/Xmd.h \ - %%X11BASE%%/include/X11/Xosdefs.h \ - %%X11BASE%%/include/X11/Xutil.h \ +EXTHDRS = %%LOCALBASE%%/include/X11/X.h \ + %%LOCALBASE%%/include/X11/Xfuncproto.h \ + %%LOCALBASE%%/include/X11/Xlib.h \ + %%LOCALBASE%%/include/X11/Xmd.h \ + %%LOCALBASE%%/include/X11/Xosdefs.h \ + %%LOCALBASE%%/include/X11/Xutil.h \ %%LOCALBASE%%/include/gd/gd.h \ %%LOCALBASE%%/include/gd/gd_io.h @@ -17,7 +17,7 @@ INSTALL = install LD = $(CC) -LDFLAGS = -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib %%GCCLIBDIR%% +LDFLAGS = -L%%LOCALBASE%%/lib %%GCCLIBDIR%% LIBS = -lgd -lpng -ljpeg -lX11 -lz %%FORTRANLIBS%% -lm diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile index 1f0d14b..395936d 100644 --- a/graphics/demeter/Makefile +++ b/graphics/demeter/Makefile @@ -7,10 +7,9 @@ PORTNAME= demeter PORTVERSION= 3.21 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF .ifdef (WITH_SAMPLE_DATA) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ DemeterSampleData-${SAMPLE_DATA_VER}-2${EXTRACT_SUFX} @@ -20,14 +19,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library to render 3D terrains using OpenGL USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl glu WANT_GNOME= yes WANT_SDL= yes USE_AUTOTOOLS= automake:15 autoconf:261 libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS=" -L${LOCALBASE}/lib" USE_LDCONFIG= yes SAMPLE_DATA_VER= 3.20 @@ -45,7 +43,7 @@ WITH_SDL= yes WITH_LIBXML2= yes .endif -.if exists(${X11BASE}/lib/libosg.so) +.if exists(${LOCALBASE}/lib/libosg.so) WITH_OSG= yes .endif @@ -62,8 +60,8 @@ USE_GNOME= libxml2 .endif .ifdef (WITH_OSG) -BUILD_DEPENDS+= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg -RUN_DEPENDS+= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg +BUILD_DEPENDS+= ${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg +RUN_DEPENDS+= ${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg .endif .ifdef (WITH_GDAL) diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index ccdde29..caa742e 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -8,7 +8,7 @@ PORTNAME= dia DISTVERSION= 0.96.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -22,7 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/t LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack \ desktopfileutils diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index e8a7503..8d02478 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -10,8 +10,7 @@ PORTNAME= diacanvas2 PORTVERSION= 0.14.4 PORTREVISION= 1 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= diacanvas +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A general drawing canvas from dia dialog editor @@ -22,7 +21,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_DISPLAY= yes post-patch: diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile index 2ee5597..012aec7 100644 --- a/graphics/divxcalc/Makefile +++ b/graphics/divxcalc/Makefile @@ -8,20 +8,22 @@ PORTNAME= divxcalc PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://imagef1.net.nz/divxcalc/ MAINTAINER= ports@FreeBSD.org COMMENT= DivX Calculator +USE_XORG= x11 ice xext USE_BZIP2= yes USE_QT_VER= 3 USE_GMAKE= yes USE_AUTOTOOLS= automake:15:env autoconf:261:env GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= bin/divxcalc diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index 7788c85..dd0a736 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -9,8 +9,7 @@ PORTNAME= djview PORTVERSION= 4.3 PORTREVISION= 0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= djvu +MASTER_SITES= SF/djvu DISTNAME= ${PORTNAME}4-${PORTVERSION} MAINTAINER= stas@FreeBSD.org @@ -24,9 +23,9 @@ USE_QT_VER= 4 QT_COMPONENTS= gui network rcc uic moc qmake CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \ QMAKESPEC="${QMAKESPEC}" \ - CFLAGS="-I${X11BASE}/include" \ - CXXFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" + CFLAGS="-I${LOCALBASE}/include" \ + CXXFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" WRKSRC= ${WRKDIR}/${PORTNAME}4-${PORTVERSION} diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 4eb20d4..73cb226 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,10 +7,9 @@ PORTNAME= djvulibre PORTVERSION= 3.5.20 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= djvu +MASTER_SITES= SF/djvu MAINTAINER= stas@FreeBSD.org COMMENT?= DjVu viewers, encoders, browser plugin, and utilities @@ -42,7 +41,6 @@ MAN1_EN= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 PORTDOCS= djvu2spec.djvu lizard2002.djvu .if !defined(WITHOUT_X11) -USE_XLIB= yes USE_QT_VER= 3 CONFIGURE_ENV+= QTLIBS="-L${QT_PREFIX}/lib -lqt-mt" MAN1+= djview3.1 nsdejavu.1 diff --git a/graphics/djvulibre/files/patch-configure b/graphics/djvulibre/files/patch-configure index 8ffc666..ecfe48a 100644 --- a/graphics/djvulibre/files/patch-configure +++ b/graphics/djvulibre/files/patch-configure @@ -5,7 +5,7 @@ verbose= x_includes=NONE -x_libraries=NONE -+x_libraries=${X11BASE}/lib ++x_libraries=${LOCALBASE}/lib # Installation directory options. # These are left unexpanded so users can "make install exec_prefix=/foo" diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile index 4cc3af5..12ea376 100644 --- a/graphics/dore/Makefile +++ b/graphics/dore/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdore PORTVERSION= 6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -16,8 +16,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= The Dynamic Object Rendering Environment +USE_XORG= x11 USE_GMAKE= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/dore EXTRACT_CMD= ${MKDIR} ${WRKSRC}; cd ${WRKSRC}; ${GZIP_CMD} MAKEFILE= mk.stdx diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile index 2c804b9..b62bc3f 100644 --- a/graphics/dynamechs/Makefile +++ b/graphics/dynamechs/Makefile @@ -11,21 +11,18 @@ PORTVERSION= 4.0.p1 PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org COMMENT= A Multibody Dynamic Simulation Library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_BZIP2= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_PERL5_BUILD=yes -MAKE_ENV= OPENGLINCDIR="${X11BASE}/include" \ - OPENGLLIBDIR="${X11BASE}/lib" \ +MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \ + OPENGLLIBDIR="${LOCALBASE}/lib" \ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" ALL_TARGET= freebsd diff --git a/graphics/dynamechs/files/make.platform.freebsd b/graphics/dynamechs/files/make.platform.freebsd index bb72a9b..17c2f95 100644 --- a/graphics/dynamechs/files/make.platform.freebsd +++ b/graphics/dynamechs/files/make.platform.freebsd @@ -2,7 +2,7 @@ CXXFLAGS += -D_BOOL -c -fPIC -I/$(OPENGLINCDIR) # -pthreads DEPENDFLAGS := $(CXXFLAGS) -LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${X11BASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL +LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL LDGLUT := -lglut # CXX := c++ diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index c3e63ec..52f0745 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -7,7 +7,7 @@ PORTNAME= electriceyes PORTVERSION= 0.3.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/ee/0.3 @@ -16,7 +16,6 @@ DISTNAME= ee-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A graphic view base imlib & gtk -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs USE_GETTEXT= yes diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index a671aac..048c466 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -9,8 +9,7 @@ PORTNAME= enblend PORTVERSION= 3.0 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= vd@FreeBSD.org COMMENT= A tool for image blending with multiresolution splines @@ -19,12 +18,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \ jpeg.9:${PORTSDIR}/graphics/jpeg \ lcms:${PORTSDIR}/graphics/lcms \ - glut.4:${PORTSDIR}/graphics/libglut \ xmi.1:${PORTSDIR}/graphics/plotutils \ tiff.4:${PORTSDIR}/graphics/tiff USE_GNOME= gnometarget -USE_GL= yes +USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -32,8 +30,8 @@ MAN1= enblend.1 PLIST_FILES= bin/enblend CPPFLAGS= -I${WRKSRC}/src/vigra_impex -I${WRKSRC}/include \ - -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|-ffast-math||g ; \ diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index 6484fe8..73e642e 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -7,7 +7,7 @@ PORTNAME= enfle PORTVERSION= 20010130 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://enfle.fennel.org/files/stable/ @@ -20,8 +20,8 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif \ arc.1:${PORTSDIR}/archivers/libarc +USE_XORG= x11 xext USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_PERL5_BUILD=yes CONFIGURE_ARGS= --enable-all-plugins \ diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index f8dca4e..602a857 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -8,6 +8,7 @@ PORTNAME= eog PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +23,6 @@ USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ gnomedesktop INSTALLS_ICONS= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 06ee9f8..680384a 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -24,8 +24,8 @@ INSTALLS_ICONS= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 intlhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 4b7db8b..c28c6da 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -8,7 +8,7 @@ PORTNAME= evince PORTVERSION= 2.22.1.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +24,6 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui desktopfileutils \ diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile index bf14723..44391f4 100644 --- a/graphics/exhibit/Makefile +++ b/graphics/exhibit/Makefile @@ -35,7 +35,7 @@ PLIST_DIRS= %%DATADIR%% USE_EFL+= engrave .endif -.if defined(WITH_ENLIGHTENMENT) || exists(${X11BASE}/bin/enlightenment_remote) +.if defined(WITH_ENLIGHTENMENT) || exists(${LOCALBASE}/bin/enlightenment_remote) BUILD_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel RUN_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel .endif diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index fa1bc44..1acce40 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -7,7 +7,7 @@ PORTNAME= feh PORTVERSION= 1.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ @@ -16,7 +16,7 @@ COMMENT= An image viewer that utilizes Imlib2 LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib -USE_X_PREFIX= yes +USE_XORG= x11 xt xinerama USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -24,8 +24,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= feh.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${PERL} -pi.bak -e \ diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile index 97169e5..c412f02 100644 --- a/graphics/ffff/Makefile +++ b/graphics/ffff/Makefile @@ -9,27 +9,24 @@ PORTNAME= ffff PORTVERSION= 323 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SFE DISTNAME= FFFF${PORTVERSION}-src MAINTAINER= rossiya@gmail.com COMMENT= A fast mandelbrot fractal generator -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut USE_DOS2UNIX= yes -USE_GCC= 3.2+ -USE_GL= yes +USE_GL= glut USE_ZIP= yes SOURCE= FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \ PixelBuffer VertexProgram VertexProgramATI VertexProgramNV \ extensions vpext -CXXFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/GL ${PTHREAD_CFLAGS} \ +CXXFLAGS+= -I${LOCALBASE}/include/GL ${PTHREAD_CFLAGS} \ -D__linux__ -LDFLAGS+= -L${X11BASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \ +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \ -lGLU -lm PLIST_FILES= bin/ffff diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile index 3012f37..5f08d37 100644 --- a/graphics/flashplayer/Makefile +++ b/graphics/flashplayer/Makefile @@ -7,10 +7,9 @@ PORTNAME= flashplayer PORTVERSION= 0.4.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gplflash +MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} MAINTAINER= llwang@infor.org @@ -20,8 +19,8 @@ LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/player USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= x11 xaw xkbfile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 67dc949..b3e45a1 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -7,16 +7,14 @@ PORTNAME= fnlib PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= enlightenment +MASTER_SITES= SF/enlightenment MAINTAINER= ports@FreeBSD.org COMMENT= Fonts and font libraries necessary for Enlightenment USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 3496298..b8825a8 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -9,8 +9,7 @@ PORTNAME= freeglut PORTVERSION= 2.4.0 PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library @@ -23,10 +22,8 @@ USE_LDCONFIG= yes USE_XORG= ice USE_GL= glu CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ - --disable-warnings -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-lusbhid" +CONFIGURE_ARGS= --disable-warnings +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-lusbhid" REINPLACE_ARGS= -i "" diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile index 4252f80..68cd9a9 100644 --- a/graphics/frontline/Makefile +++ b/graphics/frontline/Makefile @@ -7,10 +7,9 @@ PORTNAME= frontline PORTVERSION= 0.5.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= autotrace +MASTER_SITES= SF/autotrace MAINTAINER= gnome@FreeBSD.org COMMENT= An autotrace GUI FRONTend like streamLINE(TM) @@ -19,7 +18,6 @@ LIB_DEPENDS= autotrace.3:${PORTSDIR}/graphics/autotrace \ popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomelibs imlib libartlgpl2 USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 5255846..2158ea4 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -7,7 +7,7 @@ PORTNAME= ftgl PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://opengl.geek.nz/ftgl/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/([[:digit:]])$/.\1/} @@ -19,13 +19,12 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME:U} CONFIGURE_WRKSRC= ${WRKSRC}/unix CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-gl-inc=${X11BASE}/include --with-gl-lib=${X11BASE}/lib +CONFIGURE_ARGS= --with-gl-inc=${LOCALBASE}/include --with-gl-lib=${LOCALBASE}/lib BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} MAKE_ENV= MKDIR="${MKDIR}" @@ -47,7 +46,6 @@ post-install: s|%%CFLAGS%%|${CFLAGS}|g; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ <${FILESDIR}/makefile.ex >${EXAMPLESDIR}/makefile diff --git a/graphics/ftgl/files/makefile.ex b/graphics/ftgl/files/makefile.ex index 87cb600..791f527 100644 --- a/graphics/ftgl/files/makefile.ex +++ b/graphics/ftgl/files/makefile.ex @@ -6,9 +6,9 @@ CC= %%CC%% CXX= %%CXX%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -CXXFLAGS= %%CXXFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lglut -lftgl +CFLAGS= %%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +CXXFLAGS= %%CXXFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +LDFLAGS= -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib -lglut -lftgl FREETYPE_CFLAGS!=%%LOCALBASE%%/bin/freetype-config --cflags FREETYPE_LFLAGS!=%%LOCALBASE%%/bin/freetype-config --libs diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index 3712763..92df115 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -7,7 +7,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= libs/graphics @@ -17,7 +17,7 @@ COMMENT= An easy to use, portable and powerful 2D graphics library LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -USE_XLIB= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile index 5f9fb03..9457b00 100644 --- a/graphics/g3dviewer/Makefile +++ b/graphics/g3dviewer/Makefile @@ -18,14 +18,14 @@ COMMENT= A 3D file viewer for GTK+ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_GNOME= gnometarget gtk20 -USE_GL= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= g3dviewer.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile index cfdc73a..47b7fd1 100644 --- a/graphics/gauche-gl/Makefile +++ b/graphics/gauche-gl/Makefile @@ -8,8 +8,7 @@ PORTNAME= gl PORTVERSION= 0.4.4 CATEGORIES= graphics scheme -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gauche +MASTER_SITES= SF PKGNAMEPREFIX= gauche- DISTNAME= Gauche-${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -18,13 +17,10 @@ MAINTAINER= erik@smluc.org COMMENT= OpenGL binding for Gauche BUILD_DEPENDS= gosh:${PORTSDIR}/lang/gauche -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut RUN_DEPENDS= ${BUILD_DEPENDS} USE_GL= glut GNU_CONFIGURE= yes -USE_GCC= 3.4+ -CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib EXAMPLESDIR= ${PREFIX}/share/examples/gauche/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/gauche/${PORTNAME} diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile index 68fc555..09d080d 100644 --- a/graphics/gcolor/Makefile +++ b/graphics/gcolor/Makefile @@ -7,16 +7,14 @@ PORTNAME= gcolor PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= GTK-based color picker PLIST_FILES= bin/gcolor -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 9ff30f2..2b05149 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -7,7 +7,7 @@ PORTNAME?= gdk-pixbuf PORTVERSION= 0.22.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22 @@ -23,6 +23,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= xt xi x11 USE_GNOME+= gnomehack gtk12 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile index 6e98053..5defbf9 100644 --- a/graphics/geist/Makefile +++ b/graphics/geist/Makefile @@ -20,8 +20,8 @@ XML_CONFIG?= ${LOCALBASE}/bin/xml2-config GNU_CONFIGURE= yes USE_GNOME= gtk12 USE_EFL= imlib2 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ XML_CONFIG="${XML_CONFIG}" post-patch: diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index a9f089e..cdfee4d 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -7,23 +7,20 @@ PORTNAME= geomview PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= geomview +MASTER_SITES= SF/geomview MAINTAINER= bms@FreeBSD.org COMMENT= An interactive viewer for 3- and 4-D geometric objects -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_MOTIF= yes -USE_X_PREFIX= yes +USE_XORG= glut USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-opengl=${X11BASE} +CONFIGURE_ARGS= --with-opengl=${LOCALBASE} MANCOMPRESSED= no MAN1= geomview.1 togeomview.1 bdy.1 oogl2rib.1 anytooff.1 \ diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile index 0f92f24..64edc5a 100644 --- a/graphics/gephex/Makefile +++ b/graphics/gephex/Makefile @@ -25,11 +25,10 @@ CONFIGURE_ARGS= --without-V4L --without-ASOUNDLIB --without-LINUX_JOYSTICK \ --without-FFMPEG --without-AVIFILE --without-MPEG3 \ --without-LIBPNG --without-SDL --without-SDL_IMAGE \ --without-SDL_TTF --without-AALIB --disable-static \ - --with-qt-libdir="${X11BASE}/lib" \ - --with-qt-incdir="${X11BASE}/include" \ - --with-qt-bindir="${X11BASE}/bin" + --with-qt-libdir="${LOCALBASE}/lib" \ + --with-qt-incdir="${LOCALBASE}/include" \ + --with-qt-bindir="${LOCALBASE}/bin" USE_QT_VER= 3 -USE_XLIB= yes WANT_SDL= yes USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}-${PORTVERSION:R} @@ -64,7 +63,7 @@ WITH_MPEG3= yes WITH_PNG= yes .endif -.if exists(${X11BASE}/lib/libGL.so) && !defined(WITHOUT_GL) +.if exists(${LOCALBASE}/lib/libGL.so) && !defined(WITHOUT_GL) WITH_GL= yes .endif @@ -172,7 +171,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|; \ - s|%%X11BASE%%|${X11BASE}|; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%PORTDOCS%%|${DO_DOCS}|' ${WRKSRC}/Makefile.am diff --git a/graphics/gephex/files/patch-configure.ac b/graphics/gephex/files/patch-configure.ac index 4d981a0..9b59a13 100644 --- a/graphics/gephex/files/patch-configure.ac +++ b/graphics/gephex/files/patch-configure.ac @@ -17,7 +17,7 @@ # optional libraries +ac_save_CFLAGS="$CFLAGS" -+CFLAGS="${CFLAGS} -I%%X11BASE%%/include" ++CFLAGS="${CFLAGS} -I%%LOCALBASE%%/include" + CHECK_EXTRA_LIB([GL], [AC_CHECK_HEADER([GL/glx.h],have_gl=yes,have_gl=no)], diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile index 40706b3..bb25a65 100644 --- a/graphics/giftrans/Makefile +++ b/graphics/giftrans/Makefile @@ -27,7 +27,7 @@ do-extract: done post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/giftrans.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/giftrans.c do-build: (cd ${WRKSRC}; ${CC} ${CFLAGS} giftrans.c -o giftrans) diff --git a/graphics/giftrans/files/patch-aa b/graphics/giftrans/files/patch-aa index 6575272..26b44f5 100644 --- a/graphics/giftrans/files/patch-aa +++ b/graphics/giftrans/files/patch-aa @@ -5,7 +5,7 @@ #ifndef RGBTXT #ifdef X11 -#define RGBTXT "/usr/lib/X11/rgb.txt" -+#define RGBTXT "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGBTXT "%%LOCALBASE%%/lib/X11/rgb.txt" #else /* X11 */ #ifdef OPENWIN #define RGBTXT "/usr/openwin/lib/rgb.txt" diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 2be26a7..01efdf5 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -8,7 +8,7 @@ PORTNAME= gimp-app DISTVERSION= 2.4.5 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -36,7 +36,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XPM= yes +USE_XORG= xpm xmu xext USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile index 2d63d94..c4e95c9 100644 --- a/graphics/gimp-manual-html/Makefile +++ b/graphics/gimp-manual-html/Makefile @@ -33,7 +33,6 @@ pre-everything:: @${ECHO_MSG} "This manual is available in two formats: HTML and PDF." @${ECHO_MSG} "Note that the manual is pretty darn big." -PREFIX?= ${X11BASE} # This port itself does not require Xlib EXTRACT_ONLY= #empty NO_BUILD= yes diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 9cb8243..cb50d5c 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimpshop PORTVERSION= 2.2.11 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics gnome MASTER_SITES= http://www.plasticbugs.com/blogimg/ \ http://freebsd.powered.net/distfiles/ @@ -28,15 +28,14 @@ CONFLICTS= gimp-1.* gimp-2.* gimp-gnome-2.* SHLIBVER?= 200 USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm x11 ice xmu USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 \ desktopfileutils WANT_GNOME= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ARGS= --disable-perl \ --with-html-dir=${DOCSDIR} \ @@ -44,8 +43,8 @@ CONFIGURE_ARGS= --disable-perl \ --enable-static \ --disable-print \ --with-desktop-dir=${LOCALBASE}/share -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/gimp-${PORTVERSION} diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile index a420327..f704d5a 100644 --- a/graphics/gkrellkam/Makefile +++ b/graphics/gkrellkam/Makefile @@ -7,22 +7,20 @@ PORTNAME= gkrellkam PORTVERSION= 0.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that display thumbnails of periodically updated images -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -USE_X_PREFIX= yes USE_GNOME= imlib USE_GMAKE= yes diff --git a/graphics/gkrellkam/files/patch-Makefile b/graphics/gkrellkam/files/patch-Makefile index f637464..7c9e042 100644 --- a/graphics/gkrellkam/files/patch-Makefile +++ b/graphics/gkrellkam/files/patch-Makefile @@ -10,7 +10,7 @@ -CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I$(GKRELLM_HDRS) +GTKFLAGS = `${GTK_CONFIG} --cflags` +IMLIBFLAGS = `${IMLIB_CONFIG} --cflags-gdk` -+CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${X11BASE}/include/gkrellm ++CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${LOCALBASE}/include/gkrellm LDFLAGS := -shared -Wl INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile index f532059..cc3ced8 100644 --- a/graphics/gkrellkam2/Makefile +++ b/graphics/gkrellkam2/Makefile @@ -8,20 +8,18 @@ PORTNAME= gkrellkam PORTVERSION= 2.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that display thumbnails of periodically updated images -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes USE_GMAKE= yes LATEST_LINK= gkrellkam2 diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index f8baa0c..dcdba2a 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -9,7 +9,7 @@ PORTNAME= gle PORTVERSION= 3.1.0 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF\ http://linas.org/gle/pub/ \ http://metalab.unc.edu/pub/Linux/libs/X/ \ ftp://tsx-11.mit.edu/pub/linux/sources/libs/ @@ -18,12 +18,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@dclg.ca COMMENT= A GL Tubing and Extrusion Library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_GL= glut USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= "LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}" +CONFIGURE_ENV= "LIBS=-L${LOCALBASE}/lib -lXext ${PTHREAD_LIBS}" MAN3= gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle \ glePolyCone.3gle glePolyCylinder.3gle gleScrew.3gle \ diff --git a/graphics/glean/files/patch-common.mak b/graphics/glean/files/patch-common.mak index c43083b..d268147 100644 --- a/graphics/glean/files/patch-common.mak +++ b/graphics/glean/files/patch-common.mak @@ -26,12 +26,12 @@ - GLUTLIB:=/usr/lib - TIFFINC:=#-I/usr/include - TIFFLIB:=/usr/lib -+ XINC:=-I${X11BASE}/include -+ XLIB:=${X11BASE}/lib -+ GLINC:=-I${X11BASE}/include -+ GLLIB:=${X11BASE}/lib -+ GLUTINC:=-I${X11BASE}/include -+ GLUTLIB:=${X11BASE}/lib ++ XINC:=-I${LOCALBASE}/include ++ XLIB:=${LOCALBASE}/lib ++ GLINC:=-I${LOCALBASE}/include ++ GLLIB:=${LOCALBASE}/lib ++ GLUTINC:=-I${LOCALBASE}/include ++ GLUTLIB:=${LOCALBASE}/lib + TIFFINC:=-I${LOCALBASE}/include + TIFFLIB:=${LOCALBASE}/lib EXTRALIBS:= diff --git a/graphics/glew/files/patch-config_Makefile.freebsd b/graphics/glew/files/patch-config_Makefile.freebsd index 2ce5d93..b765952f 100644 --- a/graphics/glew/files/patch-config_Makefile.freebsd +++ b/graphics/glew/files/patch-config_Makefile.freebsd @@ -14,12 +14,12 @@ $FreeBSD$ endif LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LDFLAGS.EXTRA = -L/usr/X11R6/lib -+LDFLAGS.EXTRA = -L${X11BASE}/lib ++LDFLAGS.EXTRA = -L${LOCALBASE}/lib LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic -CFLAGS.EXTRA += -I/usr/X11R6/include -+CFLAGS.EXTRA += -I${X11BASE}/include -fPIC ++CFLAGS.EXTRA += -I${LOCALBASE}/include -fPIC NAME = GLEW WARN = -Wall -W POPT = -O2 diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile index aea3233..62751a9 100644 --- a/graphics/glexcess/Makefile +++ b/graphics/glexcess/Makefile @@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME} MAINTAINER= hernan.di.pietro@gmail.com COMMENT= An impressive OpenGL Demo -LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut -USE_GL= yes +USE_GL= glut -MAKE_ARGS= 'CXXFLAGS=${CXXFLAGS} -I${X11BASE}/include -pipe -s -O2' \ - 'LDFLAGS=-L${X11BASE}/lib -lGL -lglut' +MAKE_ARGS= 'CXXFLAGS=${CXXFLAGS} -I${LOCALBASE}/include -pipe -s -O2' \ + 'LDFLAGS=-L${LOCALBASE}/lib -lGL -lglut' post-patch: @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/scene*.cpp diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index e1f0fe0..ee0e810 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -24,7 +24,6 @@ do-configure: @(cd ${WRKSRC} && \ ${SETENV} CC="${CC}" \ CFLAGS="${CFLAGS}" \ - X11BASE="${X11BASE}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" ./compile.sh) do-install: diff --git a/graphics/glfw/files/patch-compile.sh b/graphics/glfw/files/patch-compile.sh index 6097ed6..6428fd3 100644 --- a/graphics/glfw/files/patch-compile.sh +++ b/graphics/glfw/files/patch-compile.sh @@ -22,10 +22,10 @@ - LFLAGS="$LFLAGS -L/usr/X11R6/lib" - INCS="-I/usr/X11R6/include" - echo " X11 libraries location: /usr/X11R6/lib" 1>&6 -+elif [ -r "${X11BASE}/lib" ]; then -+ LFLAGS="$LFLAGS -L${X11BASE}/lib" -+ INCS="-I${X11BASE}/include" -+ echo " X11 libraries location: ${X11BASE}/lib" 1>&6 ++elif [ -r "${LOCALBASE}/lib" ]; then ++ LFLAGS="$LFLAGS -L${LOCALBASE}/lib" ++ INCS="-I${LOCALBASE}/include" ++ echo " X11 libraries location: ${LOCALBASE}/lib" 1>&6 # X11R5 in /usr/X11R5/lib ? elif [ -r "/usr/X11R5/lib" ]; then LFLAGS="$LFLAGS -L/usr/X11R5/lib" @@ -46,7 +46,7 @@ int main() {; return 0;} EOF -+CFLAGS="${CFLAGS} -I${X11BASE}/include" ++CFLAGS="${CFLAGS} -I${LOCALBASE}/include" + if { (eval echo $config_script: \"$compile\") 1>&5; (eval $compile) 2>&5; }; then rm -rf conftest* diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile index 3108e89..1ca8542 100644 --- a/graphics/glide3/Makefile +++ b/graphics/glide3/Makefile @@ -7,7 +7,7 @@ PORTNAME= glide3 PORTVERSION= 20020113 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://people.freebsd.org/~anholt/dri/files/ DISTNAME= Glide3-FreeBSD-${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= Library to support 3dfx Voodoo3/4/5/Banshee with the DRI USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xxf86dga xxf86vm USE_LDCONFIG= yes USE_AUTOTOOLS= automake:14 autoconf:261 libtool:15 AUTOMAKE_ARGS= -a diff --git a/graphics/glide3/files/patch-h3-src-makefile b/graphics/glide3/files/patch-h3-src-makefile index be64c68..6a1e96e 100644 --- a/graphics/glide3/files/patch-h3-src-makefile +++ b/graphics/glide3/files/patch-h3-src-makefile @@ -73,7 +73,7 @@ $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \ $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la -LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -+LINK_LIBS = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm CLEANFILES = fxinline.h fxgasm.h diff --git a/graphics/glide3/files/patch-h5-src-makefile b/graphics/glide3/files/patch-h5-src-makefile index c6ea072..42f094b 100644 --- a/graphics/glide3/files/patch-h5-src-makefile +++ b/graphics/glide3/files/patch-h5-src-makefile @@ -70,7 +70,7 @@ $(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \ $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la -LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm -+LINK_LIBS = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm ++LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm CLEANFILES = fxinline.h fxgasm.h diff --git a/graphics/glide3/files/patch-make-3dfx_mak b/graphics/glide3/files/patch-make-3dfx_mak index 272aabf..02d615f 100644 --- a/graphics/glide3/files/patch-make-3dfx_mak +++ b/graphics/glide3/files/patch-make-3dfx_mak @@ -5,7 +5,7 @@ ifeq "$(OS)" "FreeBSD" -GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I/usr/X11R6/include -+GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I$(X11BASE)/include ++GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I$(LOCALBASE)/include GCOPTS = -Wall -# -# BIG_OPT Indicates O3(?) or better is being used. It changes the diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile index cbc50bc..a4c266f 100644 --- a/graphics/glpng/Makefile +++ b/graphics/glpng/Makefile @@ -18,7 +18,7 @@ COMMENT= Library to easily load PNG files as an OpenGL textures LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_GL= yes +USE_GL= gl USE_ZIP= yes USE_LDCONFIG= yes @@ -30,8 +30,8 @@ post-patch: @${REINPLACE_CMD} -e 's|png/|libpng/|' ${WRKSRC}/glpng.c do-build: - ${CC} ${CFLAGS} -fPIC -I${X11BASE}/include -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c - ${CC} ${CFLAGS} -fPIC -L${X11BASE}/lib -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o + ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c + ${CC} ${CFLAGS} -fPIC -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o ${AR} cqs ${WRKSRC}/libglpng.a ${WRKSRC}/libglpng.o do-install: diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index ae6e297..7bbd561 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -7,29 +7,27 @@ PORTNAME= gltt PORTVERSION= 2.5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://gltt.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= TrueType fonts rendering using OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes +USE_GL= gl glut USE_FREETYPE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \ --with-ttf-libraries=${LOCALBASE}/lib \ - --with-gl-includes=${X11BASE}/include \ - --with-gl-libraries=${X11BASE}/lib \ - --with-glut-includes=${X11BASE}/include \ - --with-glut-libraries=${X11BASE}/lib + --with-gl-includes=${LOCALBASE}/include \ + --with-gl-libraries=${LOCALBASE}/lib \ + --with-glut-includes=${LOCALBASE}/include \ + --with-glut-libraries=${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index d767739..f83eac2 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -165,7 +165,7 @@ post-patch: @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist .if !defined(WITH_DEBUGLOG) @${REINPLACE_CMD} -e 's|gnash-dbg.log|/dev/null|' \ diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index d767739..f83eac2 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -165,7 +165,7 @@ post-patch: @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist .if !defined(WITH_DEBUGLOG) @${REINPLACE_CMD} -e 's|gnash-dbg.log|/dev/null|' \ diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index 991cd43..c549d0a 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnomeiconedit PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= giconedit +MASTER_SITES= SF/giconedit DISTNAME= gnome-iconedit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,7 +17,6 @@ COMMENT= A small GNOME Icon Editor USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint USE_GMAKE= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/goom/pkg-plist b/graphics/goom/pkg-plist index b34368d..f2b06ee 100644 --- a/graphics/goom/pkg-plist +++ b/graphics/goom/pkg-plist @@ -15,6 +15,5 @@ lib/libgoom2.la lib/libgoom2.so lib/libgoom2.so.0 libdata/pkgconfig/libgoom2.pc -%%XMMS%%@cwd %%X11BASE%% %%XMMS%%lib/xmms/Visualization/libxmmsgoom2.so @dirrm include/goom diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile index d587892..3038ead 100644 --- a/graphics/gozer/Makefile +++ b/graphics/gozer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gozer PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ @@ -16,10 +16,9 @@ COMMENT= Commandline text rendering utility - creates images from text LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-porbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-giblib-prefix=${X11BASE} +CONFIGURE_ARGS= --with-giblib-prefix=${LOCALBASE} MAN1= gozer.1 diff --git a/graphics/gplot/files/patch-aa b/graphics/gplot/files/patch-aa index 4ee8632..d228ef5 100644 --- a/graphics/gplot/files/patch-aa +++ b/graphics/gplot/files/patch-aa @@ -249,18 +249,18 @@ - /usr/include/X11/StringDefs.h \ - /usr/include/X11/Xutil.h \ - /usr/include/X11/cursorfont.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/StringDefs.h \ -+ $(X11BASE)/include/X11/Xutil.h \ -+ $(X11BASE)/include/X11/cursorfont.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/StringDefs.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/cursorfont.h \ defs.h xws_defs.h xws_delim.o: /usr/include/stdio.h \ /usr/include/strings.h \ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xutil.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ defs.h xws_defs.h xws_color.o: /usr/include/stdio.h \ @@ -268,35 +268,35 @@ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xutil.h \ - /usr/include/X11/Xatom.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include//X11/Xutil.h \ -+ $(X11BASE)/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include//X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ defs.h xws_defs.h xws_color.h -xws_polyline.o:/usr/include/X11/Intrinsic.h \ -+xws_polyline.o:$(X11BASE)/include/X11/Intrinsic.h \ ++xws_polyline.o:$(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_polygon.o: /usr/include/stdio.h \ - /usr/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_fill.h -xws_marker.o: /usr/include/X11/Intrinsic.h \ -+xws_marker.o: $(X11BASE)/include/X11/Intrinsic.h \ ++xws_marker.o: $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_text.o: /usr/include/strings.h \ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xatom.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ defs.h xws_defs.h xws_cla.o: /usr/include/stdio.h \ /usr/include/math.h \ - /usr/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_color.h #----------------------------------------------------------------------------- # DrawCGM and CGMGen, and test routines diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 986a3be..dff6443 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -20,7 +20,7 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= The Grid Analysis and Display System BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits.a:${PORTSDIR}/science/udunits \ - ${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx + ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index 2c54907..f66d5da 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -21,7 +21,7 @@ USE_XORG= x11 USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \ - --with-x11-base=${X11BASE} + --with-x11-base=${LOCALBASE} CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib ALL_TARGET= libs diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile index 7d3b7d1..11f4c87 100644 --- a/graphics/gsnapshot/Makefile +++ b/graphics/gsnapshot/Makefile @@ -7,6 +7,7 @@ PORTNAME= gsnapshot PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -16,6 +17,7 @@ COMMENT= A gtk+ based screen capture USE_AUTOTOOLS= automake:15:env libtool:15 USE_GNOME= gtk20 GNU_CONFIGURE= yes +USE_XORG= x11 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index ac13c91..60f47a4 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -7,6 +7,7 @@ PORTNAME= gthumb PORTVERSION= 2.10.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 @@ -18,7 +19,6 @@ COMMENT= An image viewer and browser for the GNOME 2 environment LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui gnomedocutils diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index c8b4c51..e6996d4 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -7,10 +7,9 @@ PORTNAME= gtkam PORTVERSION= 0.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gphoto +MASTER_SITES= SF/gphoto MAINTAINER= pav@FreeBSD.org COMMENT= Download and view files from various digital cameras @@ -18,7 +17,6 @@ COMMENT= Download and view files from various digital cameras LIB_DEPENDS= exif-gtk.5:${PORTSDIR}/graphics/libexif-gtk \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 -USE_XLIB= yes WANT_GNOME= yes USE_GNOME= gnomehack gnomehier gnometarget gtk20 GNU_CONFIGURE= yes diff --git a/graphics/gtkcairo/Makefile b/graphics/gtkcairo/Makefile index eba78f7..3a2dc6e 100644 --- a/graphics/gtkcairo/Makefile +++ b/graphics/gtkcairo/Makefile @@ -22,8 +22,8 @@ USE_BZIP2= yes USE_GNOME= gtk20 gnometarget gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= include/gtkcairo.h \ lib/libgtkcairo.a \ diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile index ca33235..c145040 100644 --- a/graphics/gtkfig/Makefile +++ b/graphics/gtkfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkfig PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \ http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Figure-drawing tool PLIST_FILES= bin/gtkfig -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 0daeea3..8b293a9 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkgraph PORTVERSION= 0.6.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jedgar @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= jedgar MAINTAINER= ports@FreeBSD.org COMMENT= Graphing calculator using GTK+ -USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= imlib diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile index 29f9984..39861ae 100644 --- a/graphics/gts/Makefile +++ b/graphics/gts/Makefile @@ -9,8 +9,7 @@ PORTNAME= gts PORTVERSION= 0.7.6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= erik@smluc.org COMMENT= GNU Triangulated Surface Library @@ -18,7 +17,7 @@ COMMENT= GNU Triangulated Surface Library USE_GNOME= glib20 gnometarget pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= NETPBM "Build with libnetpbm support" off diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile index ae57b42..1fb1829 100644 --- a/graphics/gview/Makefile +++ b/graphics/gview/Makefile @@ -7,14 +7,13 @@ PORTNAME= gview PORTVERSION= 0.1.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://homepages.petech.ac.za/~bruces/ MAINTAINER= ports@FreeBSD.org COMMENT= Image viewer for X Window System with interface similar to ACDSee -USE_X_PREFIX= yes USE_GNOME= gnomehack imlib GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile index f297f8f..722c5a2 100644 --- a/graphics/hs-hgl/Makefile +++ b/graphics/hs-hgl/Makefile @@ -28,7 +28,7 @@ HGL_DOCS= ${PREFIX}/share/doc/hs-hgl BUILD_WRKSRC= ${WRKSRC}/lib/x11 MAKE_ARGS= system=FreeBSD \ hugs_install=${HGL_LIBS} \ - X_dir=${X11BASE} \ + X_dir=${LOCALBASE} \ CC=${CC} ALL_TARGET= all diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile index 69d08d3..bbf8536 100644 --- a/graphics/hsetroot/Makefile +++ b/graphics/hsetroot/Makefile @@ -7,7 +7,7 @@ PORTNAME= hsetroot PORTVERSION= 1.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://thegraveyard.org/files/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Utility to compose wallpapers for X PLIST_FILES= bin/hsetroot -USE_X_PREFIX= YES USE_EFL= imlib2 GNU_CONFIGURE= YES diff --git a/graphics/ida/files/patch-GNUmakefile b/graphics/ida/files/patch-GNUmakefile index a146265..95694de 100644 --- a/graphics/ida/files/patch-GNUmakefile +++ b/graphics/ida/files/patch-GNUmakefile @@ -6,8 +6,8 @@ # for X11 + Motif -CFLAGS += -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/$(LIB) -+CFLAGS += -I$(X11BASE)/include -+LDFLAGS += -L$(X11BASE)/$(LIB) ++CFLAGS += -I$(LOCALBASE)/include ++LDFLAGS += -L$(LOCALBASE)/$(LIB) LDLIBS += -lXm -lXpm -lXt -lXext -lX11 # RegEdit.c is good old K&R ... diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index 33232d6..77173b1 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -7,7 +7,7 @@ PORTNAME= imagesort PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/X @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/X MAINTAINER= ports@FreeBSD.org COMMENT= A flexible X utility for managing many image files +USE_XORG= x11 xt USE_GNOME= imlib CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include diff --git a/graphics/imagesort/files/patch-Makefile b/graphics/imagesort/files/patch-Makefile index 559dd89..9661331 100644 --- a/graphics/imagesort/files/patch-Makefile +++ b/graphics/imagesort/files/patch-Makefile @@ -14,7 +14,7 @@ #LIBS = -lImlib -lX11 -lXext -ljpeg -lgif -lm -CFLAGS = -g -L$(XDIR)/lib -I$(XDIR)/include -+CFLAGS += -L$(LOCALBASE)/lib -L$(X11BASE)/lib -I$(X11BASE)/include ++CFLAGS += -L$(LOCALBASE)/lib -I$(LOCALBASE)/include all: imagesort.o diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 5fef0e0..3342b6c 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= imlib PORTVERSION= 1.9.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/imlib/1.9 @@ -22,8 +22,8 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_BZIP2= yes +USE_XORG= sm xext x11 USE_GMAKE= yes USE_GNOME= gtk12 gnomehack GNU_CONFIGURE= yes diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index d1279b9..281657c 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GNOME= gnomehack pkgconfig gnometarget -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes OPTIONS= JPEG "Enable jpeg image support" on \ @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --without-x PKGNAMESUFFIX+= -nox11 PLIST_SUB= X11="@comment " .else -USE_XLIB= yes +USE_XORG= x11 sm xext PLIST_SUB= X11="" .endif diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 23aa65a..3db6c29 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -25,9 +25,8 @@ USE_GL= glw USE_GMAKE= yes USE_ICONV= yes USE_MOTIF= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 -#PREFIX= ${X11BASE} # not a good manner WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs index bda1123..53aaf37 100644 --- a/graphics/inventor/files/patch-ivcommondefs +++ b/graphics/inventor/files/patch-ivcommondefs @@ -18,7 +18,7 @@ LCOPTS += $(LINUXOPTS) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} X11INCDIR = $(X11DIR)/include X11LIBDIR = $(X11DIR)/lib @@ -61,7 +61,7 @@ # +ifeq ($(usingFreeBSD), 1) -+IVPREFIX = ${X11BASE} ++IVPREFIX = ${LOCALBASE} +else IVPREFIX = /usr +endif diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 044e9ba..7cb052b 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -7,7 +7,7 @@ PORTNAME= ipe PORTVERSION= 6.0.p23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://ipe.compgeom.org/ \ http://tclab.kaist.ac.kr/~otfried/Ipe/ @@ -25,7 +25,6 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_QT_VER= 3 MAKE_ENV+= QTDIR=${QTDIR} -USE_XLIB= yes USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib MAN1= figtoipe.1 ipe.1 ipe5toxml.1 ipetoipe.1 ipetopng.1 diff --git a/graphics/irit/Makefile b/graphics/irit/Makefile index 8ac19e2..1723a8b 100644 --- a/graphics/irit/Makefile +++ b/graphics/irit/Makefile @@ -7,7 +7,7 @@ PORTNAME= irit PORTVERSION= 9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.cs.technion.ac.il/~irit/ DISTNAME= ${PORTNAME}-sm @@ -23,10 +23,9 @@ BROKEN= Checksum mismatch USE_ZIP= yes USE_GMAKE= yes -USE_XLIB= yes .ifdef (WITH_MOTIF) USE_MOTIF= yes -USE_GL= yes +USE_GL= gl .endif USE_LDCONFIG= yes NO_WRKSUBDIR= yes diff --git a/graphics/irit/files/patch-makeflag.gnux b/graphics/irit/files/patch-makeflag.gnux index 93ae1aa..de21885 100644 --- a/graphics/irit/files/patch-makeflag.gnux +++ b/graphics/irit/files/patch-makeflag.gnux @@ -51,8 +51,8 @@ # -# MESA_INC = -I/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/include -D__MESA__ -D__OPENGL__ -# MESA_LIB = -L/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/lib -lGLU -lGL -+MESA_INC = -I${X11BASE}/include -D__MESA__ -D__OPENGL__ -+MESA_LIB = -L${X11BASE}/lib -lGLU -lGL ++MESA_INC = -I${LOCALBASE}/include -D__MESA__ -D__OPENGL__ ++MESA_LIB = -L${LOCALBASE}/lib -lGLU -lGL # # Support of (shared) libraries. You will need to set the proper suffix @@ -105,7 +105,7 @@ +ifeq ($(WITH_MOTIF_DEF),yes) +DFLAGS+= ${MESA_INC} +else -+DFLAGS+= -D__X11__ -I${X11BASE}/include ++DFLAGS+= -D__X11__ -I${LOCALBASE}/include +endif +CFLAGS += -fPIC $(DFLAGS) # ifeq ($(CFG), Rel) @@ -118,10 +118,10 @@ -# GRAPXMTLIBS = -L/usr/X11R6/lib -lXm -lXt -lX11 -# GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) +MORELIBS = -lc -+GRAPX11LIBS = -L${X11BASE}/lib -lX11 ++GRAPX11LIBS = -L${LOCALBASE}/lib -lX11 +GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) +ifeq ($(WITH_MOTIF_DEF),yes) -+GRAPXMTLIBS = -L${X11BASE}/lib -lXm -lXt -lX11 ++GRAPXMTLIBS = -L${LOCALBASE}/lib -lXm -lXt -lX11 +GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS} +GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF) +endif diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile index 760c5a7..b047a3e 100644 --- a/graphics/isreal/Makefile +++ b/graphics/isreal/Makefile @@ -7,7 +7,7 @@ PORTNAME= isreal PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= markp @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An image classification utility PLIST_FILES= bin/isreal -USE_XLIB= yes USE_GNOME= imlib CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include diff --git a/graphics/isreal/files/patch-Makefile b/graphics/isreal/files/patch-Makefile index 0e787f8..03227ed 100644 --- a/graphics/isreal/files/patch-Makefile +++ b/graphics/isreal/files/patch-Makefile @@ -9,10 +9,10 @@ -CFLAGS = -g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -+LIBS = -L$(X11BASE)/lib -L/usr/local/lib -lX11 -lXext \ ++LIBS = -L$(LOCALBASE)/lib -L/usr/local/lib -lX11 -lXext \ + -ljpeg -lpng -ltiff -lz -lungif -lm -lImlib + -+CFLAGS += -I$(X11BASE)/include ++CFLAGS += -I$(LOCALBASE)/include VERSION=2.0 diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 002406e..34de168 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -7,19 +7,17 @@ PORTNAME= ivtools PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= araujo@FreeBSD.org COMMENT= Drawing editors derived from idraw -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff -USE_XLIB= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:261 CONFIGURE_ARGS= --with-tiff=${PREFIX} diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile index e976e6d..b01f892 100644 --- a/graphics/kludge3d/Makefile +++ b/graphics/kludge3d/Makefile @@ -10,8 +10,7 @@ PORTNAME= kludge3d PORTVERSION= 20040822 PORTREVISION= 6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A simple 3d editor @@ -20,7 +19,7 @@ LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_PYTHON= yes -USE_GL= yes +USE_GL= gl USE_GNOME= gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes @@ -29,9 +28,9 @@ CONFIGURE_ARGS= --with-lib-GL PLIST_FILES= bin/kludge3d -CPPFLAGS= -I${LOCALBASE}/include -L${X11BASE}/include \ +CPPFLAGS= -I${LOCALBASE}/include \ -I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -L${LOCALBASE}/lib \ -L${PYTHON_LIBDIR}/config ${PTHREAD_LIBS} post-patch: diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile index 47cbc58..041d0b9 100644 --- a/graphics/kudu/Makefile +++ b/graphics/kudu/Makefile @@ -16,13 +16,13 @@ COMMENT= A 3D skeletal animation tool, powered by GTK+ and OpenGL LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext -USE_GL= yes +USE_GL= gl USE_PYTHON= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile index 26873dd..8b4309a 100644 --- a/graphics/lib3ds/Makefile +++ b/graphics/lib3ds/Makefile @@ -13,13 +13,12 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A library for handling 3DS (3D Studio) files -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_ZIP= yes USE_LDCONFIG= yes +USE_GL= glut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= 3dsdump.1 lib3ds-config.1 diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index d7b633b..b05eef7 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -32,7 +32,7 @@ USE_LDCONFIG= yes MAKE_ARGS= SHELL=${SH} CFLAGS+= -DUSE_XSHM -DHZ=100 -PREFIX= ${X11BASE} +PREFIX= ${LOCALBASE} FILESDIR= ${.CURDIR}/../../graphics/libGL/files WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} CONFDIR= ${WRKSRC}/configs @@ -66,7 +66,7 @@ FAST_MATH= -ffast-math pre-patch: @${REINPLACE_CMD} \ -e '/^CC =/d' -e '/^CXX =/d' \ - -e 's|/usr/X11R6|${X11BASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|-ffast-math|${FAST_MATH}|g' \ @@ -76,9 +76,9 @@ pre-patch: -e 's|-DHAVE_POSIX_MEMALIGN||' \ ${CONFDIR}/freebsd-dri @${REINPLACE_CMD} \ - -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${X11BASE}/include|' \ - -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${X11BASE}/lib|' \ - -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \ + -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${LOCALBASE}/include|' \ + -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${LOCALBASE}/lib|' \ + -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${LOCALBASE}/lib/dri|' \ ${CONFDIR}/default .if !target(do-install) diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile index 6d408e5..e45b3a1 100644 --- a/graphics/libafterimage/Makefile +++ b/graphics/libafterimage/Makefile @@ -8,10 +8,9 @@ PORTNAME= libafterimage PORTVERSION= 1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= afterstep +MASTER_SITES= SF/afterstep DISTNAME= libAfterImage-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -26,11 +25,11 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GNOME= librsvg2 USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= x11 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs \ --without-builtin-ungif --without-afterbase \ --with-x diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index d0ec8ef..2696b5a 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -7,6 +7,7 @@ PORTNAME= libcaca DISTVERSION= 0.99.beta13 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://libcaca.zoy.org/files/ @@ -31,7 +32,7 @@ MAN1= caca-config.1 cacafire.1 cacaplay.1 cacaserver.1 cacaview.1 \ .if defined(WITHOUT_X11) CONFIGURE_ARGS+=--disable-x11 .else -USE_XLIB= yes +USE_XORG= x11 .endif .if defined(WITHOUT_IMLIB2) diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile index eb58e16..39b03f2 100644 --- a/graphics/libflash/Makefile +++ b/graphics/libflash/Makefile @@ -7,10 +7,9 @@ PORTNAME= libflash PORTVERSION= 0.4.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gplflash +MASTER_SITES= Sf/gplflash DISTNAME= gplflash-${PORTVERSION} MAINTAINER= llwang@infor.org @@ -19,6 +18,7 @@ COMMENT= GPL Flash (TM) Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ jpeg.9:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 xext xkbfile xt WRKSRC= ${WRKDIR}/${DISTNAME}/lib USE_AUTOTOOLS= libtool:15 PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} @@ -26,8 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} USE_BZIP2= yes -USE_XLIB= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/swf.h diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile index 433306e..ec5502e 100644 --- a/graphics/libgdgeda/Makefile +++ b/graphics/libgdgeda/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile index d60b0b4..e7da0ff 100644 --- a/graphics/libgfx/Makefile +++ b/graphics/libgfx/Makefile @@ -20,13 +20,13 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ jpeg.9:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS= ${LOCALBASE}/lib/libgzstream.a:${PORTSDIR}/devel/gzstream -USE_GL= yes +USE_GL= gl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gzstream --with-libtiff-lzw --with-x -CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= libgfx.a diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile index 2ebf8d9..a1dd3ad 100644 --- a/graphics/libgltext/Makefile +++ b/graphics/libgltext/Makefile @@ -9,8 +9,7 @@ PORTNAME= libgltext PORTVERSION= 0.3.1 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gltext +MASTER_SITES= SF/gltext DISTNAME= gltext-${PORTVERSION} MAINTAINER= acm@FreeBSD.org @@ -19,11 +18,11 @@ COMMENT= Portable font rendering library for C++ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool:15 -USE_GL= yes +USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +USE_LCONFIG= yes +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" @@ -32,7 +31,7 @@ OPTIONS= EXAMPLES "Compile examples, need libglut" off .include <bsd.port.pre.mk> .if defined(WITH_EXAMPLES) -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut FLAG_EXAMPLES= true PLIST_SUB+= EXAMPLES="" .else diff --git a/graphics/libglut/files/Makefile b/graphics/libglut/files/Makefile index 5274801..e7f3ee5 100644 --- a/graphics/libglut/files/Makefile +++ b/graphics/libglut/files/Makefile @@ -4,8 +4,8 @@ LIB= glut SHLIB_MAJOR= 4 -CFLAGS+= -I../../../include -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi +CFLAGS+= -I../../../include -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi LIBDIR= ${PREFIX}/lib NO_PROFILE?= yes diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 190ae5d..4ee4f0b 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -8,9 +8,9 @@ PORTNAME= libgnomecanvas PORTVERSION= 2.20.1.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack gail diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index 2ed2101..75e3a4d 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -9,8 +9,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.0.1 PORTREVISION= 7 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -19,11 +18,10 @@ COMMENT= C++ wrapper for libgnomecanvas library LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnomecanvas USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static post-patch: diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 5a8659b..36b5ba8 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,9 +23,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomecanvasmm26 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnomecanvas GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index c6cf276..9b40eee 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -9,8 +9,7 @@ PORTNAME= libimg PORTVERSION= 1.2.4 PORTREVISION= 4 CATEGORIES?= graphics tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tkimg +MASTER_SITES= SF/tkimg DISTNAME= img${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -54,7 +53,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/libz/*' \ MAKE_ARGS= PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \ MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \ - X11BASE="${X11BASE}" SHLIB_NAME="${SHLIB_NAME}" \ + SHLIB_NAME="${SHLIB_NAME}" \ DIR="${DIR}" USE_LDCONFIG= yes diff --git a/graphics/libimg/files/Makefile.bsd b/graphics/libimg/files/Makefile.bsd index 54d2aa2..310b534 100644 --- a/graphics/libimg/files/Makefile.bsd +++ b/graphics/libimg/files/Makefile.bsd @@ -2,7 +2,6 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.4 .if exists(${LOCALBASE}/lib/tk${TCL_VER}/tkConfig.sh) @@ -20,11 +19,11 @@ TK_STUB_LIB_SPEC= -L${LOCALBASE}/lib -ltkstub${TCL_VER:S/.//} LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ ${TCL_STUB_LIB_SPEC} ${TK_STUB_LIB_SPEC} \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tk${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. -DUSE_TCL_STUBS -DUSE_TK_STUBS CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include diff --git a/graphics/libimg/files/Makefile.tkstep80 b/graphics/libimg/files/Makefile.tkstep80 index a7bfdb7..7788c16 100644 --- a/graphics/libimg/files/Makefile.tkstep80 +++ b/graphics/libimg/files/Makefile.tkstep80 @@ -2,15 +2,14 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.0 LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tkstep${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include diff --git a/graphics/liblug/files/patch-aa b/graphics/liblug/files/patch-aa index 746a76b..2d9ae6c 100644 --- a/graphics/liblug/files/patch-aa +++ b/graphics/liblug/files/patch-aa @@ -71,8 +71,8 @@ -VIEWINC = -I/usr/X11/include -VIEWLIB = -L/usr/X11/lib -lX11 -VIEWDEF = -DiX11 -DiLINUX -+VIEWINC = -I${X11BASE}/include -+VIEWLIB = -L${X11BASE}/lib -lX11 ++VIEWINC = -I${LOCALBASE}/include ++VIEWLIB = -L${LOCALBASE}/lib -lX11 +VIEWDEF = -DiX11 # diff --git a/graphics/libpcd/Makefile b/graphics/libpcd/Makefile index 102c7e0..6b9d648 100644 --- a/graphics/libpcd/Makefile +++ b/graphics/libpcd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= anray@FreeBSD.org COMMENT= A library for reading PhotoCD images USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} MAKEFILE= ${WRKSRC}/GNUmakefile diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 60fbae9..0cc8e7c 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -7,9 +7,9 @@ PORTNAME= librsvg PORTVERSION= 1.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sources/librsvg/1.0 MAINTAINER= gnome@FreeBSD.org @@ -21,7 +21,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomelibs gdkpixbuf USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 521e371..c06184d 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -8,6 +8,7 @@ PORTNAME= librsvg2 PORTVERSION= 2.22.2 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,7 +25,6 @@ RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack diff --git a/graphics/libv3d/Makefile b/graphics/libv3d/Makefile index ada1e0d..8edbc87 100644 --- a/graphics/libv3d/Makefile +++ b/graphics/libv3d/Makefile @@ -81,7 +81,7 @@ MAN3= V3DGLInterpriteDelete.3 \ post-patch: @${REINPLACE_CMD} -e "s,make,${GMAKE},g" ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ + -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ -e "s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g" \ -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" \ ${WRKSRC}/libv3d/platforms.ini diff --git a/graphics/libv3d/files/patch-platforms.ini b/graphics/libv3d/files/patch-platforms.ini index f6bbe8a..52c466d 100644 --- a/graphics/libv3d/files/patch-platforms.ini +++ b/graphics/libv3d/files/patch-platforms.ini @@ -13,17 +13,17 @@ CPP = c++ PlatformSearchPathInclude = /usr/include/ - PlatformSearchPathInclude = /usr/X11R6/include/ -+ PlatformSearchPathInclude = %%X11BASE%%/include/ ++ PlatformSearchPathInclude = %%LOCALBASE%%/include/ PlatformSearchPathLib = /lib/ PlatformSearchPathLib = /usr/lib/ - PlatformSearchPathLib = /usr/X11R6/lib/ -+ PlatformSearchPathLib = %%X11BASE%%/lib/ ++ PlatformSearchPathLib = %%LOCALBASE%%/lib/ PlatformSearchPathEtc = /etc/ PlatformSearchPathEtc = /usr/etc/ PlatformSearchPathBin = /bin/ PlatformSearchPathBin = /usr/bin/ - PlatformSearchPathBin = /usr/X11R6/bin/ -+ PlatformSearchPathBin = %%X11BASE%%/bin/ ++ PlatformSearchPathBin = %%LOCALBASE%%/bin/ PlatformSearchPathBin = /usr/games/ PlatformSearchPathData = /usr/share/icons/ PlatformSearchPathData = /usr/share/games/ @@ -32,7 +32,7 @@ # FeatureCFLAGS = # FeatureLIBS = -lSM -lICE -lX11 -lXext -lXi -lXmu -# FeatureLIB_DIR = -L/usr/X11R6/lib/ -+# FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++# FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ # FeatureDepend = X11-lib # DependType = Library # MustExist = Yes @@ -42,9 +42,9 @@ MustExist = Yes - FeatureLIBS = -lGL -lGLU - FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureCFLAGS = -I%%X11BASE%%/include %%PTHREAD_CFLAGS%% -fPIC ++ FeatureCFLAGS = -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%% -fPIC + FeatureLIBS = -lGL -lGLU %%PTHREAD_LIBS%% -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ FeatureDepend = gl-lib DependType = Library MustExist = Yes diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile index 9a49900..1649aa0 100644 --- a/graphics/libvisual-plugins/Makefile +++ b/graphics/libvisual-plugins/Makefile @@ -7,10 +7,9 @@ PORTNAME= libvisual-plugins PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= libvisual +MASTER_SITES= SF/libvisual MAINTAINER= ports@FreeBSD.org COMMENT= Set of plugins for the libvisual framework @@ -19,12 +18,11 @@ LIB_DEPENDS= visual.0:${PORTSDIR}/graphics/libvisual WANT_GNOME= yes USE_GNOME= gnometarget pkgconfig -USE_GL= yes -USE_XLIB= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> @@ -32,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ BROKEN= Broken objformat handling .endif -BUILD_DEPENDS= mkdirhier:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake .if defined(WITH_MPLAYER) BUILD_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile index 46bc832..b5ff89b 100644 --- a/graphics/libvisual04-plugins/Makefile +++ b/graphics/libvisual04-plugins/Makefile @@ -30,8 +30,8 @@ CONFIGURE_ARGS= --disable-alsa \ --disable-gforce \ --disable-jess \ --prefix=${PREFIX} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAJORMINOR= ${PORTVERSION:C/.[0-9]+$//} diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile index 3b72c6e..20e663a 100644 --- a/graphics/libvisual04/Makefile +++ b/graphics/libvisual04/Makefile @@ -15,7 +15,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Abstraction library that sits between apps and visual plugin USE_AUTOTOOLS= libtool:15 -USE_XLIBS= yes USE_GNOME= gnomehack pkgconfig USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile index 7f8882b..409dfde 100644 --- a/graphics/libwpcg/Makefile +++ b/graphics/libwpcg/Makefile @@ -16,13 +16,12 @@ DISTNAME= libWPCG-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A basic 2D/3D computer graphics library which uses OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_GCC= 3.4 +USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -lGL -lGLU -lglut" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lGL -lGLU -lglut" .include <bsd.port.pre.mk> diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile index a8f4171..cb23c62 100644 --- a/graphics/libx3dtk/Makefile +++ b/graphics/libx3dtk/Makefile @@ -44,8 +44,8 @@ post-patch: do-configure: cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${QMAKE} \ -spec ${QMAKESPEC} \ - INCLUDEPATH=${X11BASE}/include \ - LIBS=-L${X11BASE}/lib \ + INCLUDEPATH=${LOCALBASE}/include \ + LIBS=-L${LOCALBASE}/lib \ PARSER=LIBXML \ LIBXML_DIR=${LOCALBASE} \ JPEG=YES \ @@ -57,8 +57,8 @@ do-configure: PREFIX="${PREFIX}" cd ${WRKSRC}/examples && ${SETENV} ${MAKE_ENV} ${QMAKE} \ -spec ${QMAKESPEC} \ - INCLUDEPATH=${X11BASE}/include \ - LIBS=-L${X11BASE}/lib \ + INCLUDEPATH=${LOCALBASE}/include \ + LIBS=-L${LOCALBASE}/lib \ PARSER=LIBXML \ LIBXML_DIR=${LOCALBASE} \ JPEG=YES \ diff --git a/graphics/linux-adobesvg/Makefile b/graphics/linux-adobesvg/Makefile index cab770f..1d72fc5 100644 --- a/graphics/linux-adobesvg/Makefile +++ b/graphics/linux-adobesvg/Makefile @@ -16,7 +16,7 @@ MAINTAINER= jylefort@FreeBSD.org COMMENT= The Adobe SVG browser plugin (Linux version) ONLY_FOR_ARCHS= i386 amd64 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes RESTRICTED= "Redistribution prohibited" diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile index 0f26e09..3b2712c 100644 --- a/graphics/linux-cairo/Makefile +++ b/graphics/linux-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile index 0f26e09..3b2712c 100644 --- a/graphics/linux-f10-cairo/Makefile +++ b/graphics/linux-f10-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile index 430882b..28ad286 100644 --- a/graphics/linux-f10-gdk-pixbuf/Makefile +++ b/graphics/linux-f10-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile index 92cf2ae..70552b4 100644 --- a/graphics/linux-f10-imlib/Makefile +++ b/graphics/linux-f10-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile index 4f56ec8..abd359e 100644 --- a/graphics/linux-f10-jpeg/Makefile +++ b/graphics/linux-f10-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile index 1e24602..0f02540 100644 --- a/graphics/linux-f10-libGLU/Makefile +++ b/graphics/linux-f10-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile index 39d256d..6db7e51 100644 --- a/graphics/linux-f10-libmng/Makefile +++ b/graphics/linux-f10-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile index 7928ef4..10c3d32 100644 --- a/graphics/linux-f10-png/Makefile +++ b/graphics/linux-f10-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile index dfe6b02..d236717 100644 --- a/graphics/linux-f10-png10/Makefile +++ b/graphics/linux-f10-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile index c2e5895..307cb83 100644 --- a/graphics/linux-f10-tiff/Makefile +++ b/graphics/linux-f10-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile index 2c00625..33f9450 100644 --- a/graphics/linux-f10-ungif/Makefile +++ b/graphics/linux-f10-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-cairo/Makefile b/graphics/linux-f8-cairo/Makefile index 0f26e09..3b2712c 100644 --- a/graphics/linux-f8-cairo/Makefile +++ b/graphics/linux-f8-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile index 430882b..28ad286 100644 --- a/graphics/linux-f8-gdk-pixbuf/Makefile +++ b/graphics/linux-f8-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile index 92cf2ae..70552b4 100644 --- a/graphics/linux-f8-imlib/Makefile +++ b/graphics/linux-f8-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile index 4f56ec8..abd359e 100644 --- a/graphics/linux-f8-jpeg/Makefile +++ b/graphics/linux-f8-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-f8-libGLU/Makefile b/graphics/linux-f8-libGLU/Makefile index 1e24602..0f02540 100644 --- a/graphics/linux-f8-libGLU/Makefile +++ b/graphics/linux-f8-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile index 39d256d..6db7e51 100644 --- a/graphics/linux-f8-libmng/Makefile +++ b/graphics/linux-f8-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile index 7928ef4..10c3d32 100644 --- a/graphics/linux-f8-png/Makefile +++ b/graphics/linux-f8-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile index dfe6b02..d236717 100644 --- a/graphics/linux-f8-png10/Makefile +++ b/graphics/linux-f8-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile index c2e5895..307cb83 100644 --- a/graphics/linux-f8-tiff/Makefile +++ b/graphics/linux-f8-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile index 2c00625..33f9450 100644 --- a/graphics/linux-f8-ungif/Makefile +++ b/graphics/linux-f8-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index 430882b..28ad286 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile index 92cf2ae..70552b4 100644 --- a/graphics/linux-imlib/Makefile +++ b/graphics/linux-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index 4f56ec8..abd359e 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-libGLU/Makefile b/graphics/linux-libGLU/Makefile index 1e24602..0f02540 100644 --- a/graphics/linux-libGLU/Makefile +++ b/graphics/linux-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile index 39d256d..6db7e51 100644 --- a/graphics/linux-libmng/Makefile +++ b/graphics/linux-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile index 7928ef4..10c3d32 100644 --- a/graphics/linux-png/Makefile +++ b/graphics/linux-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile index dfe6b02..d236717 100644 --- a/graphics/linux-png10/Makefile +++ b/graphics/linux-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile index c2e5895..307cb83 100644 --- a/graphics/linux-tiff/Makefile +++ b/graphics/linux-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile index 2c00625..33f9450 100644 --- a/graphics/linux-ungif/Makefile +++ b/graphics/linux-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile index 3f396b9..156879d 100644 --- a/graphics/makehuman/Makefile +++ b/graphics/makehuman/Makefile @@ -15,16 +15,15 @@ MAINTAINER= amdmi3@amdmi3.ru COMMENT= Application for parametrical modeling of 3D humanoid characters LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \ - mhgui.0:${PORTSDIR}/graphics/mhgui \ - glut.4:${PORTSDIR}/graphics/libglut + mhgui.0:${PORTSDIR}/graphics/mhgui GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig -USE_GL= yes +USE_GL= glut -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile index 647e383..6da92a5 100644 --- a/graphics/maverik/Makefile +++ b/graphics/maverik/Makefile @@ -23,7 +23,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ DISTNAME="${DISTNAME}" HAS_CONFIGURE= yes CONFIGURE_SCRIPT= setup -CONFIGURE_ARGS= --MESAPATH=${X11BASE} +CONFIGURE_ARGS= --MESAPATH=${LOCALBASE} USE_LDCONFIG= yes MANCOMPRESSED= no @@ -49,7 +49,7 @@ post-extract: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genman3list.sh post-patch: - @${REINPLACE_CMD} -e "s,%%X11BASE%%,${X11BASE},g ; \ + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \ s,%%CC%%,${CC},g ; \ s,%%CXX%%,${CXX},g ; \ s,%%CFLAGS%%,${CFLAGS},g ; \ diff --git a/graphics/maverik/files/patch-setup b/graphics/maverik/files/patch-setup index 6bfe6c9..9d43054 100644 --- a/graphics/maverik/files/patch-setup +++ b/graphics/maverik/files/patch-setup @@ -5,7 +5,7 @@ MESAPATH="" MESADEFAULT=1 -XLIBPATH="/usr/X11R6/lib" -+XLIBPATH="%%X11BASE%%/lib" ++XLIBPATH="%%LOCALBASE%%/lib" TR=0 TRINCL="" TRLIBS="" @@ -36,7 +36,7 @@ + CXXFLAG=`echo $OS $OT %%CXXFLAGS%%` if [ "$MESADEFAULT" = "1" ] ; then - MESAPATH="/usr/X11R6" -+ MESAPATH="%%X11BASE%%" ++ MESAPATH="%%LOCALBASE%%" fi OPENGLINCL="-I${MESAPATH}/include" OPENGLLIBS="-L${MESAPATH}/lib -lGL -lGLU -L${XLIBPATH} -lX11 -lXext" diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 7f7f28f..83fecf3 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -26,9 +26,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= # empty CONFIGURE_ARGS+= COMPILED_BY="ports@FreeBSD.org" -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/graphics/mesa-demos/files/config b/graphics/mesa-demos/files/config index 1b035a5..a46afa0 100644 --- a/graphics/mesa-demos/files/config +++ b/graphics/mesa-demos/files/config @@ -8,7 +8,7 @@ _CC := $(CC) _CXX := $(CXX) -_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \ +_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \ -DPTHREADS $(PTHREAD_CFLAGS) _CXXFLAGS := -fPIC -pedantic $(CXXFLAGS) @@ -24,7 +24,7 @@ CXXFLAGS = $(_CXXFLAGS) GLUT_CFLAGS = -fexceptions -LIB_DIR = $(X11BASE)/lib +LIB_DIR = $(LOCALBASE)/lib APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS) diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile index 2f88c00..fe7618e 100644 --- a/graphics/mhgui/Makefile +++ b/graphics/mhgui/Makefile @@ -24,8 +24,8 @@ USE_GNOME= pkgconfig USE_LDCONFIG= yes USE_GL= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile index 814710b..c20ae34 100644 --- a/graphics/morpheus/Makefile +++ b/graphics/morpheus/Makefile @@ -7,7 +7,7 @@ PORTNAME= morpheus PORTVERSION= 0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= http://www.winnicki.net/morpheus/meat/ @@ -15,10 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A mesh (3D model) viewer for GNOME desktop LIB_DEPENDS= morph.0:${PORTSDIR}/graphics/libmorph \ - gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ - glut.4:${PORTSDIR}/graphics/libglut + gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea -USE_X_PREFIX= yes +USE_GL= glut USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/moth/Makefile b/graphics/moth/Makefile index 5685822..39c91e2 100644 --- a/graphics/moth/Makefile +++ b/graphics/moth/Makefile @@ -20,11 +20,10 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff USE_GMAKE= yes USE_QT_VER= 3 -USE_GL= yes -USE_X_PREFIX= yes -MAKE_ARGS= CC="${CXX}" XLIBDIR="${X11BASE}/lib" MOC="${MOC}" \ +USE_GL= gl +MAKE_ARGS= CC="${CXX}" XLIBDIR="${LOCALBASE}/lib" MOC="${MOC}" \ CFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" QTDIR="${QT_PREFIX}" \ - GLINCLUDEDIR="${X11BASE}/include" \ + GLINCLUDEDIR="${LOCALBASE}/include" \ MOTH_INCLUDES="${WRKSRC_LIBMOTH}/include" \ MOTH_LIBRARIES="${WRKSRC_LIBMOTH}/lib" ALL_TARGET= clean moth diff --git a/graphics/mxp/Makefile b/graphics/mxp/Makefile index a5ca1d7..8b5d3db 100644 --- a/graphics/mxp/Makefile +++ b/graphics/mxp/Makefile @@ -23,9 +23,8 @@ post-extract: @${CP} ${WRKSRC}/Makefile.noimake ${WRKSRC}/Makefile post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ - s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%CC%%|${CC}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mxp ${PREFIX}/bin diff --git a/graphics/mxp/files/patch-Makefile b/graphics/mxp/files/patch-Makefile index 7aa5edb..6660193 100644 --- a/graphics/mxp/files/patch-Makefile +++ b/graphics/mxp/files/patch-Makefile @@ -17,8 +17,8 @@ # following 2 defines. -XLIBS = -L/usr/openwin/lib -XINC = -I/usr/openwin/include -+XLIBS = -L%%X11BASE%%/lib -+XINC = -I%%X11BASE%%/include ++XLIBS = -L%%LOCALBASE%%/lib ++XINC = -I%%LOCALBASE%%/include # Specify where your Xpm installation directories are # If you have the XPM libraries uncomment and adjust the following lines diff --git a/graphics/netpbm-devel/files/patch-pm_config.in.h b/graphics/netpbm-devel/files/patch-pm_config.in.h index 673f882..21e6d98 100644 --- a/graphics/netpbm-devel/files/patch-pm_config.in.h +++ b/graphics/netpbm-devel/files/patch-pm_config.in.h @@ -20,7 +20,7 @@ -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" +#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt" +#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt" -+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB3 "%%LOCALBASE%%/lib/X11/rgb.txt" #endif /* CONFIGURE: This is the name of an environment variable that tells diff --git a/graphics/netpbm/files/patch-pm_config.in.h b/graphics/netpbm/files/patch-pm_config.in.h index 673f882..21e6d98 100644 --- a/graphics/netpbm/files/patch-pm_config.in.h +++ b/graphics/netpbm/files/patch-pm_config.in.h @@ -20,7 +20,7 @@ -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" +#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt" +#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt" -+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB3 "%%LOCALBASE%%/lib/X11/rgb.txt" #endif /* CONFIGURE: This is the name of an environment variable that tells diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index e5bed1f..7b60a84 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -31,14 +31,14 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ tiff.4:${PORTSDIR}/graphics/tiff USE_GHOSTSCRIPT= yes -USE_XPM= yes +USE_XORG= xpm USE_FREETYPE= yes HAS_CONFIGURE= yes CONFIGURE_ENV= \ - CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --includedir=${LOCALBASE}/include --includedir=${X11BASE}/include + CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_ARGS= --includedir=${LOCALBASE}/include USE_GMAKE= yes PKGDEINSTALL= ${PKGINSTALL} diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index 3a6baf4..b46ae2a 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -15,9 +15,7 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= stas@FreeBSD.org COMMENT= OpenGL interface for Objective Caml -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_OCAML= yes USE_OCAML_WASH= yes @@ -35,7 +33,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl post-extract: @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config - @${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" \ + @${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" \ -e "s,/usr/local,${LOCALBASE},g" \ -e "s,^\(BINDIR[ \t]*=\).*,\1${PREFIX}/bin,g" \ -e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \ diff --git a/graphics/oglext/Makefile b/graphics/oglext/Makefile index ad00f09..3c0d0bd 100644 --- a/graphics/oglext/Makefile +++ b/graphics/oglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= oglext PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= http://www.julius.caesar.de/files/oglext/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,8 +18,7 @@ COMMENT= A library for easier access to OpenGL extensions BUILD_DEPENDS= ${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl USE_LDCONFIG= yes REINPLACE_ARGS= -i "" diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index 899c409..e72a9a8 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= zzip.13:${PORTSDIR}/devel/zziplib \ WRKSRC= ${WRKDIR}/ogrenew CONFIGURE_ARGS= --disable-cg --program-transform-name= --enable-static \ --with-cppunit-prefix=/nonexistent --disable-freeimage -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -DNDEBUG" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -DNDEBUG" \ ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \ ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip" GNU_CONFIGURE= YES @@ -41,7 +41,7 @@ post-patch: s|sdl-config|${SDL_CONFIG}|g; \ s|-lpthread|${PTHREAD_LIBS}|g; \ s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \ - s|-lGL -lGLU|-L${X11BASE}/lib &|g; \ + s|-lGL -lGLU|-L${LOCALBASE}/lib &|g; \ s|" == "x|" = "x|g; \ s|-lfreeimage|-L${LOCALBASE}/lib &|g' \ ${WRKSRC}/configure diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 9e8c609..e4c0e94 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -8,10 +8,9 @@ PORTNAME= opencv PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= opencvlibrary +MASTER_SITES= SF/opencvlibrary MAINTAINER= msabramo@yahoo.com COMMENT= Open Source Computer Vision Library from Intel @@ -56,7 +55,6 @@ OPTIONS= GTK "Enable GTK+-2.0 support" Off \ .include <bsd.port.pre.mk> .if defined(WITH_GTK) -USE_XLIB= yes USE_GNOME= gtk20 CONFIGURE_ARGS+=--with-gtk .else @@ -86,9 +84,9 @@ CONFIGURE_ARGS+=--without-gtk #.endif .if defined(WITH_XINE) -CFLAGS+= -I${X11BASE}/include -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+=--with-xine .else diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index 0908883..2daa7b6 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -21,9 +21,8 @@ LIB_DEPENDS= Magick.10:${PORTSDIR}/graphics/ImageMagick \ cdf.0:${PORTSDIR}/science/cdf USE_BISON= build -USE_GL= yes +USE_GL= gl USE_MOTIF= yes -USE_XLIB= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CFLAGS+= ${PTHREAD_CFLAGS} @@ -84,7 +83,7 @@ pre-configure: ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g" .endfor ${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g" \ - -e "s;/usr/X11R6;${X11BASE};g" \ + -e "s;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure post-install: diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index 8127e33..634d50c 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -7,10 +7,9 @@ PORTNAME= openrm PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-devel-${PORTVERSION}-1 .ifdef (WITH_DEMOS) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -28,8 +27,7 @@ WRKSRC2= ${WRKDIR}/rmdemo EXTRA_PATCHES= ${PATCHDIR}/makeinclude.diff .endif -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= glu USE_PERL5_BUILD=yes ALL_TARGET= freebsd docs MAKE_ARGS= AR=${AR} \ @@ -38,8 +36,7 @@ MAKE_ARGS= AR=${AR} \ ECHO_CMD=${ECHO_CMD} \ LN=${LN} \ RM=${RM} \ - STRIP_CMD=${STRIP_CMD} \ - X11BASE=${X11BASE} + STRIP_CMD=${STRIP_CMD} USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 @@ -57,7 +54,6 @@ pre-everything:: .ifdef (WITH_DEMOS) post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude .endif diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff index 1ba5236..0c1219a 100644 --- a/graphics/openrm/files/makeinclude.diff +++ b/graphics/openrm/files/makeinclude.diff @@ -14,14 +14,14 @@ -OPENGLHOME=/usr -OPENGLLIBS=-L/usr/lib -lGL -lGLU -OPENGLCFLAGS=-I/usr/include -+OPENGLHOME=%%X11BASE%% ++OPENGLHOME=%%LOCALBASE%% +OPENGLLIBS=-L${OPENGLHOME}/lib -lGL -lGLU +OPENGLCFLAGS=-I${OPENGLHOME}/include # -X11HOME=/usr/X11R6 -X11LIBS=-L/usr/X11R6/lib -lXmu -lX11 -lpthread -lm -X11CFLAGS=-I/usr/X11R6/include -+X11HOME=%%X11BASE%% ++X11HOME=%%LOCALBASE%% +X11LIBS=-L${X11HOME}/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm +X11CFLAGS=-I${X11HOME}/include # diff --git a/graphics/osg-devel/bsd.osg.mk b/graphics/osg-devel/bsd.osg.mk index 7ced6bf..aa07f82 100644 --- a/graphics/osg-devel/bsd.osg.mk +++ b/graphics/osg-devel/bsd.osg.mk @@ -27,7 +27,7 @@ post-patch: osg-post-patch osg-post-patch: @${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \ s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \ - s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \ + s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \ ${WRKSRC}/Make/makedefs @${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \ ${WRKSRC}/Make/makerules diff --git a/graphics/osg/bsd.osg.mk b/graphics/osg/bsd.osg.mk index 7ced6bf..aa07f82 100644 --- a/graphics/osg/bsd.osg.mk +++ b/graphics/osg/bsd.osg.mk @@ -27,7 +27,7 @@ post-patch: osg-post-patch osg-post-patch: @${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \ s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \ - s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \ + s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \ ${WRKSRC}/Make/makedefs @${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \ ${WRKSRC}/Make/makerules diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile index 1eefb57..bc2a6fb 100644 --- a/graphics/p5-Cairo/Makefile +++ b/graphics/p5-Cairo/Makefile @@ -10,8 +10,7 @@ PORTNAME= Cairo PORTVERSION= 1.053 PORTREVISION= 1 CATEGORIES= graphics perl5 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtk2-perl +MASTER_SITES= SF/gtk2-perl PKGNAMEPREFIX= p5- MAINTAINER= ahze@FreeBSD.org diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile index c0bb194..5954c6e3 100644 --- a/graphics/p5-Chart-Graph/Makefile +++ b/graphics/p5-Chart-Graph/Makefile @@ -29,6 +29,6 @@ MAN3= Chart::Graph.3 \ Chart::Graph::Xrt3d.3 post-patch: - @${REINPLACE_CMD} -e "s,%%X11BASE%%,${X11BASE}," ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/p5-Chart-Graph/files/patch-Makefile.PL b/graphics/p5-Chart-Graph/files/patch-Makefile.PL index c2ddf94..b9dfda9 100644 --- a/graphics/p5-Chart-Graph/files/patch-Makefile.PL +++ b/graphics/p5-Chart-Graph/files/patch-Makefile.PL @@ -19,7 +19,7 @@ if (not defined $xvfb and ($_ eq "xrt2d" or $_ eq "xrt3d" or $_ eq "xmgrace")) { print "Enter path to X virtual frame buffer(Xvfb): "; - $xvfb = <STDIN>; -+ $xvfb = "%%X11BASE%%/bin/Xvfb"; ++ $xvfb = "%%LOCALBASE%%/bin/Xvfb"; chop $xvfb; @xvfb = $xvfb; } diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index cfcf613..a4c7152 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd PERL_CONFIGURE= yes CONFIGURE_ARGS= -options "JPEG,FT,XPM,GIF,PNG" \ - -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} \ - -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE} + -lib_gd_path ${LOCALBASE} -lib_ft_path} \ + -lib_png_path ${LOCALBASE} -lib_zlib_path MAN1= bdf2gdfont.pl.1 MAN3= GD.3 GD::Polyline.3 GD::Simple.3 \ diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile index 390e5b4..762c222 100644 --- a/graphics/p5-Imlib2/Makefile +++ b/graphics/p5-Imlib2/Makefile @@ -23,6 +23,6 @@ PERL_CONFIGURE= yes MAN3= Imlib2.3 post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile index 5738a36..44d7e58 100644 --- a/graphics/p5-OpenGL/Makefile +++ b/graphics/p5-OpenGL/Makefile @@ -17,11 +17,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Perl module to display 3D data using OpenGL, GLU, GLUT, and GLX -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_XORG= glut PERL_CONFIGURE= yes post-patch: - @${PERL} -pi -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/Makefile.PL + @${PERL} -pi -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index 12a8f6e..d3c93fb 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -23,8 +23,8 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-SDL --disable-dfb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= paintlib-config.1 diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile index 6b3f7c0..8ed51dc 100644 --- a/graphics/pgplot/Makefile +++ b/graphics/pgplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgplot PORTVERSION= 5.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/ DISTNAME= ${PORTNAME}${PORTVERSION:R} @@ -17,15 +17,14 @@ COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes USE_PERL5_BUILD=yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.pre.mk> +USE_XORG= x11 xproto xt USE_FORTRAN= yes -MAKE_ARGS+= X11BASE="${X11BASE}" post-install: .for f in libcpgplot.so libpgplot.so diff --git a/graphics/pgplot/files/Makefile b/graphics/pgplot/files/Makefile index 90f6b43..e1abc0b 100644 --- a/graphics/pgplot/files/Makefile +++ b/graphics/pgplot/files/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ all: - make -f Makefile.flib X11BASE="${X11BASE}" + make -f Makefile.flib LOCALBASE="${LOCALBASE}" make -f Makefile.clib - make -f Makefile.bin X11BASE="${X11BASE}" + make -f Makefile.bin LOCALBASE="${LOCALBASE}" make -f Makefile.doc install: diff --git a/graphics/pgplot/files/Makefile.bin b/graphics/pgplot/files/Makefile.bin index e2ccc80..0e668c9 100644 --- a/graphics/pgplot/files/Makefile.bin +++ b/graphics/pgplot/files/Makefile.bin @@ -1,6 +1,6 @@ DRVDIR=./drivers -LIBS=-L${X11BASE}/lib -lX11 -lm -XINCL=-I${X11BASE}/include +LIBS=-L${LOCALBASE}/lib -lX11 -lm +XINCL=-I${LOCALBASE}/include CFLAGS+= $(XINCL) -DPGDISP .PATH: . ./pgdispd diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo index 0801270..2d2ff02 100644 --- a/graphics/pgplot/files/Makefile.demo +++ b/graphics/pgplot/files/Makefile.demo @@ -1,6 +1,6 @@ PGPLOT_LIB = -L/usr/local/lib -lpgplot CPGPLOT_LIB = -L/usr/local/lib -lcpgplot -LIBS= -L${X11BASE}/lib -lX11 -lm +LIBS= -L${LOCALBASE}/lib -lX11 -lm OSVERSION!= /sbin/sysctl -n kern.osreldate .if ${OSVERSION} > 400004 diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib index f1f6537..24ce5f8 100644 --- a/graphics/pgplot/files/Makefile.flib +++ b/graphics/pgplot/files/Makefile.flib @@ -15,7 +15,7 @@ DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \ ${DRIVERS} grexec.f -CFLAGS+=-DPG_PPU -I${X11BASE}/include -I${PREFIX}/include +CFLAGS+=-DPG_PPU -I${LOCALBASE}/include -I${PREFIX}/include LDADD=-L${PREFIX}/lib -lpng .include <bsd.lib.mk> diff --git a/graphics/php4-ffmpeg/Makefile b/graphics/php4-ffmpeg/Makefile index f21ef09..84a21f4 100644 --- a/graphics/php4-ffmpeg/Makefile +++ b/graphics/php4-ffmpeg/Makefile @@ -27,6 +27,6 @@ USE_PHPIZE= yes USE_PHPEXT= yes IGNORE_WITH_PHP?=5 DEFAULT_PHP_VER?=4 -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/graphics/picturebook/files/patch-aa b/graphics/picturebook/files/patch-aa index a9ef7ce..63d0df3 100644 --- a/graphics/picturebook/files/patch-aa +++ b/graphics/picturebook/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,5 +1,9 @@ -CFLAGS = -DWITH_DISPLAY=1 -Wall -O2 -g -I/usr/X11R6/include -I/usr/local/include -SRC = mchip.c capture.c dump.c sonypi.c pci.c yuv.c timer.c avi.c command.c display.c ptable.c jpeg.c -+CFLAGS += -DWITH_DISPLAY=1 -I${X11BASE}/include -I${LOCALBASE}/include ++CFLAGS += -DWITH_DISPLAY=1 -I${LOCALBASE}/include +SRCMI = mchip.c capture.c dump.c sonypi.c yuv.c timer.c avi.c command.c display.c ptable.c jpeg.c +#LINUX +#SRCMD = pci.c diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 9db5823..6b7776b 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= pixmap PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications/pixmap @@ -17,11 +17,13 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= A pixmap editor based on XPM library # requires rgb.txt -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb \ + showrgb:${PORTSDIR}/x11/rgb + WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm xbitmaps x11 xaw xmu xt sm ice xext MAN1= pixmap.1 CFLAGS+= -D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 386f59d..e04bfc2 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ - CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab index ca37fbe..1acc44a 100644 --- a/graphics/povray31/files/patch-ab +++ b/graphics/povray31/files/patch-ab @@ -24,7 +24,7 @@ #X11 = /usr/lpp/X11 -X11 = /usr/X11R6 -+X11 = $(X11BASE) ++X11 = $(LOCALBASE) # You probably won't need to change these if you have the X11 variable # above set properly... diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index 386f59d..e04bfc2 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ - CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 386f59d..e04bfc2 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ - CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 19db0b9..d2778ea 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes MAN1= pstoedit.1 CPPFLAGS= -I${LOCALBASE}/include/ming -I${LOCALBASE}/include \ - -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile index a0f7806..bc10450 100644 --- a/graphics/pvmpov/Makefile +++ b/graphics/pvmpov/Makefile @@ -41,7 +41,7 @@ pre-configure: ${TAR} -c -f - povray31 ) \ | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch - @ ${PERL} -pi -e "s|%X11BASE%|${X11BASE}| ; s|%LOCALBASE%|${LOCALBASE}|" \ + @ ${PERL} -pi -e "s|%LOCALBASE%|${LOCALBASE}|" \ ${BUILDBASE}/Makefile.aimk do-build: diff --git a/graphics/pvmpov/files/patch-ab b/graphics/pvmpov/files/patch-ab index f74cb40..bc9572e 100644 --- a/graphics/pvmpov/files/patch-ab +++ b/graphics/pvmpov/files/patch-ab @@ -30,7 +30,7 @@ #X11 = /usr/lpp/X11 -X11 = /usr/X11R6 -+X11 = %X11BASE% ++X11 = %LOCALBASE% # You probably won't need to change these if you have the X11 variable # above set properly... diff --git a/graphics/py-amanith/files/patch-setup.py b/graphics/py-amanith/files/patch-setup.py index 2aaca0e..5d3ee2b 100644 --- a/graphics/py-amanith/files/patch-setup.py +++ b/graphics/py-amanith/files/patch-setup.py @@ -5,21 +5,21 @@ from os.path import join +LOCALBASE = os.environ['LOCALBASE'] -+X11BASE = os.environ['X11BASE'] ++LOCALBASE = os.environ['LOCALBASE'] + try: amanith_base = os.environ["AMANITHDIR"] except: - amanith_base = "amanith" + amanith_base = os.environ['LOCALBASE'] -+ X11BASE = os.environ['X11BASE'] ++ LOCALBASE = os.environ['LOCALBASE'] debug = False libs = ["amanith"] -inc = [join("changes", "include"), join(amanith_base, "include"), "include"] -lib = [join(amanith_base, "lib")] -+inc = [join("changes", "include"), join(amanith_base, "include"), join(X11BASE,"include") ,"include"] -+lib = [join(amanith_base, "lib"), join(X11BASE, "lib")] ++inc = [join("changes", "include"), join(amanith_base, "include"), join(LOCALBASE,"include") ,"include"] ++lib = [join(amanith_base, "lib"), join(LOCALBASE, "lib")] cc_args = [] swig_args = ["-Ibuild/amanith"] diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 4cd1bba..5e81ec4 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -26,8 +26,8 @@ USE_GMAKE= yes USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pygtk -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile index 5b8b314..625942d 100644 --- a/graphics/py-cgkit/Makefile +++ b/graphics/py-cgkit/Makefile @@ -85,7 +85,7 @@ pre-configure: @${ECHO} "INSTALL_CGKIT_LIGHT = True" >> ${WRKSRC}/config.cfg; .endif @${REINPLACE_CMD} -e "/%%LOCALBASE%%/s//${LOCALBASE:S/\//\\\//g}/g" \ - -e "/%%X11BASE%%/s//${X11BASE:S/\//\\\//g}/g" ${WRKSRC}/supportlib/cpp_config.cfg ${WRKSRC}/config.cfg; \ + ${WRKSRC}/supportlib/cpp_config.cfg ${WRKSRC}/config.cfg; \ cd ${WRKSRC}/supportlib; \ scons diff --git a/graphics/py-cgkit/files/config.cfg b/graphics/py-cgkit/files/config.cfg index 83f5ed0..4334cfa 100644 --- a/graphics/py-cgkit/files/config.cfg +++ b/graphics/py-cgkit/files/config.cfg @@ -1,6 +1,6 @@ ## $FreeBSD$ -INC_DIRS += ["%%LOCALBASE%%/include", "%%X11BASE%%/include"] -LIB_DIRS += ["%%LOCALBASE%%/lib", "%%X11BASE%%/lib"] +INC_DIRS += ["%%LOCALBASE%%/include"] +LIB_DIRS += ["%%LOCALBASE%%/lib"] #LIB3DS_AVAILABLE = True #LIB3DS_PATH = r"%%LOCALBASE%%/lib" #LIB3DS_LIBNAME = "3ds" diff --git a/graphics/py-cgkit/files/cpp_config.cfg b/graphics/py-cgkit/files/cpp_config.cfg index 3a4bc80..b09c826 100644 --- a/graphics/py-cgkit/files/cpp_config.cfg +++ b/graphics/py-cgkit/files/cpp_config.cfg @@ -1,3 +1,3 @@ # $FreeBSD$ -CPPPATH+=["%%LOCALBASE%%/include", "%%X11BASE%%/include"] +CPPPATH+=["%%LOCALBASE%%/include"] diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index 935af4b..21df87a 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -30,7 +30,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - -e 's,/usr/X11R6,${X11BASE},g' \ + -e 's,/usr/X11R6,${LOCALBASE},g' \ -e 's,/usr/include/X11,${LOCALBASE}/include,g' \ ${WRKSRC}/${PYSETUP} .if defined(WITHOUT_X11) diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile index 411edb9..be890c6 100644 --- a/graphics/py-glewpy/Makefile +++ b/graphics/py-glewpy/Makefile @@ -24,8 +24,8 @@ BROKEN= fails to install USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> diff --git a/graphics/py-imaging/files/patch-setup.py b/graphics/py-imaging/files/patch-setup.py index 154e576..6748982 100644 --- a/graphics/py-imaging/files/patch-setup.py +++ b/graphics/py-imaging/files/patch-setup.py @@ -11,7 +11,7 @@ + add_directory(include_dirs, + os.path.join(os.getenv("PREFIX"), "include")) + add_directory(include_dirs, -+ os.path.join(os.getenv("X11BASE"), "include")) ++ os.path.join(os.getenv("LOCALBASE"), "include")) # # locate tkinter libraries diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 12dcde3..0aa8626 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -44,7 +44,6 @@ post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc\.h>|<stdlib.h>|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/config/freebsd.cfg ${WRKSRC}/Tkinter.py @${FIND} ${WRKSRC} -name "*.bak" -delete diff --git a/graphics/py-opengl/files/patch-config::freebsd.cfg b/graphics/py-opengl/files/patch-config::freebsd.cfg index 3618ad5..86ba38a 100644 --- a/graphics/py-opengl/files/patch-config::freebsd.cfg +++ b/graphics/py-opengl/files/patch-config::freebsd.cfg @@ -6,8 +6,8 @@ gl_platform=GLX
-include_dirs=/usr/include:/usr/local/include:/usr/X11/include:/usr/X11R6/include
-library_dirs=/usr/lib:/usr/local/lib:/usr/X11/lib:/usr/X11R6/lib
-+include_dirs=/usr/include:%%LOCALBASE%%/include:%%X11BASE%%/include
-+library_dirs=/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib
++include_dirs=/usr/include:%%LOCALBASE%%/include
++library_dirs=/usr/lib:%%LOCALBASE%%/lib
; a os.pathsep separated list of the libs needed when linking GL
[GL]
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index b65bead..9ea3f91 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-edit USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_GL= yes +USE_GL= gl USE_GMAKE= yes PYDISTUTILS_PKGNAME= Soya @@ -55,7 +55,7 @@ CFLAGS += -fPIC post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile index 5ac2525..67e9c2f 100644 --- a/graphics/pyro/Makefile +++ b/graphics/pyro/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyro PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://nostatic.org/pyro/ EXTRACT_SUFX= .tgz @@ -15,11 +15,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A simple OpenGL-based firework simulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl glut +USE_XORG= xi xmu xext EXAMPLES= pyro.dsp water.jpg PLIST_FILES= bin/pyro ${EXAMPLES:S|^|%%EXAMPLESDIR%%/|} @@ -31,9 +30,8 @@ post-patch: do-build: ${CC} ${CFLAGS} ${WRKSRC}/*.c -o ${WRKSRC}/${PORTNAME} \ - -DAUXDIR=\"${EXAMPLESDIR}\" -I${WRKSRC} -I${X11BASE}/include \ - -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib \ - -ljpeg -lm -lXmu -lXi -lXext -lGL -lGLU -lglut + -DAUXDIR=\"${EXAMPLESDIR}\" -I${WRKSRC} -I${LOCALBASE}/include \ + -L${LOCALBASE}/lib -ljpeg -lm -lXmu -lXi -lXext -lGL -lGLU -lglut do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 0ca1f83..50daaaf 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -29,6 +29,10 @@ PLIST_FILES= bin/qiv .include <bsd.port.pre.mk> +.if defined(WITH_XINERAMA) +USE_XORG+= x11 xinerama +.enif + pre-configure: .if ! defined(WITH_XINERAMA) .else diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile index 1a41e75..73bd97a 100644 --- a/graphics/qslim/Makefile +++ b/graphics/qslim/Makefile @@ -17,20 +17,20 @@ COMMENT= SlimKit Surface Modeling Tools LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - forms.1:${PORTSDIR}/x11-toolkits/xforms \ - glut.4:${PORTSDIR}/graphics/libglut + forms.1:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_WRKSRC= ${WRKSRC}/mixkit/build BUILD_WRKSRC= ${WRKSRC}/mixkit/src USE_GMAKE= yes GNU_CONFIGURE= yes +USE_GL= glut CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= # none -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ - -I${X11BASE}/include/X11 ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/X11 ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 4348856..8cfdfe8 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= quat PORTVERSION= 1.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/ PKGNAMESUFFIX= -gui @@ -16,12 +16,13 @@ DISTNAME= quat-${PORTVERSION:S/.p/pre/} MAINTAINER= dyeske@gmail.com COMMENT= A Three-dimensional fractal creator (X11 GUI) -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +USE_XORG= xext +USE_GL= gl glut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -L${X11BASE}/lib" \ - LIBS="-lXext -lGL" FLUID="${X11BASE}/bin/fluid}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ + LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid" .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 91c1600..e168751 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -7,10 +7,9 @@ PORTNAME= quesa PORTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF .ifdef (WITH_EXAMPLES) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}examples-${PORTVERSION}${EXTRACT_SUFX} @@ -21,8 +20,8 @@ COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= glu +USE_XORG= x11 ice .ifdef (WITH_EXAMPLES) USE_GNOME= gtk12 .endif diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile index b6ce9f4..0cbbc5b 100644 --- a/graphics/renderpark/Makefile +++ b/graphics/renderpark/Makefile @@ -7,7 +7,7 @@ PORTNAME= renderpark PORTVERSION= 3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/ DISTNAME= RenderPark @@ -19,7 +19,7 @@ DIST_SUBDIR= ${DISTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= System for physically based photo-realistic image synthesis -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut .ifdef (WITH_XRML) LIB_DEPENDS+= xrml.0:${PORTSDIR}/graphics/xrml @@ -29,7 +29,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC2= ${WRKDIR}/Scenes USE_GMAKE= yes -USE_X_PREFIX= yes USE_MOTIF= yes USE_GCC= 2.95 NOT_FOR_ARCHS= amd64 sparc64 ia64 @@ -62,9 +61,9 @@ post-patch: @${ECHO_CMD} "" >> ${WRKSRC}/Config.site @${ECHO_CMD} "####################################################" >> ${WRKSRC}/Config.site @${ECHO_CMD} "# VRML input support (requires XRML library)" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLHOME = ${X11BASE}" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLFLAGS = -I${X11BASE}/include/xrml" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLLIB = -L${X11BASE}/lib -lxrml" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLHOME = ${LOCALBASE}" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLFLAGS = -I${LOCALBASE}/include/xrml" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLLIB = -L${LOCALBASE}/lib -lxrml" >> ${WRKSRC}/Config.site .endif @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CXX%%|${CXX}|g ;\ diff --git a/graphics/renderpark/files/patch-Config.site b/graphics/renderpark/files/patch-Config.site index cf66f97..494081f 100644 --- a/graphics/renderpark/files/patch-Config.site +++ b/graphics/renderpark/files/patch-Config.site @@ -20,18 +20,18 @@ # Mesa (free OpenGL-like library) -MESAHOME = /usr/local -+MESAHOME = ${X11BASE} ++MESAHOME = ${LOCALBASE} DRIVERFLAGS = -I$(MESAHOME)/include DRIVERLIBS = -L$(MESAHOME)/lib -lGLU -lGL ################################################################ -X11HOME = /usr/X11R6 -+X11HOME = ${X11BASE} ++X11HOME = ${LOCALBASE} XINCLUDES = -I$(X11HOME)/include XLIBS = -L$(X11HOME)/lib -lXt -lXmu -lXext -lX11 -MOTIFHOME = /usr/local -+MOTIFHOME = ${X11BASE} ++MOTIFHOME = ${LOCALBASE} MOTIFINCLUDES = -I$(MOTIFHOME)/include # -lXpm library necessary for Motif >=2.0, not for Motif <2.0 MOTIFLIBS = -L$(MOTIFHOME)/lib -lXm -lXpm diff --git a/graphics/robot/Makefile b/graphics/robot/Makefile index 23f67ff..5715e48 100644 --- a/graphics/robot/Makefile +++ b/graphics/robot/Makefile @@ -7,7 +7,7 @@ PORTNAME= robot PORTVERSION= 4.93.89 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= ftp://lheaftp.gsfc.nasa.gov/pub/corbet/robot/ DISTNAME= robot-beta @@ -16,12 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graph plotting and data analysis program using OpenLook BUILD_DEPENDS= fsplit:${PORTSDIR}/devel/fortran-utils \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV+= OPENWINHOME=${X11BASE} +MAKE_ENV+= OPENWINHOME=${LOCALBASE} WEB_BROWSER?= firefox USE_FORTRAN= yes FFLAGS+= -ffixed-line-length-80 diff --git a/graphics/robot/files/patch-Robot+Makefile b/graphics/robot/files/patch-Robot+Makefile index 7a06af5..6213ac6 100644 --- a/graphics/robot/files/patch-Robot+Makefile +++ b/graphics/robot/files/patch-Robot+Makefile @@ -45,7 +45,7 @@ #X library - may need to edit if location different -XLIB = -L/usr/X11R6/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 # location of the FITS library FITSDIR = ../Fitsio/ diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index bb80c9f..b21535f 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -18,13 +18,12 @@ DIST_SUBDIR= ruby MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL/GLU/GLUT interface modules for Ruby -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_RUBY= yes USE_RUBY_EXTCONF= yes +USE_GL= glut WRKSRC= ${WRKDIR}/${PORTNAME} -CONFIGURE_ARGS= --with-ruby-dir="${LOCALBASE}" --with-x11-dir="${X11BASE}" +CONFIGURE_ARGS= --with-ruby-dir="${LOCALBASE}" --with-x11-dir="${LOCALBASE}" INSTALL_TARGET= site-install post-install: diff --git a/graphics/ruby-pgplot/Makefile b/graphics/ruby-pgplot/Makefile index adc0950..56f6e9b 100644 --- a/graphics/ruby-pgplot/Makefile +++ b/graphics/ruby-pgplot/Makefile @@ -26,7 +26,7 @@ USE_FORTRAN= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes -CONFIGURE_ARGS= --with-x11-dir="${X11BASE}" --with-gfortranlib="gfortran -L`${CAT} ${WRKSRC}/LIBDIR`/../../.." +CONFIGURE_ARGS= --with-x11-dir="${LOCALBASE}" --with-gfortranlib="gfortran -L`${CAT} ${WRKSRC}/LIBDIR`/../../.." INSTALL_TARGET= site-install DOCS_EN= FuncUsage README.en diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile index b57f624..1edf3c2 100644 --- a/graphics/ruby-rmagick/Makefile +++ b/graphics/ruby-rmagick/Makefile @@ -24,8 +24,8 @@ USE_RUBY_SETUP= yes RUBY_SETUP= setup.rb CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ RUBY="${RUBY}" CONFIGURE_ARGS= --doc-dir="${RUBY_MODDOCDIR}" --prefix="${PREFIX}" .if defined(NOPORTDOCS) diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile index 4759a40..3611bc6 100644 --- a/graphics/ruby-tgif/Makefile +++ b/graphics/ruby-tgif/Makefile @@ -7,7 +7,7 @@ PORTNAME= tgif PORTVERSION= 20010408 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics ruby MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Ruby extension library to draw Tgif graphics BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake # NB not USE_IMAKE; this is required for the tgif build but this # port doesn't use it directly. @@ -26,12 +26,11 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build \ USE_GETTEXT= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_XLIB= yes TGIF_PORT= graphics/tgif WRKSRC= ${WRKDIR}/ruby-${PORTNAME}-${PORTVERSION} -CONFIGURE_ARGS= --with-x-dir="${X11BASE}" \ +CONFIGURE_ARGS= --with-x-dir="${LOCALBASE}" \ --with-ldflags=" `cd ${WRKSRC}/tgif; ${MAKE} -V LDOPTIONS -V LOCAL_LIBRARIES -V LDLIBS -V EXTRA_LOAD_FLAGS | paste -s -`" INSTALL_TARGET= site-install diff --git a/graphics/s3switch/Makefile b/graphics/s3switch/Makefile index af0586d..2782beb 100644 --- a/graphics/s3switch/Makefile +++ b/graphics/s3switch/Makefile @@ -7,7 +7,7 @@ PORTNAME= s3switch PORTVERSION= 0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.probo.com/timr/ DISTNAME= s3ssrc @@ -17,7 +17,6 @@ COMMENT= Enable TV-out on S3 graphics cards USE_ZIP= yes USE_GMAKE= yes -USE_X_PREFIX= yes NO_WRKSUBDIR= yes MAKE_ENV+= FREEBSD=1 diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile index e6ec830..999ab50 100644 --- a/graphics/sage/Makefile +++ b/graphics/sage/Makefile @@ -24,7 +24,7 @@ USE_SDL= sdl MAN3= sage.3 sage_init.3 -CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile index 78dfcf3..702a988 100644 --- a/graphics/sced/Makefile +++ b/graphics/sced/Makefile @@ -7,7 +7,7 @@ PORTNAME= sced PORTVERSION= 1.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.cs.wisc.edu/~schenney/sced/src/ @@ -16,7 +16,7 @@ COMMENT= SCene EDitor for povray/renderman/genray/etc RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray -USE_XLIB= yes +USE_XORG= x11 xt xaw GNU_CONFIGURE= yes MAN1= sced.1 diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile index 220be44..32d8c87 100644 --- a/graphics/scwm-icons/Makefile +++ b/graphics/scwm-icons/Makefile @@ -7,16 +7,13 @@ PORTNAME= scwm-icons PORTVERSION= 0.99.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= scwm +MASTER_SITES= SF/scwm MAINTAINER= ports@FreeBSD.org COMMENT= An icon collection for the scwm window manager -USE_X_PREFIX= yes - NO_BUILD= yes do-install: diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 0033a75..4493575 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -23,8 +23,8 @@ USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" CONFIGURE_ARGS= --enable-tif --enable-xcf USE_LDCONFIG= yes diff --git a/graphics/show/files/Makefile b/graphics/show/files/Makefile index 26a5c98..635fe65 100644 --- a/graphics/show/files/Makefile +++ b/graphics/show/files/Makefile @@ -2,7 +2,7 @@ CC ?= gcc CFLAGS ?= -g -O2 -Wall -XROOT = ${X11BASE} +XROOT = ${LOCALBASE} LROOT = ${LOCALBASE} INCLUDES = -I$(XROOT)/include -I$(LROOT)/include LIBS = -lX11 -lXext -ljpeg -lpng -ltiff -lz -lungif -lm -lImlib diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index 54bd58b..e5faa50 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER= 3 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-pgsql OPTIONS= KIPI "Support for libkipi" on \ diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 63cc957..0985214 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -7,7 +7,7 @@ PORTNAME= simage PORTVERSION= 1.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.coin3d.org/pub/coin/src/ @@ -20,7 +20,6 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 3d104e2..4eecbbe 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -28,7 +28,7 @@ PYDISTUTILS_NOEGGINFO= yes USE_XORG= x11 xext -CONFFLAGS= --tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11" +CONFFLAGS= --tk-autoconf --tk-flags="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${LOCALBASE}/lib -lX11" SKETCHDOCS= BUGS Doc NEWS PROJECTS README TODO SKETCHSCRIPTS= finishinst.py sk2ppm.py sk2ps.py skconvert.py skencil.py \ diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile index 1283f9c..3c03be6 100644 --- a/graphics/sng/Makefile +++ b/graphics/sng/Makefile @@ -10,20 +10,19 @@ PORTNAME= sng PORTVERSION= 1.0.2 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Compiler/decompiler for Scriptable Network Graphics -BUILD_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb -RUN_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb +BUILD_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb +RUN_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \ - --with-rgbtxt=${X11BASE}/lib/X11/rgb.txt + --with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt MAN1= sng.1 PLIST_FILES= bin/sng bin/sng_regress diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index df5965f..622c746 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -7,10 +7,9 @@ PORTNAME= sodipodi PORTVERSION= 0.34 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= A small vector based drawing program with GNOME libraries @@ -18,7 +17,6 @@ COMMENT= A small vector based drawing program with GNOME libraries LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 diff --git a/graphics/tcm/files/patch-Config.tmpl b/graphics/tcm/files/patch-Config.tmpl index 9832ddf4..0a5c869 100644 --- a/graphics/tcm/files/patch-Config.tmpl +++ b/graphics/tcm/files/patch-Config.tmpl @@ -15,7 +15,7 @@ YACC = bison -XWIN_HOME = /usr/X11R6 -+XWIN_HOME = $(X11BASE) ++XWIN_HOME = $(LOCALBASE) SYSFLAGS = -DBSD # SYSFLAGS += -DDEBUG diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile index 9810fd8..c3ced67 100644 --- a/graphics/tkpng/Makefile +++ b/graphics/tkpng/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ --with-tclinclude=${LOCALBASE}/include/tcl${TK_VER}/generic \ --with-tkinclude=${LOCALBASE}/include/tk${TK_VER}/generic \ --exec-prefix=${PREFIX} --enable-shared -CPPFLAGS= -I${LOCALBASE}/include/tk${TK_VER}/generic -I${X11BASE}/include +CPPFLAGS= -I${LOCALBASE}/include/tk${TK_VER}/generic -I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" TKPKG= ${PORTNAME}${PORTVERSION} PLIST_SUB= VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER} diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile index b188b92..546e08a 100644 --- a/graphics/truevision/Makefile +++ b/graphics/truevision/Makefile @@ -10,8 +10,7 @@ PORTNAME= truevision PORTVERSION= 0.5.5.2 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org @@ -24,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui -USE_GL= yes +USE_GL= gl USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -32,9 +31,9 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= truevision.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ +CPPFLAGS= -I${LOCALBASE}/include \ `pkg-config --cflags gtkglext-1.0` -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -L${LOCALBASE}/lib \ `pkg-config --libs gtkglext-1.0` post-patch: diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 2f33e9f..68949be 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GLDIR="${X11BASE}" +CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GLDIR="${LOCALBASE}" CONFIGURE_ARGS= --with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib @@ -39,7 +39,7 @@ USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} -LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib \ -ljpeg -L${QT_PREFIX}/lib -lcompat ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index cb4c6f9..9604663 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufraw PORTVERSION= 0.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= SF @@ -22,7 +22,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ GCONF_SCHEMAS= ${PORTNAME}.schemas GNU_CONFIGURE= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk20 glib20 gnomehack intltool intlhack libartlgpl2 pkgconfig diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt index 262d911..bde1fb8 100644 --- a/graphics/urt/files/patch-config::urt +++ b/graphics/urt/files/patch-config::urt @@ -158,6 +158,6 @@ #ifdef X11 -LIBX11 = -lX11 -INCX11 = -+LIBX11 = -L${X11BASE}/lib -lX11 -+INCX11 = -I${X11BASE}/include ++LIBX11 = -L${LOCALBASE}/lib -lX11 ++INCX11 = -I${LOCALBASE}/include #endif diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile index 7ecf149..85c2536 100644 --- a/graphics/vcg/Makefile +++ b/graphics/vcg/Makefile @@ -7,7 +7,7 @@ PORTNAME= vcg PORTVERSION= 1.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/ DISTNAME= ${PORTNAME}.20050204 @@ -16,9 +16,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A Visualization Tool for compiler graphs -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -USE_X_PREFIX= yes +USE_XORG= x11 xext MANL= pbmrot90.l pbmshift.l pbm2hp.l vcgdemomaker.l vcg.l xvcg.l WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} @@ -29,8 +29,8 @@ pre-patch: @${SED} -e "s:%%CC%%:${CC}:g" \ -e "s:%%CFLAGS%%:${CFLAGS}:g" \ -e "s:%%MAKE%%:${MAKE}:g;" \ + -e "s:%%LOCALBASE%%:${LOCALBASE}:g" \ -e "s:%%PREFIX%%:${PREFIX}:g" \ - -e "s:%%X11BASE%%:${X11BASE}:g" \ -e "s:%%INSTALL_PROGRAM%%:${INSTALL_PROGRAM}:g" \ -e "s:%%INSTALL_MAN%%:${INSTALL_MAN}:g" \ < ${FILESDIR}/${file} > ${WRKSRC}/preconf/X11ccFreeBSD/${file} diff --git a/graphics/vcg/files/conf b/graphics/vcg/files/conf index 0f697b2..bc96e8c 100644 --- a/graphics/vcg/files/conf +++ b/graphics/vcg/files/conf @@ -1,5 +1,5 @@ -ADDINCLUDEPATHNAME|-I%%X11BASE%%/include/ -ADDLIBPATHNAME|-L%%X11BASE/lib/ +ADDINCLUDEPATHNAME|-I%%LOCALBASE%%/include/ +ADDLIBPATHNAME|-L%%LOCALBASE%%/lib/ ADDLIBSNAME|-lXext -lX11 -lm ALIGNMENTNAME|8 ANSINAME|#undef ANSI_C diff --git a/graphics/vcg/files/tMakefile b/graphics/vcg/files/tMakefile index aa43268..7241f00 100644 --- a/graphics/vcg/files/tMakefile +++ b/graphics/vcg/files/tMakefile @@ -104,7 +104,7 @@ CLINKFLAGS = -o # then please use # INCLUDES = -I/usr/local/X11/include/ # INCLUDES = -I/RW/esprit/X11R5/include/ -INCLUDES = -I%%X11BASE%%/include/ +INCLUDES = -I%%LOCALBASE%%/include/ # Library directories # For Sunview, this should be enough, because on Suns, Sunview @@ -117,7 +117,7 @@ INCLUDES = -I%%X11BASE%%/include/ # then please use # LIBPATH = -L/usr/local/X11/lib/ # LIBPATH = -L/RW/esprit/X11R5/lib/ -LIBPATH = -L%%X11BASE%%/lib/ +LIBPATH = -L%%LOCALBASE%%/lib/ # Libraries # Libraries for SunView diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile index d10caa4..e5296f7 100644 --- a/graphics/vertex/Makefile +++ b/graphics/vertex/Makefile @@ -41,10 +41,9 @@ post-patch: s|%%CXX%%|${CXX}|g ; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/platforms.ini + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/platforms.ini @${REINPLACE_CMD} -e \ - 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/vmahelp.c + 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/vmahelp.c @${REINPLACE_CMD} -e \ 's|CC =|CC ?=|g' ${WRKSRC}/pconf/Makefile diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini index 647c154..3548d3f 100644 --- a/graphics/vertex/files/patch-platforms.ini +++ b/graphics/vertex/files/patch-platforms.ini @@ -1,6 +1,6 @@ ---- vertex/platforms.ini.orig Mon Nov 1 00:35:03 2004 -+++ vertex/platforms.ini Thu Oct 5 17:14:40 2006 -@@ -22,23 +22,26 @@ +--- ./vertex/platforms.ini.orig 2004-11-01 07:35:03.000000000 +0100 ++++ ./vertex/platforms.ini 2008-04-14 10:22:58.000000000 +0200 +@@ -22,23 +22,23 @@ Platform = UNIX Description = For most any UNIX system @@ -18,23 +18,20 @@ PlatformSearchPathInclude = /usr/include/ - PlatformSearchPathInclude = /usr/X11R6/include/ + PlatformSearchPathInclude = %%LOCALBASE%%/include/ -+ PlatformSearchPathInclude = %%X11BASE%%/include/ PlatformSearchPathLib = /lib/ PlatformSearchPathLib = /usr/lib/ - PlatformSearchPathLib = /usr/X11R6/lib/ + PlatformSearchPathLib = %%LOCALBASE%%/lib/ -+ PlatformSearchPathLib = %%X11BASE%%/lib/ PlatformSearchPathEtc = /etc/ PlatformSearchPathEtc = /usr/etc/ PlatformSearchPathBin = /bin/ PlatformSearchPathBin = /usr/bin/ - PlatformSearchPathBin = /usr/X11R6/bin/ + PlatformSearchPathBin = %%LOCALBASE%%/bin/ -+ PlatformSearchPathBin = %%X11BASE%%/bin/ PlatformSearchPathData = /usr/share/icons/ PlatformFeature = debug Description = Just adds -g to the CFLAGS for debugging -@@ -51,7 +54,7 @@ +@@ -51,7 +51,7 @@ # Newer versions of Imlib only need to link to -lImlib # FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz FeatureLIBS = -lImlib @@ -43,15 +40,7 @@ FeatureDepend = Imlib-lib DependType = Library MustExist = Yes -@@ -66,6 +69,7 @@ - Description = An implementation of OpenGL (ie Mesa3D) - MustExist = Yes - FeatureLIBS = -lGL -lGLU -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ - FeatureDepend = gl-lib - DependType = Library - MustExist = Yes -@@ -83,11 +87,11 @@ +@@ -83,11 +83,11 @@ MustExist = Yes FeatureCFLAGS = `gtk-config --cflags` FeatureLIBS = `gtk-config --libs` @@ -65,7 +54,7 @@ DependGrepString = gtk_init FeatureDepend = gtk-devel DependType = Program -@@ -98,7 +102,7 @@ +@@ -98,7 +98,7 @@ MustExist = Yes FeatureCFLAGS = FeatureLIBS = -lgtkgl diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c index 63dc6bb..550e43d 100644 --- a/graphics/vertex/files/patch-vmahelp.c +++ b/graphics/vertex/files/patch-vmahelp.c @@ -15,12 +15,12 @@ $FreeBSD$ - "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ \ - "/usr/X11R6/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/X11R6/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ \ NULL, NULL, NULL \ } diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index ab10753..b750c11 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -7,7 +7,7 @@ PORTNAME= view3ds PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -19,13 +19,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= A simple realtime 3DS file previewer based on the Lib3ds Library -LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/view3ds -USE_X_PREFIX= yes +USE_GL= glut USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/visionegg/Makefile b/graphics/visionegg/Makefile index 3862244..233e8f1 100644 --- a/graphics/visionegg/Makefile +++ b/graphics/visionegg/Makefile @@ -10,8 +10,7 @@ PORTNAME= visionegg PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Visual stimulus creation and control @@ -31,8 +30,8 @@ LIB_DEPENDS= \ USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_BUILDARGS= -L${X11BASE}/lib -CFLAGS+= -I${X11BASE}/include +PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include do-build: @(cd ${BUILD_WRKSRC}; \ diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index 03c3962..b3a6530 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -16,8 +16,7 @@ COMMENT= An image viewer for X USE_SDL= image GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= vp.1 diff --git a/graphics/vvv/Makefile b/graphics/vvv/Makefile index 285c59d..28bc582 100644 --- a/graphics/vvv/Makefile +++ b/graphics/vvv/Makefile @@ -7,7 +7,7 @@ PORTNAME= vvv PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.inf.ufes.br/~thomas/graphics/vvv/ \ ${MASTER_SITE_LOCAL} @@ -18,13 +18,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A tutorial tool for understanding viewing and projection in OpenGL -BUILD_DEPENDS= ${X11BASE}/lib/libglui.a:${PORTSDIR}/devel/glui -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +BUILD_DEPENDS= ${LOCALBASE}/lib/libglui.a:${PORTSDIR}/devel/glui USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes -MAKE_ENV= OS=unix X11BASE="${X11BASE}" +USE_GL= glut +MAKE_ENV= OS=unix ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/vvv/files/patch-Makefile b/graphics/vvv/files/patch-Makefile index 3de8d1f..0525663 100644 --- a/graphics/vvv/files/patch-Makefile +++ b/graphics/vvv/files/patch-Makefile @@ -5,8 +5,8 @@ ifeq ($(OS),unix)
RM = rm
- LFLAG1 = -L/usr/lib -L/usr/X11R6/lib
-+ IFLAG1 = -I$(X11BASE)/include -+ LFLAG1 = -L$(X11BASE)/lib
++ IFLAG1 = -I$(LOCALBASE)/include ++ LFLAG1 = -L$(LOCALBASE)/lib
# Where the GLUI library is:
- LFLAG2 = -L/home/thomas/graphics/OpenGL/glui_v2_2/lib
+ LFLAG2 =
diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile index 31ac830..1e778bf 100644 --- a/graphics/wildmagic/Makefile +++ b/graphics/wildmagic/Makefile @@ -16,7 +16,7 @@ COMMENT= The Wild Magic Real-Time 3D Graphics Engine USE_ZIP= yes USE_DOS2UNIX= yes -USE_GL= yes +USE_GL= gl glut USE_GMAKE= yes USE_LDCONFIG= yes @@ -26,8 +26,8 @@ MAKEFILE= makefile.wm${MV} ALL_TARGET= build MAKE_ARGS= CFG=${CONFIG} SYS=${OPSYS:L} GRF=${GRF} MAKE_ENV= CC=${CXX} GCC=${CXX} AR=${AR} EGL=${EGL} EGL0=glx EGL1=Glx \ - INCPATH="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBPATH="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ + INCPATH="-I${LOCALBASE}/include" \ + LIBPATH="-L${LOCALBASE}/lib" \ XLIBS="-lX11 -lXext" GLIBS="-lGL -lGLU" PLIST_SUB= CFG=${CONFIG} GRF=${GRF} WM=Wm${MV} diff --git a/graphics/wmgrabimage/files/patch-aa b/graphics/wmgrabimage/files/patch-aa index 07fac39..e818794 100644 --- a/graphics/wmgrabimage/files/patch-aa +++ b/graphics/wmgrabimage/files/patch-aa @@ -6,9 +6,9 @@ -INCDIR = -I/usr/X11R6/include/X11 -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext # for Solaris diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 7addcaf..79f64c3 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -7,10 +7,9 @@ PORTNAME= xaos PORTVERSION= 3.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xaos +MASTER_SITES= SF/xaos DISTNAME= XaoS-${PORTVERSION} MAINTAINER= makc@issp.ac.ru @@ -18,7 +17,7 @@ COMMENT= A real-time fractal browser for X11 and ASCII terminals LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes +USE_XORG= x11 xt USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile index ec997cb..be0e24f 100644 --- a/graphics/xaralx/Makefile +++ b/graphics/xaralx/Makefile @@ -7,7 +7,7 @@ PORTNAME= XaraLX PORTVERSION?= 0.7r1692 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= graphics MASTER_SITES= http://downloads.xara.com/opensource/ \ ${MASTER_SITE_LOCAL} @@ -18,7 +18,6 @@ MAINTAINER= vd@FreeBSD.org COMMENT?= Top-tier vector/general purpose graphics program (recommended version) USE_BZIP2= yes -USE_X_PREFIX= yes BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config \ xml2-config:${PORTSDIR}/textproc/libxml2 \ @@ -34,6 +33,7 @@ CONFIGURE_ARGS+= --program-suffix=${PKGNAMESUFFIX} USE_GMAKE= yes MAKE_ENV?= LANG=C +USE_XORG= x11 USE_GCC= 3.4+ USE_WX= 2.6 WX_CONF_ARGS= absolute diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 28d2a46..9cc2e4a 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -17,7 +17,7 @@ MAINTAINER= tg@FreeBSD.org COMMENT= View complete directories of X bitmaps and X pixmaps USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xbmbrowser.1 USE_GMAKE= yes diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile index 6b1bf95..3428a79 100644 --- a/graphics/xd3d/Makefile +++ b/graphics/xd3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= xd3d PORTVERSION= 8.3.1 +PORTREVISION= 1 CATEGORIES= graphics math MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/ @@ -36,11 +37,11 @@ RUN_DEPENDS+= gifsicle:${PORTSDIR}/graphics/gifsicle MASTER_SITES_BACKUP= http://pompo.net/ports/ -USE_XLIB= yes REINPLACE_ARGS= -i "" FETCH_CMD= /usr/bin/fetch FETCH_BEFORE_ARGS= -R -o ${DISTDIR}/${DISTFILES} +USE_XORG= x11 xpm USE_FORTRAN= yes FFLAGS+= -O MEMORY_XD3D?= 64 @@ -67,7 +68,7 @@ post-patch: @${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES @${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \ -e "s|%%PREFIX%%|${PREFIX}|" \ - -e "s|%%X11BASE%%|${X11BASE}|" \ + -e "s|%%X11BASE%%|${LOCALBASE}|" \ -e "s|%%LANG%%|${XD3D_LANG}|" \ -e "s|%%MEMORY_XD3D%%|${MEMORY_XD3D}|" \ -e "s|%%F77%%|${F77}|" \ diff --git a/graphics/xdgagrab/Makefile b/graphics/xdgagrab/Makefile index 90e324d..5f6685c 100644 --- a/graphics/xdgagrab/Makefile +++ b/graphics/xdgagrab/Makefile @@ -7,16 +7,16 @@ PORTNAME= xdgagrab PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/ MAINTAINER= ports@FreeBSD.org COMMENT= Capture an X server screen with a mouse pointer +USE_XORG= x11 xxf86dga ALL_TARGET= xdgagrab PLIST_FILES= bin/xdgagrab -USE_X_PREFIX= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdgagrab ${PREFIX}/bin diff --git a/graphics/xdgagrab/files/patch-aa b/graphics/xdgagrab/files/patch-aa index 3b5bc5b..2a526a2 100644 --- a/graphics/xdgagrab/files/patch-aa +++ b/graphics/xdgagrab/files/patch-aa @@ -5,5 +5,5 @@ xdgagrab : xdgagrab.c - gcc -O2 -m486 -Wall -I/usr/X11R6/include -o xdgagrab xdgagrab.c -L/usr/X11R6/lib -lX11 -lXxf86dga -lXext -+ ${CC} ${CFLAGS} -I${X11BASE}/include -o xdgagrab xdgagrab.c -L${X11BASE}/lib -lX11 -lXxf86dga -lXext ++ ${CC} ${CFLAGS} -I${LOCALBASE}/include -o xdgagrab xdgagrab.c -L${LOCALBASE}/lib -lX11 -lXxf86dga -lXext diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile index 8fae021..279b6b7 100644 --- a/graphics/xdl/Makefile +++ b/graphics/xdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdl PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= trevor MAINTAINER= ports@FreeBSD.org COMMENT= Display DL animations on an X screen -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= xdl.1 PLIST_FILES= bin/xdl diff --git a/graphics/xdl/files/patch-ab b/graphics/xdl/files/patch-ab index f2f6a40..116544f 100644 --- a/graphics/xdl/files/patch-ab +++ b/graphics/xdl/files/patch-ab @@ -8,8 +8,8 @@ -CFLAGS = -O2 -LIBS = -lX11 $(IXLIBS) +CC ?= gcc -+CFLAGS += -I${X11BASE}/include -+LIBS += -L${X11BASE}/lib -lX11 $(IXLIBS) ++CFLAGS += -I${LOCALBASE}/include ++LIBS += -L${LOCALBASE}/lib -lX11 $(IXLIBS) # # These specify where to install the binary diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index 202c446..af11149 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:S,.a,-alpha,} LATEST_LINK= xfig-devel USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xfig.1 MAKE_ENV+= DOCSDIR=${DOCSDIR} diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 89215c6..f6076ae 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -25,7 +25,7 @@ CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]* WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xfig.1 MANCOMPRESSED= yes diff --git a/graphics/xfig/files/patch-Imakefile b/graphics/xfig/files/patch-Imakefile index ac0d207..4ec69ea 100644 --- a/graphics/xfig/files/patch-Imakefile +++ b/graphics/xfig/files/patch-Imakefile @@ -8,7 +8,7 @@ +BINDIR = $(PREFIX)/bin XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p -MKDIRHIER = mkdirhier -+MKDIRHIER = ${X11BASE}/bin/mkdirhier ++MKDIRHIER = ${LOCALBASE}/bin/mkdirhier XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the XCOMM app-defaults resource files to go. You will have to use the environment @@ -17,7 +17,7 @@ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. -XCOMM XAPPLOADDIR = /home/user/xfig -+XAPPLOADDIR = ${X11BASE}/lib/X11/app-defaults ++XAPPLOADDIR = ${LOCALBASE}/lib/X11/app-defaults XCOMM Uncomment the following definition for XAW3D if you want to use XCOMM the 3d Athena Widget Set (highly recommended!) diff --git a/graphics/xfpovray/files/patch-aa b/graphics/xfpovray/files/patch-aa index e66a268..60f9b82 100644 --- a/graphics/xfpovray/files/patch-aa +++ b/graphics/xfpovray/files/patch-aa @@ -9,12 +9,12 @@ XCOMM If your compiler can't find the xforms library -XFORMS_LIBDIR = /usr/local/lib -+XFORMS_LIBDIR = ${X11BASE}/lib ++XFORMS_LIBDIR = ${LOCALBASE}/lib XCOMM If your compiler can't find the xforms header file -XFORMS_INCDIR = /usr/local/include -+.if exists(${X11BASE}/include/X11/forms.h) -+XFORMS_INCDIR = ${X11BASE}/include/X11 ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMS_INCDIR = ${LOCALBASE}/include/X11 +.else -+XFORMS_INCDIR = ${X11BASE}/include ++XFORMS_INCDIR = ${LOCALBASE}/include +.endif diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index 843adc6..1bfd484 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfractint PORTVERSION= 20.2.04 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.sdboyd56.com/xfractint/ DISTNAME= xfract${PORTVERSION} @@ -17,7 +18,7 @@ COMMENT= The Unix port of fractint NO_WRKSUBDIR= yes USE_ZIP= yes -USE_XLIB= yes +USE_XORG= x11 MAN1= xfractint.1 diff --git a/graphics/xfractint/files/patch-Makefile b/graphics/xfractint/files/patch-Makefile index 9c4de20..a13c00f 100644 --- a/graphics/xfractint/files/patch-Makefile +++ b/graphics/xfractint/files/patch-Makefile @@ -20,7 +20,7 @@ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -Wall -mpentium -DNASM #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM -CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -+CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${X11BASE}/include ++CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${LOCALBASE}/include # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE @@ -38,7 +38,7 @@ # For Linux, use #LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -+LIBS = -L${X11BASE}/lib -lX11 -lm -lcurses ++LIBS = -L${LOCALBASE}/lib -lX11 -lm -lcurses #LIBS = -lX11 -lm -lcurses # For using nasm, set: diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 807837ff..af450cf 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -7,7 +7,7 @@ PORTNAME= xli PORTVERSION= 1.17.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://pantransit.reptiles.org/prog/xli/ \ ${MASTER_SITE_XCONTRIB} @@ -22,7 +22,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER} -USE_XLIB= yes +USE_XORG= xi USE_IMAKE= yes MAN1= xli.1 xlito.1 MLINKS= xli.1 xview.1 \ diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile index 943ceb7..f5ef904 100644 --- a/graphics/xmfract/Makefile +++ b/graphics/xmfract/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmfract PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= graphics @@ -17,10 +17,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The dos based 'fractint' with an X/Motif front end USE_MOTIF= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-editres \ - --with-motif="motif_includes=${X11BASE}/include motif_libraries=${X11BASE}/lib" + --with-motif="motif_includes=${LOCALBASE}/include motif_libraries=${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/graphics/xmms-blursk/Makefile b/graphics/xmms-blursk/Makefile index 0ec47d7..6ed2c66 100644 --- a/graphics/xmms-blursk/Makefile +++ b/graphics/xmms-blursk/Makefile @@ -7,7 +7,7 @@ PORTNAME= blursk PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://web.cecs.pdx.edu/~kirkenda/blursk/ PKGNAMEPREFIX= xmms- @@ -21,6 +21,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms PLIST_FILES= lib/xmms/Visualization/libblursk.so USE_GNOME= gtk12 +USE_XORG= x11 xv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/xmms-dancingparticles/files/patch-Makefile b/graphics/xmms-dancingparticles/files/patch-Makefile index fdd9b17..23779d1a 100644 --- a/graphics/xmms-dancingparticles/files/patch-Makefile +++ b/graphics/xmms-dancingparticles/files/patch-Makefile @@ -9,8 +9,8 @@ -LFLAGS = -shared -fPIC -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lt1 -lSDL -LFLAGS2 = -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lpthread -lgtk -lgdk -lglut -lt1 +CFLAGS += -fPIC `gtk-config --cflags gthread` `${SDL_CONFIG} --cflags` -+LFLAGS = -shared -fPIC -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -L${X11BASE}/lib -lt1 `${SDL_CONFIG} --libs` -+LFLAGS2 = -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -L${X11BASE}/lib -lgtk -lgdk -lglut -lt1 ++LFLAGS = -shared -fPIC -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lt1 `${SDL_CONFIG} --libs` ++LFLAGS2 = -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lgtk -lgdk -lglut -lt1 OBJ = plugin.o gl.o etoile.o readme.o parameters.o epic.o config.o signal.o t1font.o INSTALL-DIR=`xmms-config --visualization-plugin-dir` diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile index b362729..d05defe 100644 --- a/graphics/xmms-fishmatic/Makefile +++ b/graphics/xmms-fishmatic/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-fishmatic PORTVERSION= 0.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://stukach.com/hosted/ DISTNAME= fishmatic @@ -17,16 +17,17 @@ COMMENT= An XMMS non-static OpenGL stereogram visualization plugin BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut PLIST_FILES= lib/xmms/Visualization/libfishmatic.so USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes +USE_GL= glut +USE_XORG= xext USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-lGL -lXext ${LIBS}" -CFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib post-patch: @${RM} -f ${WRKSRC}/config.cache diff --git a/graphics/xmms-msa/Makefile b/graphics/xmms-msa/Makefile index c87f831..ad00143 100644 --- a/graphics/xmms-msa/Makefile +++ b/graphics/xmms-msa/Makefile @@ -7,7 +7,7 @@ PORTNAME= msa PORTVERSION= 0.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://republika.pl/kunik/msa/dl/ PKGNAMEPREFIX= xmms- @@ -18,12 +18,11 @@ COMMENT= A spectrum analyzer with a skin support and some visualization modes LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms USE_GMAKE= yes -USE_X_PREFIX= yes MAKE_ARGS= CC="${CC}" OPTS="${CFLAGS} -fPIC" PLIST_FILES= lib/xmms/Input/msa.so post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/xmms|${X11BASE}/share/xmms|' \ + @${REINPLACE_CMD} -e 's|/usr/share/xmms|${LOCALBASE}/share/xmms|' \ ${WRKSRC}/msa_config.c do-install: diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile index 606fc2c..93f566a 100644 --- a/graphics/xmms-nebulus/Makefile +++ b/graphics/xmms-nebulus/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gtk12 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e \ diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index b07498f..df01537 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -7,10 +7,9 @@ PORTNAME= xmorph PORTVERSION= 2006.08.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org @@ -22,14 +21,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} CONFLICTS= libmorph* -USE_X_PREFIX= yes WANT_GNOME= yes USE_GNOME= gnometarget -USE_GCC= 3.4+ -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xaw xext USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-waili USE_LDCONFIG= yes diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index edcfc04..647e0a8 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -9,7 +9,7 @@ PORTNAME= xpaint PORTVERSION= 2.7.8.1 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ ftp://ftp.ac-grenoble.fr/Office/ MASTER_SITE_SUBDIR= sf-${PORTNAME} @@ -21,17 +21,17 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xpaint.1 .if defined(WITH_NEXTAW) LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw -XAW_INCDIR= ${X11BASE}/include/X11/neXtaw +XAW_INCDIR= ${LOCALBASE}/include/X11/neXtaw XAW_LIBS= -lneXtaw .else -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -XAW_INCDIR= ${X11BASE}/include/X11/Xaw3d +LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +XAW_INCDIR= ${LOCALBASE}/include/X11/Xaw3d XAW_LIBS= -lXaw3d .endif diff --git a/graphics/xrml/Makefile b/graphics/xrml/Makefile index 80e1541..7545a25 100644 --- a/graphics/xrml/Makefile +++ b/graphics/xrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrml PORTVERSION= 0.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/ DISTNAME= ${PORTNAME} @@ -19,7 +19,6 @@ COMMENT= Extensible scene graph library based on VRML'97 WRKSRC= ${WRKDIR}/${PORTNAME:U} USE_GMAKE= yes -USE_X_PREFIX= yes USE_GL= yes USE_MOTIF= yes USE_LDCONFIG= yes @@ -43,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CXX%%|${CXX}|g ; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/Config.site + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.site pre-build: ${GMAKE} -C ${WRKSRC}/FILTERS link_includes diff --git a/graphics/xrml/files/patch-Config.site b/graphics/xrml/files/patch-Config.site index 9c1cd76..bdde6e7 100644 --- a/graphics/xrml/files/patch-Config.site +++ b/graphics/xrml/files/patch-Config.site @@ -42,8 +42,8 @@ # and /usr/lib normally on recent Linux systems -DRIVERFLAGS = -I/usr/include $(HWFLAGS) -DRIVERLIBS = -L/usr/lib -lGLU -lGL -+DRIVERFLAGS = -I${X11BASE}/include $(HWFLAGS) -+DRIVERLIBS = -L${X11BASE}/lib -lGLU -lGL ++DRIVERFLAGS = -I${LOCALBASE}/include $(HWFLAGS) ++DRIVERLIBS = -L${LOCALBASE}/lib -lGLU -lGL # Mesa (free OpenGL-like library: www.mesa3d.org) # On recent systems, 'MesaGL' is installed as 'GL' and 'MesaGLU' as 'GLU' and @@ -52,13 +52,13 @@ # X window system flags and files: -X11HOME = /usr/X11R6 -+X11HOME = ${X11BASE} ++X11HOME = ${LOCALBASE} XINCLUDES = -I$(X11HOME)/include XLIBS = -L$(X11HOME)/lib -lXt -lXmu -lX11 $(CCMALLOCLIB) # CCMALLOCLIB = -lccmalloc -ldl -# MOTIFHOME = /usr/X11R6 -+MOTIFHOME = ${X11BASE} ++MOTIFHOME = ${LOCALBASE} # lesstif: -MOTIFHOME = /usr/X11R6/LessTif/Motif1.2 +#MOTIFHOME = /usr/X11R6/LessTif/Motif1.2 diff --git a/graphics/xsane/files/pkg-message.in b/graphics/xsane/files/pkg-message.in index c2955f8..031ded4 100644 --- a/graphics/xsane/files/pkg-message.in +++ b/graphics/xsane/files/pkg-message.in @@ -2,7 +2,7 @@ Congratulations, XSane is now installed. To install XSane as a GIMP plug-in, please type: -ln -sf ${X11BASE}/bin/xsane ~/.gimp-n.n/plug-ins/xsane +ln -sf ${LOCALBASE}/bin/xsane ~/.gimp-n.n/plug-ins/xsane Then run the GIMP, and a new "XSane" menu item should appear in the "File->Acquire" menu. Use this to access your scanner. diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile index 557edd8..e50f4ca 100644 --- a/graphics/xsvg/Makefile +++ b/graphics/xsvg/Makefile @@ -8,7 +8,7 @@ PORTNAME= xsvg PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -18,7 +18,6 @@ COMMENT= X11 SVG viewer LIB_DEPENDS= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo GNU_CONFIGURE= yes -USE_XLIB= yes PLIST_FILES= bin/xsvg MAN1= xsvg.1 diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile index 533656e..ea6ae64 100644 --- a/graphics/zphoto/Makefile +++ b/graphics/zphoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= zphoto PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www MASTER_SITES= http://namazu.org/~satoru/zphoto/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --disable-zip .endif USE_GMAKE= yes USE_PERL5_BUILD=yes -USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile index 89c49fa..65c8212 100644 --- a/hebrew/culmus/Makefile +++ b/hebrew/culmus/Makefile @@ -7,21 +7,21 @@ PORTNAME= culmus PORTVERSION= 0.101 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= hebrew -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= onatan@gmail.com COMMENT= Free Hebrew Type1 fonts -BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes NO_BUILD= yes do-install: - ${MKDIR} ${PREFIX}/lib/X11/fonts/culmus + ${MKDIR} ${LOCALBASE}/lib/X11/fonts/culmus . for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DavidCLM-Bold DavidCLM-Medium DavidCLM-MediumItalic DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light ${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${PREFIX}/lib/X11/fonts/culmus ${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${PREFIX}/lib/X11/fonts/culmus diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile index 595a721..4815904 100644 --- a/hebrew/elmar-fonts/Makefile +++ b/hebrew/elmar-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= elmar-fonts PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= hebrew x11-fonts MASTER_SITES= ftp://ftp.elmar.co.il/Portable/fonts/ DISTNAME= H.fonts @@ -17,12 +17,11 @@ MAINTAINER= nadav@cs.technion.ac.il COMMENT= A collection of Hebrew fonts from El-Mar software Ltd NO_WRKSUBDIR= yes -USE_X_PREFIX= yes NO_BUILD= yes do-install: - ${MKDIR} ${PREFIX}/lib/X11/fonts/hebrew - ${TAR} -C ${PREFIX}/lib/X11/fonts/hebrew -xZpf \ + ${MKDIR} ${LOCALBASE}/lib/X11/fonts/hebrew + ${TAR} -C ${LOCALBASE}/lib/X11/fonts/hebrew -xZpf \ ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} post-install: @${CAT} ${PKGMESSAGE} diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile index cd9e12f..2422dad 100644 --- a/hebrew/he2/Makefile +++ b/hebrew/he2/Makefile @@ -9,13 +9,12 @@ PORTNAME= he2 PORTVERSION= 0.61 PORTREVISION= 2 CATEGORIES= hebrew editors -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An editor for editing (primarily LaTeX) Hebrew files -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 4c090de..a1a0f8e 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -54,7 +54,7 @@ CONFIGURE_ARGS+=--with-ssl .if defined(WITH_GNOME) USE_GNOME= gnomelibs CONFIGURE_ARGS+=--with-gtk -CFLAGS+= -I${X11BASE}/include/gnome-1.0/ +CFLAGS+= -I${LOCALBASE}/include/gnome-1.0/ PLIST_SUB+= NOGNOME="@comment " GNOME="" .else CONFIGURE_ARGS+=--without-gtk diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile index a4a79de..f058012 100644 --- a/irc/kvirc-devel/Makefile +++ b/irc/kvirc-devel/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ENV= QTDIR="${X11BASE}" +CONFIGURE_ENV= QTDIR="${LOCALBASE}" PLIST_SUB= VER=${PORTVERSION} CONFLICTS= kvirc-3.2.0* diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile index bfde407..cac4a06c 100644 --- a/irc/lostirc/Makefile +++ b/irc/lostirc/Makefile @@ -7,9 +7,9 @@ PORTNAME= lostirc PORTVERSION= 0.4.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= irc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://demian.dyndns.org/src/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,9 +18,7 @@ COMMENT= A simple and minimal IRC client for X LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget -USE_GCC= 3.4+ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile index be41ad2..17b7e00 100644 --- a/irc/quirc/Makefile +++ b/irc/quirc/Makefile @@ -7,7 +7,7 @@ PORTNAME= quirc PORTVERSION= 0.9.84 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc tk MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/} @@ -16,8 +16,7 @@ COMMENT= An irc client for the X Window System that uses TCL/TK LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -USE_X_PREFIX= yes -USE_XLIB= yes +USE_XORG= xt GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-wish=${LOCALBASE}/bin/wish8.4 \ diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index 05597b5..3c20e29 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -7,7 +7,7 @@ PORTNAME= xchat PORTVERSION= 1.8.11 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES+= irc gnome ipv6 MASTER_SITES= http://xchat.org/files/source/1.8/ \ http://xchat.linuxpower.org/files/source/1.8/ @@ -19,7 +19,6 @@ COMMENT= An X11 IRC client using the GTK+ toolkit, and optionally, GNOME # the variables or the targets defined in it. When you need to, please # contact its maintainer. -USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile index 4c32bc2..bcb9020 100644 --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -14,7 +14,7 @@ DISTNAME= Wnn6-SDK MAINTAINER= ports@FreeBSD.org COMMENT= Include files and a library of Wnn6 -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake WRKSRC= ${WRKDIR}/src/contrib/im/Xsi DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib @@ -22,7 +22,7 @@ DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib USE_LDCONFIG= yes post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/config/Project.tmpl \ ${WRKSRC}/config/X11.tmpl \ ${WRKSRC}/Makefile.ini diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index 0dde039..0f43ceb 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Include files and a library of Wnn7 -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake WRKSRC= ${WRKDIR}/src DOCDIR= ${PREFIX}/share/doc/ja-Wnn7-lib @@ -25,7 +25,7 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/config/Project.tmpl \ ${WRKSRC}/config/X11.tmpl \ ${WRKSRC}/Makefile.ini diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile index ea1772a..6b8916f 100644 --- a/japanese/alias-fonts/Makefile +++ b/japanese/alias-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= alias-fonts PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese x11-fonts DISTFILES= # empty @@ -15,20 +15,21 @@ MAINTAINER= koma2@lovepeers.org COMMENT= A meta-port which setups Japanese fonts RUN_DEPENDS= \ - ${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \ - ${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \ - ${FONTSDIR}/shnmk12.pcf.gz:${PORTSDIR}/japanese/shinonome \ - ${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ - ${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \ - ${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ - ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts \ - mkfontdir:${X_CLIENTS_PORT} + ${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \ + ${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \ + ${FONTSDIR}/shnmk12.pcf.gz:${PORTSDIR}/japanese/shinonome \ + ${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ + ${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \ + ${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ + ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes USE_PERL5= yes -FONTSDIR= ${X11BASE}/lib/X11/fonts/local +FONTSDIR= ${LOCALBASE}/lib/X11/fonts/local do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile index e84ac4c..16f98c8 100644 --- a/japanese/anthy/Makefile +++ b/japanese/anthy/Makefile @@ -18,7 +18,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Another kana-kanji conversion system GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnometarget lthack pkgconfig DOCSDIR= share/doc/ja/anthy diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile index c6a70bd..fd63bc2 100644 --- a/japanese/ebview-gtk2/Makefile +++ b/japanese/ebview-gtk2/Makefile @@ -7,10 +7,9 @@ PORTNAME= ebview PORTVERSION= 0.3.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -gtk2 MAINTAINER= ports@FreeBSD.org @@ -22,7 +21,6 @@ CONFLICTS= ja-ebview-0* USE_GNOME= gtk20 gnometarget USE_GMAKE= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index fe183f0..349e46c 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -7,7 +7,7 @@ PORTNAME= elisa8x8 PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ DISTNAME= elisat10 @@ -15,9 +15,9 @@ DISTNAME= elisat10 MAINTAINER= toshi@tea.forus.or.jp COMMENT= X11 8-dot kanji font 'elisa font' -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 9c4f993..db2ca49 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -49,7 +49,7 @@ CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd .if !defined(NO_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop -USE_XLIB= YES +USE_X11= x11 .else CONFIGURE_ARGS= --with-x=no --with-pop .endif diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile index 2592d92..2617ef4 100644 --- a/japanese/font-ipa/Makefile +++ b/japanese/font-ipa/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/font-ipa/pkg-plist +++ b/japanese/font-ipa/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile index 46361a3..6dd53fd 100644 --- a/japanese/font-kochi/Makefile +++ b/japanese/font-kochi/Makefile @@ -7,7 +7,7 @@ PORTNAME= kochi-ttfonts PORTVERSION= 20030809 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \ ${MASTER_SITE_PORTS_JP} @@ -16,7 +16,6 @@ DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2 MAINTAINER= ports@FreeBSD.org COMMENT= Free Japanese TrueType fonts named 'Kochi' -USE_X_PREFIX= yes USE_BZIP2= yes NO_BUILD= yes diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile index 2592d92..2617ef4 100644 --- a/japanese/font-mplus-ipa/Makefile +++ b/japanese/font-mplus-ipa/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/font-mplus-ipa/pkg-plist +++ b/japanese/font-mplus-ipa/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile index ad05f2c..85673d0 100644 --- a/japanese/font-mplus/Makefile +++ b/japanese/font-mplus/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplusfonts PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \ http://wids.net/archive/mplusfonts/distfiles/ @@ -16,11 +16,11 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= 12x13 dots X11 kanji fonts with simple and readable design -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile index 988c0e1..32b801b 100644 --- a/japanese/font-sazanami/Makefile +++ b/japanese/font-sazanami/Makefile @@ -69,7 +69,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist index e5f4c29..cd108e7 100644 --- a/japanese/font-sazanami/pkg-plist +++ b/japanese/font-sazanami/pkg-plist @@ -18,7 +18,7 @@ etc/fonts/conf.d/3.sazanami-ttf.conf %%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu %%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @exec mkdir -p %%LOCALFONTSDIR%%/TrueType @exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf @exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @@ -26,5 +26,5 @@ etc/fonts/conf.d/3.sazanami-ttf.conf @unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null || true @unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist index df9bd75..ad0db4b 100644 --- a/japanese/font-vlgothic/pkg-plist +++ b/japanese/font-vlgothic/pkg-plist @@ -11,7 +11,7 @@ etc/fonts/conf.d/63-vlgothic.conf %%PORTDOCS%%%%DOCSDIR%%/README.sazanami %%PORTDOCS%%%%DOCSDIR%%/README_J.mplus %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec [ -s %D/%%FONTSDIR%%/fonts.cache-1 ] || rm -f %D/%%FONTSDIR%%/fonts.cache-1 @dirrmtry %%FONTSDIR%% diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile index a115b52..d8717ec 100644 --- a/japanese/gicq/Makefile +++ b/japanese/gicq/Makefile @@ -7,7 +7,7 @@ PORTNAME= gicq PORTVERSION= 0.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese net MASTER_SITES= ${MASTER_SITE_LOCAL} \ ftp://ftp.korsoft.com/pub/gicq/ @@ -24,7 +24,6 @@ COMMENT= GTK based ICQ program LIB_DEPENDS= icq.0:${PORTSDIR}/japanese/libicq -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls diff --git a/japanese/gorua/Makefile b/japanese/gorua/Makefile index 6de1f06..251ae01 100644 --- a/japanese/gorua/Makefile +++ b/japanese/gorua/Makefile @@ -16,7 +16,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Gtk+ on Ruby User Agent for 2ch BBS RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \ - ${X11BASE}/lib/X11/fonts/local/mona6x12a.pcf.gz:${PORTSDIR}/japanese/monafonts + ${LOCALBASE}/lib/X11/fonts/local/mona6x12a.pcf.gz:${PORTSDIR}/japanese/monafonts USE_BZIP2= yes USE_RUBY= yes diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index 9172fe9..95f8328 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -115,7 +115,7 @@ post-build: cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo .endif cd ${WRKSRC} && ${FIND} font -name DESC \ - | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +(gxditview)|pro ${X11BASE}/bin/\1|g;' + | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +(gxditview)|pro ${LOCALBASE}/bin/\1|g;' cd ${WRKSRC} && ${FIND} font -name DESC \ | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +([^/].*)|pro ${PREFIX}/bin/\1|g;' diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile index a1ad1bf..dd0031c 100644 --- a/japanese/gtkicq/Makefile +++ b/japanese/gtkicq/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkicq PORTVERSION= 0.60 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese net MASTER_SITES= ftp://gtkicq.pn.org/pub/gtkicq/ @@ -20,7 +20,6 @@ COMMENT= Icq clone for japanese user BUILD_DEPENDS= ${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile index 0bfb45c..ff60106 100644 --- a/japanese/ical/Makefile +++ b/japanese/ical/Makefile @@ -7,7 +7,7 @@ PORTNAME= ical PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese deskutils tk MASTER_SITES= ftp://ftp.sco.com/skunkware/src/shellutil/ \ ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \ @@ -30,6 +30,7 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-* MASTERDIR= ${.CURDIR}/../../deskutils/ical MD5_FILE= ${.CURDIR}/distinfo +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ --with-tclhdir=${PREFIX}/include/tcl8.0jp \ diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 4a4afd5..fd7e2c4 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-canna PORTVERSION= 12.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -26,7 +26,6 @@ USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -38,8 +37,8 @@ BUILDDIR= ${WRKSRC}/leif IGNORE= is supported on FreeBSD 5.3 and later only .endif -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile index ab00a04..abf3372 100644 --- a/japanese/im-ja/Makefile +++ b/japanese/im-ja/Makefile @@ -7,7 +7,7 @@ PORTNAME= im-ja PORTVERSION= 1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-toolkits MASTER_SITES= http://im-ja.sourceforge.net/ @@ -19,7 +19,6 @@ OPTIONS+= CANNA "Use Canna" on OPTIONS+= WNN "Use FreeWnn" on OPTIONS+= GNOMEPANEL "Build GNOME Panel Applet" off -USE_XLIB= yes USE_GNOME= gconf2 gnomehack gnomeprefix gnometarget intlhack libglade2 USE_PERL5_BUILD= yes USE_GMAKE= yes @@ -29,8 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= im-ja-conf.1 im-ja-xim-server.1 GCONF_SCHEMAS= im-ja.schemas -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -DNO_MALLOC_H -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -DNO_MALLOC_H +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile index 2592d92..2617ef4 100644 --- a/japanese/ipa-ttfonts/Makefile +++ b/japanese/ipa-ttfonts/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/ipa-ttfonts/pkg-plist +++ b/japanese/ipa-ttfonts/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index 1ac9775..8603231 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -7,7 +7,7 @@ PORTNAME= jed PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese editors MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.kondara.org/~g/slang/ @@ -54,7 +54,7 @@ WITHOUT_XJED= yes .if defined(WITHOUT_XJED) || defined(XJED_BROKEN) PLIST_SUB= XJED_ENTRY="@comment xjed is not installed" .else -USE_XLIB= yes +USE_XORG= x11 xext BINSTUFF+= xjed PLIST_SUB= XJED_ENTRY="bin/xjed" .endif diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile index b7db5a5..3f24fc2 100644 --- a/japanese/jisx0213-fonts/Makefile +++ b/japanese/jisx0213-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= jisx0213-fonts PORTVERSION= 20040425 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www12.ocn.ne.jp/~imamura/ \ http://gitatsu.hp.infoseek.co.jp/bdf/:yagi @@ -21,11 +21,11 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Japanese jisx0213 fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/local EXTRACT_CMD= ${CP} diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 2cb1097..378e1f6 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -69,7 +69,7 @@ JPLIB!= ${ECHO_CMD} ${JPLIB} | sed 's%^%-lonew${INPUT_METHOD} %' pre-build: cd ${WRKSRC}/src; \ ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ + -e 's,%LOCALBASE%,${LOCALBASE},g' \ ./makefile.junx > Makefile; \ do-build: diff --git a/japanese/jvim/files/patch-aa b/japanese/jvim/files/patch-aa index 36b0feb..5a0b40f 100644 --- a/japanese/jvim/files/patch-aa +++ b/japanese/jvim/files/patch-aa @@ -23,7 +23,7 @@ - -L/usr/lib + -L/usr/lib \ + -L%LOCALBASE%/lib \ -+ -L%X11BASE%/lib \ ++ -L%LOCALBASE%/lib \ + -L/usr/X11R6/lib + +INSTALL_MAN?= install -c -m ${MANMOD} diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index 4ce7e36..c146001 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -35,13 +35,13 @@ PORT_DOCDIR= ${PREFIX}/share/doc/ja-jvim-${PORTVERSION} # -DUSE_X11 is the cause of a problem treating Japanese MACHINE= -DBSD_UNIX -DUSE_LOCALE CC= cc ${CFLAGS} -Wall -LIBS= -ltermlib -L${PREFIX}/lib +LIBS= -ltermlib -L${PREFIX}/lib .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 MACHINE+= -DUSE_X11 -CC+= -I${X11BASE}/include -LIBS+= -L${X11BASE}/lib -lX11 +CC+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lX11 .endif # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile index b45afaf..facd7a8 100644 --- a/japanese/jyuroku/Makefile +++ b/japanese/jyuroku/Makefile @@ -25,7 +25,7 @@ post-patch: s@gtk-config@${GTK_CONFIG}@g" ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jyuroku ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/jyuroku ${LOCALBASE}/bin post-install: .if !defined(NOPORTDOCS) diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index d3f2322..676b694 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -7,7 +7,7 @@ PORTNAME= naga10 PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/ DISTNAME= knj10-${PORTVERSION} @@ -16,10 +16,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X11 10-dot kanji font 'naga10 font' BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index a0a132a..2aa1f5b 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaname12 PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_PORTS_JP} \ http://www.din.or.jp/~storm/fonts/ @@ -18,10 +18,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= mita@jp.FreeBSD.org COMMENT= X11 12-dot kanji font -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index 1722fc2..d20d759 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -7,7 +7,7 @@ PORTNAME= kanji PORTVERSION?= 1.0 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_PORTS_JP} MASTER_SITE_SUBDIR= ${DISTNAME} @@ -20,13 +20,12 @@ COMMENT= X11 ${PKGNAMESUFFIX}-dot kanji font EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale DIST_SUBDIR= ${DISTNAME} FONTSDIR= lib/X11/fonts/local NO_WRKSUBDIR= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> @@ -54,7 +53,7 @@ post-patch: pre-install: @for file in INSTALL DEINSTALL; do \ ${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \ - -e 's,%%X11BASE%%,${X11BASE},g' \ + -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKSRC}/$${file}; \ done @${SETENV} PKG_PREFIX=${PREFIX} \ diff --git a/japanese/kanji18/files/DEINSTALL.tmpl b/japanese/kanji18/files/DEINSTALL.tmpl index e31f7ec..dac5752 100644 --- a/japanese/kanji18/files/DEINSTALL.tmpl +++ b/japanese/kanji18/files/DEINSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-DEINSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji18/files/INSTALL.tmpl b/japanese/kanji18/files/INSTALL.tmpl index c10a3d8..6fa812b 100644 --- a/japanese/kanji18/files/INSTALL.tmpl +++ b/japanese/kanji18/files/INSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-INSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji18/pkg-descr b/japanese/kanji18/pkg-descr index af1ed79..3736148 100644 --- a/japanese/kanji18/pkg-descr +++ b/japanese/kanji18/pkg-descr @@ -1,6 +1,6 @@ Japanese 18 dot gothic font. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ MIHIRA Yoshiro diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl index e31f7ec..dac5752 100644 --- a/japanese/kanji26/files/DEINSTALL.tmpl +++ b/japanese/kanji26/files/DEINSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-DEINSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji26/files/INSTALL.tmpl b/japanese/kanji26/files/INSTALL.tmpl index c10a3d8..6fa812b 100644 --- a/japanese/kanji26/files/INSTALL.tmpl +++ b/japanese/kanji26/files/INSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-INSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji26/pkg-descr b/japanese/kanji26/pkg-descr index b545d1d..aceb1a13 100644 --- a/japanese/kanji26/pkg-descr +++ b/japanese/kanji26/pkg-descr @@ -1,6 +1,6 @@ Japanese 26 dot mincho font. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ MIHIRA Yoshiro diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile index c4a27b2..2744e31 100644 --- a/japanese/kanjipad/Makefile +++ b/japanese/kanjipad/Makefile @@ -7,14 +7,13 @@ PORTNAME= kanjipad PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11 MASTER_SITES= http://fishsoup.net/software/kanjipad/ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese Handwriting recognition -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_PERL5= yes USE_GMAKE= yes diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 386e471..0f6a436 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -7,7 +7,7 @@ PORTNAME= k20fonts PORTVERSION= 0.396 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= http://khdd.net/20dot.fonts/:kappa20 \ http://downloads.sourceforge.jp/x-tt/8412/:ayu20 @@ -19,14 +19,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ginga-freebsd@ginganet.org COMMENT= X11 20-dot kanji font 'Kappa20dot + ayu font' -USE_X_PREFIX= yes USE_BZIP2= yes AYUDISTNAME= ayu20gothic-1.6 AYU_SUFFIX= .tar.gz BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/kdrill/files/patch-Imakefile b/japanese/kdrill/files/patch-Imakefile index a13101d..75ecd86 100644 --- a/japanese/kdrill/files/patch-Imakefile +++ b/japanese/kdrill/files/patch-Imakefile @@ -20,7 +20,7 @@ -# BINDIR = /usr/local/bin/X11 +BINDIR = $(PREFIX)/bin +LIBDIR = $(PREFIX)/lib/X11 -+CONFIGDIR = $(X11BASE)/lib/X11/config ++CONFIGDIR = $(LOCALBASE)/lib/X11/config +MANPATH = $(PREFIX)/man diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr index 4651007..b41f3d6 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-message b/japanese/kinput2-canna+freewnn+sj3/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-message +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr index a5b04b4..cd4770a 100644 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ b/japanese/kinput2-canna+freewnn/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn/pkg-message b/japanese/kinput2-canna+freewnn/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+freewnn/pkg-message +++ b/japanese/kinput2-canna+freewnn/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr index 8bd8343..46f66c4 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-message b/japanese/kinput2-canna+sj3+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr index 1e594b0..dbacade 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-message b/japanese/kinput2-canna+sj3+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr index 85e48e7..6a7d6f5 100644 --- a/japanese/kinput2-canna+wnn6/pkg-descr +++ b/japanese/kinput2-canna+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+wnn6/pkg-message b/japanese/kinput2-canna+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+wnn6/pkg-message +++ b/japanese/kinput2-canna+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr index f28abfb..0332b23 100644 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ b/japanese/kinput2-canna+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+wnn7/pkg-message b/japanese/kinput2-canna+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+wnn7/pkg-message +++ b/japanese/kinput2-canna+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr index 4c220b0..15822ed 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ b/japanese/kinput2-freewnn+sj3/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn+sj3/pkg-message b/japanese/kinput2-freewnn+sj3/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-message +++ b/japanese/kinput2-freewnn+sj3/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr index 854c747..79685f61 100644 --- a/japanese/kinput2-freewnn/pkg-descr +++ b/japanese/kinput2-freewnn/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn/pkg-message b/japanese/kinput2-freewnn/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-freewnn/pkg-message +++ b/japanese/kinput2-freewnn/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr index faf88ac..88693fe 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-descr +++ b/japanese/kinput2-sj3+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-sj3+wnn6/pkg-message b/japanese/kinput2-sj3+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-message +++ b/japanese/kinput2-sj3+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr index 5d8ace8..e43f241 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ b/japanese/kinput2-sj3+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-sj3+wnn7/pkg-message b/japanese/kinput2-sj3+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-message +++ b/japanese/kinput2-sj3+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr index 8792ae5..e8850b3 100644 --- a/japanese/kinput2-wnn6/pkg-descr +++ b/japanese/kinput2-wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-wnn6/pkg-message b/japanese/kinput2-wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-wnn6/pkg-message +++ b/japanese/kinput2-wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr index 9d48832..698a281 100644 --- a/japanese/kinput2-wnn7/pkg-descr +++ b/japanese/kinput2-wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-wnn7/pkg-message b/japanese/kinput2-wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-wnn7/pkg-message +++ b/japanese/kinput2-wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 854c747..79685f61 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2/pkg-message b/japanese/kinput2/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2/pkg-message +++ b/japanese/kinput2/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kochi-ttfonts/Makefile b/japanese/kochi-ttfonts/Makefile index 46361a3..6dd53fd 100644 --- a/japanese/kochi-ttfonts/Makefile +++ b/japanese/kochi-ttfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= kochi-ttfonts PORTVERSION= 20030809 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \ ${MASTER_SITE_PORTS_JP} @@ -16,7 +16,6 @@ DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2 MAINTAINER= ports@FreeBSD.org COMMENT= Free Japanese TrueType fonts named 'Kochi' -USE_X_PREFIX= yes USE_BZIP2= yes NO_BUILD= yes diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index fea46c1..b517e60 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -37,7 +37,7 @@ PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \ PATCH_DIST_STRIP= -p1 USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= kterm.1 MANLANG= "" ja @@ -54,7 +54,7 @@ NKFCMD= nkf @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" @${FALSE} .elif defined(WITH_XAW3DLIB) -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d post-patch: @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index c6b696f..853608f 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -28,12 +28,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA -BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf \ - mkfontdir:${X_CLIENTS_PORT} -EXTRACT_DEPENDS=bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +EXTRACT_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm .include <bsd.port.pre.mk> diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile index 2195d6e..30af1bf 100644 --- a/japanese/lyx/Makefile +++ b/japanese/lyx/Makefile @@ -21,11 +21,11 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms -USE_XPM= yes +USE_XORG= xpm USE_PERL5= yes GNU_CONFIGURE= yes STRIP= -CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11" +CONFIGURE_ARGS= --with-extra-lib=${LOCALBASE}/lib --with-extra-inc="${LOCALBASE}/include ${LOCALBASE}/include/X11" MAN1= lyx.1 reLyX.1 .include <bsd.port.pre.mk> diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile index cf50c41..ae7c6be 100644 --- a/japanese/marumoji-fonts/Makefile +++ b/japanese/marumoji-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= marumoji-fonts PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= yoichi @@ -22,11 +22,11 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Japanese marumoji fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/local .include <bsd.port.pre.mk> diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile index 457dac3..4ad4364 100644 --- a/japanese/mikachan-ttfonts/Makefile +++ b/japanese/mikachan-ttfonts/Makefile @@ -8,7 +8,7 @@ PORTNAME= mikachan-ttfonts PORTVERSION= 8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://members.tripod.co.jp/mikachan_font/ \ ${MASTER_SITE_PORTS_JP} @@ -26,7 +26,6 @@ EXTRACT_CMD= lha EXTRACT_BEFORE_ARGS= pq EXTRACT_AFTER_ARGS= > ${WRKSRC}/mika.ttf DIST_SUBDIR= ${PORTNAME} -USE_X_PREFIX= yes NO_BUILD= yes NO_WRKSUBDIR= yes MAKE_ENV= FONTSDIR=${FONTSDIR} diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile index 3d1afce..d4687b6 100644 --- a/japanese/ming/Makefile +++ b/japanese/ming/Makefile @@ -23,7 +23,7 @@ CONFLICTS= ming-* WRKSRC= ${WRKDIR}/jaming-${PORTVERSION}/src MAKE_ARGS= NOPROFILE=true -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_BISON= build UTILS= gif2dbl \ diff --git a/japanese/monafonts-ttf/pkg-descr b/japanese/monafonts-ttf/pkg-descr index efe7c52..7995550 100644 --- a/japanese/monafonts-ttf/pkg-descr +++ b/japanese/monafonts-ttf/pkg-descr @@ -1,8 +1,8 @@ -TrueType kanji propotional fonts that have same metric and order as -Japanese Windows font. This is named after ascii art 'mona' used in -'2 channel' ,notrious huge Web BBS. +TrueType kanji propotional fonts that have same metric and order as +Japanese Windows font. This is named after ascii art 'mona' used in +'2 channel' ,notrious huge Web BBS. -This font is installed in {X11BASE}/lib/X11/fonts/TrueType. +This font is installed in {LOCALBASE}/lib/X11/fonts/TrueType. WWW: http://monafont.sourceforge.net/ diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile index bb55ce0..103dbe9 100644 --- a/japanese/monafonts/Makefile +++ b/japanese/monafonts/Makefile @@ -7,23 +7,24 @@ PORTNAME= monafonts PORTVERSION= 2.90 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= japanese x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= monafont +MASTER_SITES= SF/monafont DISTNAME= monafont-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= X11 12,14,16-dot kanji fonts -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale + USE_PERL5_BUILD=yes FONTSDIR= lib/X11/fonts/local USE_BZIP2= yes -USE_X_PREFIX= yes ALL_TARGET= bdf MAKE_ARGS= PREFIX=${PREFIX} diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr index 4beaceb..1688f14 100644 --- a/japanese/monafonts/pkg-descr +++ b/japanese/monafonts/pkg-descr @@ -1,10 +1,10 @@ -X11 12,14,16-dot kanji propotional fonts that have same metric and order as -Japanese Windows font. This is named after ascii art 'mona' used in -'2 channel' ,notrious huge Web BBS. +X11 12,14,16-dot kanji propotional fonts that have same metric and order as +Japanese Windows font. This is named after ascii art 'mona' used in +'2 channel' ,notrious huge Web BBS. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ WWW: http://monafont.sourceforge.net/ diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile index ad05f2c..85673d0 100644 --- a/japanese/mplusfonts/Makefile +++ b/japanese/mplusfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplusfonts PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \ http://wids.net/archive/mplusfonts/distfiles/ @@ -16,11 +16,11 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= 12x13 dots X11 kanji fonts with simple and readable design -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/japanese/navi2ch-emacs21/Makefile b/japanese/navi2ch-emacs21/Makefile index 95acbed..76c0d86 100644 --- a/japanese/navi2ch-emacs21/Makefile +++ b/japanese/navi2ch-emacs21/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.7.5 PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= japanese www elisp -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org @@ -35,7 +34,7 @@ PLIST_SUB+= FSF="@comment " LISPDIR= ${EMACS_VERSION_SITE_LISPDIR} PLIST_SUB+= FSF="" .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 .endif diff --git a/japanese/navi2ch-xemacs21-mule/Makefile b/japanese/navi2ch-xemacs21-mule/Makefile index 9666a76..cf99baa 100644 --- a/japanese/navi2ch-xemacs21-mule/Makefile +++ b/japanese/navi2ch-xemacs21-mule/Makefile @@ -11,7 +11,7 @@ USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule BUILD_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-base:${PORTSDIR}/editors/xemacs-packages -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 \ ${BUILD_DEPENDS} .include "${MASTERDIR}/Makefile" diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile index 95acbed..76c0d86 100644 --- a/japanese/navi2ch/Makefile +++ b/japanese/navi2ch/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.7.5 PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= japanese www elisp -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org @@ -35,7 +34,7 @@ PLIST_SUB+= FSF="@comment " LISPDIR= ${EMACS_VERSION_SITE_LISPDIR} PLIST_SUB+= FSF="" .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 .endif diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index 8c3d87e..79377ec 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -19,8 +19,9 @@ PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz MAINTAINER= ports@FreeBSD.org COMMENT= A dungeon explorin', slashin', hackin' game -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_LATEST_LINK= yes @@ -52,7 +53,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack .for i in ibm nh10 ${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack - ${X11BASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \ + ${LOCALBASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \ > ${PREFIX}/share/examples/ja/nethack/$i.pcf ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf diff --git a/japanese/nethack32/files/patch-ae b/japanese/nethack32/files/patch-ae index ab14e67..3521f32 100644 --- a/japanese/nethack32/files/patch-ae +++ b/japanese/nethack32/files/patch-ae @@ -7,8 +7,8 @@ diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src -CFLAGS = -g -I../include -LFLAGS = -g -+CFLAGS += -O -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib ++CFLAGS += -O -I../include -I${LOCALBASE}/include ++LFLAGS = -L${LOCALBASE}/lib # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad index 1b79351..7231626 100644 --- a/japanese/nethack34/files/patch-ad +++ b/japanese/nethack34/files/patch-ad @@ -13,7 +13,7 @@ -CFLAGS = -W -g -O -I../include +CFLAGS += -I../include +ifeq ("$(GRAPHICS)","X11_GRAPHICS") -+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include ++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS @@ -66,7 +66,7 @@ # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib ++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile index 25032aa..293545c 100644 --- a/japanese/ngraph-fonts/Makefile +++ b/japanese/ngraph-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ngraph-fonts PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese math x11-fonts MASTER_SITES= # empty DISTFILES= # empty @@ -16,11 +16,11 @@ MAINTAINER= sanpei@FreeBSD.org COMMENT= Japanese Font Setup for math/ngraph RUN_DEPENDS= \ - ${X11BASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ - ${X11BASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ - mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes + ${LOCALBASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ + ${LOCALBASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile index 6e1a3f5..2c23e57 100644 --- a/japanese/ochusha/Makefile +++ b/japanese/ochusha/Makefile @@ -7,7 +7,7 @@ PORTNAME= ochusha PORTVERSION= 0.5.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ochusha/16560 @@ -18,7 +18,6 @@ COMMENT= A GUI BBS browser for 2ch.net MAN1= ochusha.1 MANCOMPRESSED= no -USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= pkgconfig glib20 gtk20 libxml2 GNU_CONFIGURE= yes @@ -26,7 +25,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= automake:110 autoconf:261 aclocal:110 libtool:15 DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \ - "${X11BASE}/share/ochusha/ochusha32.xpm" \ + "${LOCALBASE}/share/ochusha/ochusha32.xpm" \ "Ochusha" "Application;Network;" \ false diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile index 5192d7b..90a28b1 100644 --- a/japanese/oleo/Makefile +++ b/japanese/oleo/Makefile @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Spreadsheet Program + Japanese patches # xmkmf is for configure script, not for USE_IMAKE. -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake USE_BISON= build @@ -29,10 +29,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/Xbae/Matrix.h:${PORTSDIR}/x11-toolkits/xbae CONFIGURE_ARGS+=--without-motif .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" GNU_CONFIGURE= yes -USE_XLIB= yes INFO= oleo .include <bsd.port.pre.mk> diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile index f90f9ba..90a0043 100644 --- a/japanese/onew-freewnn/Makefile +++ b/japanese/onew-freewnn/Makefile @@ -64,7 +64,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF do-install: diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index f90f9ba..90a0043 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -64,7 +64,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF do-install: diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile index a4a5958..6860a94 100644 --- a/japanese/prime/Makefile +++ b/japanese/prime/Makefile @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR} USE_AUTOTOOLS= automake:19 autoconf:261 -PLIST_SUB= X11BASE=${X11BASE} +PLIST_SUB= LOCALBASE=${LOCALBASE} pre-configure: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL}) diff --git a/japanese/ruby-rdic/Makefile b/japanese/ruby-rdic/Makefile index 4188cdb..5728660 100644 --- a/japanese/ruby-rdic/Makefile +++ b/japanese/ruby-rdic/Makefile @@ -31,7 +31,7 @@ RUBY_RD_FILES= xselection.rd \ USE_XORG= x11 INSTALL_TARGET= site-install -MAKE_ARGS+= CFLAGS='-I ${X11BASE}/include' +MAKE_ARGS+= CFLAGS='-I ${LOCALBASE}/include' DOCS_EN= ChangeLog.rdic \ ChangeLog.xselection \ @@ -53,7 +53,7 @@ DOCS_ETC= eliminate.default \ PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} post-patch: - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/extconf.rb + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/extconf.rb post-install: rb-install doc-install diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile index 653db93..8609a2e 100644 --- a/japanese/rxvt/Makefile +++ b/japanese/rxvt/Makefile @@ -7,15 +7,14 @@ PORTNAME= rxvt PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ MAINTAINER= ports@FreeBSD.org COMMENT= An xterm replacement that supports pixmap background and Japanese -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice xt xpm GNU_CONFIGURE= yes USE_BZIP2= yes MAN1= rxvt.1 rclock.1 @@ -24,8 +23,10 @@ CONFIGURE_ARGS= --enable-xpm-background --enable-transparency \ --enable-languages --with-encoding=eucj \ --disable-backspace-key --disable-delete-key \ --enable-utmp --enable-wtmp \ - --with-xpm --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \ + --with-xpm-library=${LOCALBASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" DOCDIR= ${PREFIX}/share/doc/ja/rxvt RXVTLIB= ${PREFIX}/lib/X11/rxvt diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile index 988c0e1..32b801b 100644 --- a/japanese/sazanami-ttf/Makefile +++ b/japanese/sazanami-ttf/Makefile @@ -69,7 +69,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sazanami-ttf/pkg-plist b/japanese/sazanami-ttf/pkg-plist index e5f4c29..cd108e7 100644 --- a/japanese/sazanami-ttf/pkg-plist +++ b/japanese/sazanami-ttf/pkg-plist @@ -18,7 +18,7 @@ etc/fonts/conf.d/3.sazanami-ttf.conf %%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu %%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @exec mkdir -p %%LOCALFONTSDIR%%/TrueType @exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf @exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @@ -26,5 +26,5 @@ etc/fonts/conf.d/3.sazanami-ttf.conf @unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null || true @unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile index 09cdfeb..aea7b09 100644 --- a/japanese/scim-canna/Makefile +++ b/japanese/scim-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-canna PORTVERSION= 1.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= scim-imengine/18849 @@ -21,7 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_AUTOTOOLS= libtool:15 USE_GNOME= lthack -USE_XLIB= yes USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile index ccbbf49..709bfba 100644 --- a/japanese/scim-honoka-plugin-romkan/Makefile +++ b/japanese/scim-honoka-plugin-romkan/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ IGNORE= does not build in FreeBSD < 5.x .else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .endif .include <bsd.port.post.mk> diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile index 969dcbf..4a5db03 100644 --- a/japanese/scim-honoka-plugin-wnn/Makefile +++ b/japanese/scim-honoka-plugin-wnn/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ IGNORE= does not build in FreeBSD < 5.x .else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .endif .include <bsd.port.post.mk> diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile index ddae56f..db53373 100644 --- a/japanese/scim-skk/Makefile +++ b/japanese/scim-skk/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-skk PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= scim-imengine/18121 @@ -19,7 +19,6 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 78d3aa7..92ac2cd 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -9,7 +9,7 @@ PORTNAME= scim-uim PORTVERSION= 0.1.4 PORTREVISION= 8 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://freedesktop.org/~suzhe/sources/ MASTER_SITE_SUBDIR=scim @@ -35,11 +35,11 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab .if ${OSVERSION} < 500035 BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/stlport" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \ LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-4-stable .else -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D__STDC_ISO_10646__" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" .endif diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile index a1a3445..43e9700 100644 --- a/japanese/tk80/Makefile +++ b/japanese/tk80/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-toolkits tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_0 @@ -33,10 +33,11 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP} PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP} .endif USE_AUTOTOOLS= autoconf:213 -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \ - --enable-xlibHack --enable-onTheSpot \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib + --enable-xlibHack --enable-onTheSpot +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" RANLIB= ranlib USE_LDCONFIG= yes diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile index 50a855d..011513e 100644 --- a/japanese/tkstep80/Makefile +++ b/japanese/tkstep80/Makefile @@ -7,7 +7,7 @@ PORTNAME= tkstep PORTVERSION= 8.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_0 @@ -22,8 +22,7 @@ COMMENT= The Tk toolkit with a NeXTSTEP look and more LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm USE_AUTOTOOLS= autoconf:213 HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-gcc --enable-shared --enable-step \ diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile index e26aa05..0800ea8 100644 --- a/japanese/truetypefonts/Makefile +++ b/japanese/truetypefonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= truetypefonts PORTVERSION= 2001.08.18.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/t/ttf-xtt @@ -16,7 +16,6 @@ DISTNAME= ttf-xtt_0.${PORTVERSION:R:S/.//g}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org COMMENT= Japanese TrueType Fonts -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/ttf-xtt-0.${PORTVERSION:R:S/.//g} NO_BUILD= yes diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile index 51e5098..129f128 100644 --- a/japanese/vflib/Makefile +++ b/japanese/vflib/Makefile @@ -7,7 +7,7 @@ PORTNAME= vflib PORTVERSION= ${VFLIB_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese print MASTER_SITES= ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/ DISTNAME= VFlib2-${PORTVERSION} @@ -16,15 +16,15 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mita@FreeBSD.org COMMENT= Japanese Vector font library -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} +USE_XORG= x11 xext USE_FREETYPE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_AUTOTOOLS= autoconf:213 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-freetype \ diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index 64841f89..efb8134 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -7,7 +7,7 @@ PORTNAME= vje PORTVERSION= 3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese MASTER_SITES= ${CD_MOUNTPTS:S,^,file:,:S,$,/freebsd/,} \ ${CD_MOUNTPTS:S,^,file:,:S,$,/source/delta/:source,} \ @@ -34,15 +34,13 @@ ONLY_FOR_ARCHS= i386 USE_RC_SUBR= yes -USE_XLIB= yes - PLIST_SUB= BINSTUFF="${BINSTUFF}" WRKSRC= ${WRKDIR}/usr/local PATCH_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/delta/newFrontend MAKEFILE= Makefile.FreeBSD - +USE_XORG= x11 .include <bsd.port.pre.mk> MAINDIST= ${PORTNAME}-delta-${PORTVERSION}-ELF.tgz @@ -82,7 +80,7 @@ post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ ${FILESDIR}/vje.sh > ${WRKSRC}/etc/rc.d/vje.sh - @${REINPLACE_CMD} 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} 's,/usr/X11R6,${LOCALBASE},g' ${BUILD_WRKSRC}/${MAKEFILE} .if defined(NOPORTDOCS) @cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST .endif diff --git a/japanese/vlgothic/pkg-plist b/japanese/vlgothic/pkg-plist index df9bd75..ad0db4b 100644 --- a/japanese/vlgothic/pkg-plist +++ b/japanese/vlgothic/pkg-plist @@ -11,7 +11,7 @@ etc/fonts/conf.d/63-vlgothic.conf %%PORTDOCS%%%%DOCSDIR%%/README.sazanami %%PORTDOCS%%%%DOCSDIR%%/README_J.mplus %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec [ -s %D/%%FONTSDIR%%/fonts.cache-1 ] || rm -f %D/%%FONTSDIR%%/fonts.cache-1 @dirrmtry %%FONTSDIR%% diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile index 1155689..ffcef95 100644 --- a/japanese/xdtp/Makefile +++ b/japanese/xdtp/Makefile @@ -18,7 +18,7 @@ COMMENT= XDTP (XML Document Transfer Program) LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= libxml2 libxslt pkgconfig GNU_CONFIGURE= yes diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile index dd87b76..c4d3023 100644 --- a/japanese/xdvik/Makefile +++ b/japanese/xdvik/Makefile @@ -9,8 +9,7 @@ PORTNAME= xdvik PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH} PORTREVISION= 9 CATEGORIES= japanese print -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xdvi +MASTER_SITES= SF/xdvi PKGNAMEPREFIX= ja- PKGNAMESUFFIX= -tetex DISTNAME= xdvik-${VERSION_XDVIK} @@ -29,8 +28,8 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ mktexlsr:${PORTSDIR}/print/teTeX-base \ ${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \ - ${X11BASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \ - ${X11BASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts + ${LOCALBASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \ + ${LOCALBASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ wwwcore.1:${PORTSDIR}/www/libwww \ t1.5:${PORTSDIR}/devel/t1lib @@ -85,8 +84,8 @@ TTFMINCHO= lib/X11/fonts/TrueType/ipam.ttf TTFGOTHIC= lib/X11/fonts/TrueType/ipag.ttf VFONTCAPFT_SRC= ${WRKSRC}/vfontmap.freetype VFONTCAPFT_SUB= CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \ - TTFMINCHO=${X11BASE}/${TTFMINCHO} \ - TTFGOTHIC=${X11BASE}/${TTFGOTHIC} + TTFMINCHO=${LOCALBASE}/${TTFMINCHO} \ + TTFGOTHIC=${LOCALBASE}/${TTFGOTHIC} .include <bsd.port.pre.mk> diff --git a/japanese/xjtext/files/patch-aa b/japanese/xjtext/files/patch-aa index 98c017f..bca9e7b 100644 --- a/japanese/xjtext/files/patch-aa +++ b/japanese/xjtext/files/patch-aa @@ -6,12 +6,12 @@ -INCDIRS =-I/usr/X11R6/include -I/usr/local/include +CC =${CXX} +CFLAGS =${CXXFLAGS} -c -+INCDIRS =-I${X11BASE}/include `imlib-config --cflags` ++INCDIRS =-I${LOCALBASE}/include `imlib-config --cflags` LIBS =-lX11 -lXext -lm -lfl -IMLIBS =-ljpeg -lpng -ltiff -lz -lgif -lImlib -LIBDIRS =-L/usr/X11R6/lib/ -L/usr/local/lib +IMLIBS =`imlib-config --libs` -+LIBDIRS =-L${X11BASE}/lib ++LIBDIRS =-L${LOCALBASE}/lib OBJS =xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o all: xjtext @@ -20,7 +20,7 @@ xjtext: ${OBJS} - LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -+ LD_RUN_PATH=${X11BASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ ++ LD_RUN_PATH=${LOCALBASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -o xjtext clean: diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile index 152d077..ef24722 100644 --- a/japanese/xpdf/Makefile +++ b/japanese/xpdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpdf PORTVERSION= 3.00 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ DISTNAME= xpdf-japanese @@ -17,9 +17,8 @@ COMMENT= Japanese xpdf font support RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf \ ${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \ - ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts + ${LOCALBASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts -USE_X_PREFIX= yes NO_BUILD= yes SUB_FILES= dot.xpdfrc SUB_LIST= ADOBECMAPDIR=${ADOBECMAPDIR} diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in index be3aca3..0bcf1b2 100644 --- a/japanese/xpdf/files/dot.xpdfrc.in +++ b/japanese/xpdf/files/dot.xpdfrc.in @@ -5,24 +5,24 @@ unicodeMap EUC-JP %%PREFIX%%/share/xpdf/japanese/EUC-JP.unicodeMap unicodeMap Shift-JIS %%PREFIX%%/share/xpdf/japanese/Shift-JIS.unicodeMap cMapDir Adobe-Japan1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% -displayNamedCIDFontTT Ryumin-Light "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT HeiseiMin-W3H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT HeiseiKakuGo-W5H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT Ryumin-Light "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT HeiseiMin-W3H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT HeiseiKakuGo-W5H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" #Japanese PDF resources diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile index 79ecafc..09ec881 100644 --- a/japanese/xshodou/Makefile +++ b/japanese/xshodou/Makefile @@ -7,7 +7,7 @@ PORTNAME= xshodou PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese tk MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ @@ -16,12 +16,11 @@ COMMENT= A Japanese shodou program for X based on Tcl/Tk RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 -USE_X_PREFIX= yes - MAN1= xshodou.1 MANCOMPRESSED= yes WISH= ${LOCALBASE}/bin/wish8.0 +USE_XORG= x11 post-patch: @${REINPLACE_CMD} -e \ diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile index 8930b1f..5c9537a 100644 --- a/japanese/xyagamo/Makefile +++ b/japanese/xyagamo/Makefile @@ -7,15 +7,14 @@ PORTNAME= xyagamo PORTVERSION= 0.1b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese games MASTER_SITES= http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese version of a four player mahjong game -USE_X_PREFIX= YES -USE_XPM= yes +USE_XORG= xpm MAN6= xyagamo.6 MANLANG= ja diff --git a/japanese/xyagamo/files/patch-Makefile b/japanese/xyagamo/files/patch-Makefile index 6937f21..74a8329 100644 --- a/japanese/xyagamo/files/patch-Makefile +++ b/japanese/xyagamo/files/patch-Makefile @@ -4,7 +4,7 @@ INSTALL = install -c -o root -g wheel -X11PREFIX = /usr/X11R6 -+X11PREFIX = $(X11BASE) ++X11PREFIX = $(LOCALBASE) INSTALL_BINDIR = $(X11PREFIX)/bin INSTALL_LIBDIR = $(X11PREFIX)/lib/X11/xyagamo diff --git a/japanese/xyagamo/files/patch-src-Makefile b/japanese/xyagamo/files/patch-src-Makefile index 67f52d7..898257b 100644 --- a/japanese/xyagamo/files/patch-src-Makefile +++ b/japanese/xyagamo/files/patch-src-Makefile @@ -9,7 +9,7 @@ +#LFLAGS = -g -X11PREFIX ?= /usr/X11R6 -+X11PREFIX = $(X11BASE) ++X11PREFIX = $(LOCALBASE) X11INCL = -I$(X11PREFIX)/include -X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm -lxpg4 +X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile index 9f3df18..11922f1 100644 --- a/japanese/xyaku/Makefile +++ b/japanese/xyaku/Makefile @@ -7,7 +7,7 @@ PORTNAME= xyaku PORTVERSION= 1.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese textproc MASTER_SITES= http://www.sepia.dti.ne.jp/inoue/software/xyaku/ \ http://redundancy.redundancy.org/mirror/ @@ -17,6 +17,8 @@ COMMENT= A general dictionary/search engine front-end for X RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb +USE_XORG= x11 xt xext ice sm + OPTIONS= UTF8 "Use UTF-8 edict dictionaries" on .if !defined(WITHOUT_UTF8) @@ -28,7 +30,6 @@ RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict .endif USE_RUBY= yes -USE_XLIB= yes USE_AUTOTOOLS= autoconf:213 libtool:15 CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \ --with-ruby="${RUBY}" diff --git a/japanese/zangband/files/Makefile.in b/japanese/zangband/files/Makefile.in index 9034917..1742fd8 100644 --- a/japanese/zangband/files/Makefile.in +++ b/japanese/zangband/files/Makefile.in @@ -6,7 +6,7 @@ ANGBANDLIB?= /usr/local/lib/angband all: testing testing: - cd src && make "EXTRA_CFLAGS=-I${X11BASE}/include ${JAPANESE_CFLAGS} -DDEFAULT_PATH=\\\"${ANGBANDLIB}\\\"" + cd src && make "EXTRA_CFLAGS=-I${LOCALBASE}/include ${JAPANESE_CFLAGS} -DDEFAULT_PATH=\\\"${ANGBANDLIB}\\\"" test: testing ANGBAND_PATH=./lib ./testing diff --git a/japanese/zangband/files/patch-aa b/japanese/zangband/files/patch-aa index ebbe907..64b02e8 100644 --- a/japanese/zangband/files/patch-aa +++ b/japanese/zangband/files/patch-aa @@ -33,7 +33,7 @@ +## Variation -- Compile for FreeBSD +## +CFLAGS += -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY" ${EXTRA_CFLAGS} -+LIBS = -L${X11BASE}/lib -lX11 -lcurses -ltermcap ++LIBS = -L${LOCALBASE}/lib -lX11 -lcurses -ltermcap diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 05319fc..aaa0ea8 100644 --- a/java/classpath/Makefile +++ b/java/classpath/Makefile @@ -8,6 +8,7 @@ PORTNAME= classpath PORTVERSION= 0.93 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SAVANNAH} @@ -19,6 +20,7 @@ COMMENT= A GNU project to create a free Java class library BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ jikes:${PORTSDIR}/java/jikes +USE_XORG= x11 USE_LDCONFIG= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index 6bd855a..a89fa8a 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -26,8 +26,7 @@ ECLIPSE= ${PORTNAME} ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes -USE_GCC= 3.4+ -USE_GL= yes +USE_GL= glu .if !defined(WITHOUT_MOZILLA) USE_GECKO= xulrunner firefox mozilla seamonkey @@ -127,7 +126,7 @@ do-install: @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ - -e "s+%%X11BASE%%+${X11BASE}+g" \ + -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%BROWSER%%+${BROWSER}+g" \ -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \ diff --git a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak index 075a1c7..d57dcd7 100644 --- a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak @@ -5,7 +5,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -14,7 +14,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool -#NATIVE_STATS = -DNATIVE_STATS @@ -26,7 +26,7 @@ -Wno-non-virtual-dtor \ -fPIC \ -I. \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ + -I$(LOCALBASE)/include/xulrunner \ @@ -53,7 +53,7 @@ $(NATIVE_STATS) \ - -DLINUX -DGTK \ + -DFREEBSD -DGTK \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -fPIC \ diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 679b5cd..55f958d 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -124,7 +124,6 @@ do-install: @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ - -e "s+%%X11BASE%%+${X11BASE}+g" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%BROWSER%%+${BROWSER}+g" \ -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \ diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak index b9e4b6e..b08943a 100644 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak @@ -5,7 +5,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -14,7 +14,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -37,7 +37,7 @@ + -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC -s diff --git a/java/gjdoc/Makefile b/java/gjdoc/Makefile index ef4e5d3..a470135 100644 --- a/java/gjdoc/Makefile +++ b/java/gjdoc/Makefile @@ -25,7 +25,7 @@ ANTLRVER= 2.7.5 ANTLR= antlr-${ANTLRVER} USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --with-antlr-jar=${ANTLR}.jar CONFIGURE_ENV= PATH="${WRKDIR}/bin:${PATH}" LDFLAGS="${PTHREAD_LIBS}" MAKE_ENV= PATH="${WRKDIR}/bin:${PATH}" diff --git a/java/jc/Makefile b/java/jc/Makefile index 6d9a811..05fcac6 100644 --- a/java/jc/Makefile +++ b/java/jc/Makefile @@ -25,7 +25,7 @@ MAN1= jc.1 USE_JAVA= yes USE_GMAKE= yes JAVA_BUILD= jre -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-classpath=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 4b5e54b..c63b3a8 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -20,21 +20,21 @@ COMMENT= Java Development Kit 1.3 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ zip:${PORTSDIR}/archivers/zip \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif + ${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif .if defined(WITH_PLUGIN) FORBIDDEN= Vulnerabilities in the browser plugin USE_GNOME+= gtk12 LIB_DEPENDS= nspr4.1:$(PORTSDIR)/devel/nspr .endif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ - ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts + ${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ + ${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts .if defined(WITH_JAPANESE_FONTS) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts .endif .if defined(WITH_RUSSIAN_FONTS) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts .endif .if defined(WITH_CHINESE_FONTS) RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf @@ -53,8 +53,8 @@ USE_XORG= ice sm x11 xext xp xt xtst RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ - ALT_MOTIF_DIR="${X11BASE}" \ - OPENWINHOME="${X11BASE}" \ + ALT_MOTIF_DIR="${LOCALBASE}" \ + OPENWINHOME="${LOCALBASE}" \ SYS_CFLAGS="${CFLAGS}" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ @@ -204,7 +204,7 @@ post-patch: ${WRKSRC}/$${file}; \ done @for file in ${X11_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \ + ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk index 686183a..218f812 100644 --- a/java/jdk13/files/patch-common::Defs-bsd.gmk +++ b/java/jdk13/files/patch-common::Defs-bsd.gmk @@ -42,7 +42,7 @@ $FreeBSD$ override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true -override OPENWINHOME = /usr/X11R6 -+override OPENWINHOME = $(X11BASE) ++override OPENWINHOME = $(LOCALBASE) override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override PREPROCESS_BEFORE_AS = true override PRIVATIZE_JVM_SYMBOLS = false @@ -51,7 +51,7 @@ $FreeBSD$ LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp else - MOTIF_DIR=/usr/X11R6 -+ MOTIF_DIR=$(X11BASE) ++ MOTIF_DIR=$(LOCALBASE) endif endif ifdef ALT_MOTIF_DIR diff --git a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c index 625ddf2..c946715 100644 --- a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c +++ b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c @@ -7,7 +7,7 @@ $FreeBSD$ { #ifndef __solaris__ - char *ptr = "/usr/X11R6/lib/X11/fonts/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/tt"; -+ char *ptr = "%%X11BASE%%/lib/X11/fonts/Type1:%%X11BASE%%/lib/X11/fonts/TrueType:%%X11BASE%%/lib/X11/fonts/tt"; ++ char *ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:%%LOCALBASE%%/lib/X11/fonts/TrueType:%%LOCALBASE%%/lib/X11/fonts/tt"; #else char *ptr = getSolarisFontLocations((int) (noType1==JNI_TRUE)); #endif diff --git a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile index 48d25a0..2b1f220 100644 --- a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile +++ b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile @@ -17,8 +17,8 @@ $FreeBSD$ -X11_INCLUDE=/usr/X11R6/include -X11_LIB=/usr/X11R6/lib -+X11_INCLUDE=$(X11BASE)/include -+X11_LIB=$(X11BASE)/lib ++X11_INCLUDE=$(LOCALBASE)/include ++X11_LIB=$(LOCALBASE)/lib MOTIF_INCLUDE = $(MOTIF_DIR)/include MOTIF_LIB = $(MOTIF_DIR)/lib INTL_INCLUDE = $(INTL_DIR)/include diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index edb208d..a8e5b0e 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -38,7 +38,7 @@ OPTIONS= DEBUG "Enable debugging support" off \ .if defined(WITH_OPENMOTIF_JDK) BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/open-motif-jdk:extract .else -BUILD_DEPENDS+= ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif +BUILD_DEPENDS+= ${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif .endif PKGINSTALL= ${WRKDIR}/pkg-install @@ -86,13 +86,13 @@ EXTRACT_ONLY+= ${TZUPDATEFILE} .endif .if defined(WITH_WEB) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts .endif .if defined(WITH_OPENMOTIF_JDK) OPENMOTIF_DIR= ${WRKDIR}/jdkmotif .else -OPENMOTIF_DIR= ${X11BASE} +OPENMOTIF_DIR= ${LOCALBASE} .endif # do we have valid native jdk installed? @@ -264,7 +264,7 @@ post-patch: ${WRKSRC}/$${file}; \ done @for file in ${X11_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \ + ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk index 62700f5..9961a41 100644 --- a/java/jdk14/files/patch-common::Defs-bsd.gmk +++ b/java/jdk14/files/patch-common::Defs-bsd.gmk @@ -35,7 +35,7 @@ $FreeBSD$ override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = false -override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11BASE) ++override OPENWIN_HOME = $(LOCALBASE) override OPENWIN_LIB = $(OPENWIN_HOME)/lib override OTHER_M4FLAGS = -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = diff --git a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk index f1e9107..6d002d7 100644 --- a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk +++ b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk @@ -7,7 +7,7 @@ $FreeBSD$ CLASSPATH_SEP = $(CLASSPATH_SEPARATOR) PATH_SEP = / -X11DIR = /usr/X11R6 -+X11DIR = $(X11BASE) ++X11DIR = $(LOCALBASE) ifneq (,$(filter-out NetBSD DragonFly,$(TRUE_PLATFORM))) LIBS = -L$(X11DIR)/lib -lX11 else diff --git a/java/jdk14/files/patch-j2se::awt::fontpath.c b/java/jdk14/files/patch-j2se::awt::fontpath.c index 0c940b1..502c7a7 100644 --- a/java/jdk14/files/patch-j2se::awt::fontpath.c +++ b/java/jdk14/files/patch-j2se::awt::fontpath.c @@ -10,10 +10,10 @@ $FreeBSD$ - "/usr/X11R6/lib/X11/fonts/TrueType:" - "/usr/X11R6/lib/X11/fonts/tt:" - "/usr/share/fonts/ja/TrueType"; -+ ptr = "%%X11BASE%%/lib/X11/fonts/Type1:" -+ "%%X11BASE%%/lib/X11/fonts/TrueType:" -+ "%%X11BASE%%/lib/X11/fonts/tt:" -+ "%%X11BASE%%/fonts/ja/TrueType"; ++ ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:" ++ "%%LOCALBASE%%/lib/X11/fonts/TrueType:" ++ "%%LOCALBASE%%/lib/X11/fonts/tt:" ++ "%%LOCALBASE%%/fonts/ja/TrueType"; #elif defined( HEADLESS ) ptr = getSolarisFontLocations(env, (int) (noType1==JNI_TRUE)); #elif SCAN_FONT_DIRS diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk index d8a025a..95e1c36 100644 --- a/java/jdk14/files/patch-plugin::common::config.gmk +++ b/java/jdk14/files/patch-plugin::common::config.gmk @@ -6,16 +6,16 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris -- X11BASE = /usr/X11R6 - OTHER_LDFLAGS = -L$(X11BASE)/lib +- LOCALBASE = /usr/X11R6 + OTHER_LDFLAGS = -L$(LOCALBASE)/lib ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM))) - OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib + OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib @@ -61,7 +60,7 @@ # include search paths # XXXBSD: these should be defined in other place -- CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include -+ CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include +- CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include ++ CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include ifeq ($(TRUE_PLATFORM), FreeBSD) LDFLAGS_COMMON += -pthread diff --git a/java/jdk14/files/pkg-deinstall.in b/java/jdk14/files/pkg-deinstall.in index 5472493..9421455 100644 --- a/java/jdk14/files/pkg-deinstall.in +++ b/java/jdk14/files/pkg-deinstall.in @@ -12,7 +12,7 @@ fi # Remove the plugin # Plugin location variables -BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins" +BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns610" PLUGIN=libjavaplugin_oji.so diff --git a/java/jdk14/files/pkg-install.in b/java/jdk14/files/pkg-install.in index 53fd8ef..a57551b 100644 --- a/java/jdk14/files/pkg-install.in +++ b/java/jdk14/files/pkg-install.in @@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then fi # Install the plugin - BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins" + BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns610" PLUGIN=libjavaplugin_oji.so diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 4fb5cd2..24c15b5 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -20,7 +20,7 @@ COMMENT= Java Development Kit 1.5.0 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ zip:${PORTSDIR}/archivers/zip \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif + ${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper OPTIONS= DEBUG "Enable debugging support" off \ @@ -126,7 +126,7 @@ RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ - ALT_MOTIF_DIR="${X11BASE}" \ + ALT_MOTIF_DIR="${LOCALBASE}" \ DEFAULT_LD_LIBRARY_PATH="/usr/lib:${LOCALBASE}/lib" \ SYS_CFLAGS="${CFLAGS}" \ LANG="C" \ @@ -281,7 +281,7 @@ post-patch: ${WRKSRC}/$${file}; \ done @for file in ${X11_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \ + ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ diff --git a/java/jdk15/files/patch-deploy::common::config.gmk b/java/jdk15/files/patch-deploy::common::config.gmk index b9592c5..cc8d9bc 100644 --- a/java/jdk15/files/patch-deploy::common::config.gmk +++ b/java/jdk15/files/patch-deploy::common::config.gmk @@ -7,10 +7,10 @@ $FreeBSD$ ifeq ($(LINUX_OR_BSD), true) PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris - OTHER_LDFLAGS = -L/usr/X11R6/lib -+ OTHER_LDFLAGS = -L$(X11BASE)/lib ++ OTHER_LDFLAGS = -L$(LOCALBASE)/lib ifeq ($(TRUE_PLATFORM), NetBSD) - OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib -+ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib ++ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib endif endif diff --git a/java/jdk15/files/patch-deploy::jvmnative::Makefile b/java/jdk15/files/patch-deploy::jvmnative::Makefile index 9ae13e1..c34cd2e 100644 --- a/java/jdk15/files/patch-deploy::jvmnative::Makefile +++ b/java/jdk15/files/patch-deploy::jvmnative::Makefile @@ -7,7 +7,7 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) LDLIBS = -lm -lX11 -X11HDRDIR = /usr/X11R6/include -+X11HDRDIR = $(X11BASE)/include ++X11HDRDIR = $(LOCALBASE)/include else X11HDRDIR = ifeq ($(PLATFORM), linux) diff --git a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk index 9f7709c..3299187 100644 --- a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk @@ -8,7 +8,7 @@ $FreeBSD$ PATH_SEP = / -X11DIR = /usr/X11R6 -LOCALDIR = /usr/local -+X11DIR = $(X11BASE) ++X11DIR = $(LOCALBASE) +LOCALDIR = $(LOCALBASE) ifneq ($(TRUE_PLATFORM), NetBSD) LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv diff --git a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile index 3a53b90..70dd453 100644 --- a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile +++ b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile @@ -8,7 +8,7 @@ $FreeBSD$ MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) -X11HDRDIR = /usr/X11R6/include -ICONVHDRDIR = /usr/local/include -+X11HDRDIR = $(X11BASE)/include ++X11HDRDIR = $(LOCALBASE)/include +ICONVHDRDIR = $(LOCALBASE)/include NSPRHDRDIR = $(NSPR_HEADERS_PATH) else diff --git a/java/jdk15/files/patch-deploy::nscore::Makefile b/java/jdk15/files/patch-deploy::nscore::Makefile index 1ce85cb..02feb9d 100644 --- a/java/jdk15/files/patch-deploy::nscore::Makefile +++ b/java/jdk15/files/patch-deploy::nscore::Makefile @@ -8,7 +8,7 @@ $FreeBSD$ LDLIBS = -lX11 -X11HDRDIR = /usr/X11R6/include -ICONVHDRDIR = /usr/local/include -+X11HDRDIR = $(X11BASE)/include ++X11HDRDIR = $(LOCALBASE)/include +ICONVHDRDIR = $(LOCALBASE)/include else X11HDRDIR = diff --git a/java/jdk15/files/patch-j2se::awt::fontpath.c b/java/jdk15/files/patch-j2se::awt::fontpath.c index 4c941d3..d6e9771 100644 --- a/java/jdk15/files/patch-j2se::awt::fontpath.c +++ b/java/jdk15/files/patch-j2se::awt::fontpath.c @@ -11,11 +11,11 @@ $FreeBSD$ - "/usr/X11R6/lib/X11/fonts/tt", - "/usr/X11R6/lib/X11/fonts/TTF", - "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ -+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ -+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */ -+ "%%X11BASE%%/lib/X11/fonts/tt", -+ "%%X11BASE%%/lib/X11/fonts/TTF", -+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ ++ "%%LOCALBASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ ++ "%%LOCALBASE%%/lib/X11/fonts/truetype", /* SuSE */ ++ "%%LOCALBASE%%/lib/X11/fonts/tt", ++ "%%LOCALBASE%%/lib/X11/fonts/TTF", ++ "%%LOCALBASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */ "/usr/share/fonts/truetype", "/usr/share/fonts/ko/TrueType", /* RH 9.0 */ @@ -23,7 +23,7 @@ $FreeBSD$ "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */ "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */ - "/usr/X11R6/lib/X11/fonts/Type1", -+ "%%X11BASE%%/lib/X11/fonts/Type1", ++ "%%LOCALBASE%%/lib/X11/fonts/Type1", "/usr/share/fonts/default/Type1", /* RH 9.0 */ NULL, /* terminates the list */ }; diff --git a/java/jdk15/files/patch-j2se::awt::mawt.gmk b/java/jdk15/files/patch-j2se::awt::mawt.gmk index 703e594..d14b804 100644 --- a/java/jdk15/files/patch-j2se::awt::mawt.gmk +++ b/java/jdk15/files/patch-j2se::awt::mawt.gmk @@ -9,9 +9,9 @@ $FreeBSD$ - LIBXT = /usr/X11R6/lib/libXt.a - LIBSM = /usr/X11R6/lib/libSM.a - LIBICE = /usr/X11R6/lib/libICE.a -+ LIBXT = $(X11BASE)/lib/libXt.a -+ LIBSM = $(X11BASE)/lib/libSM.a -+ LIBICE = $(X11BASE)/lib/libICE.a ++ LIBXT = $(LOCALBASE)/lib/libXt.a ++ LIBSM = $(LOCALBASE)/lib/libSM.a ++ LIBICE = $(LOCALBASE)/lib/libICE.a endif endif else @@ -20,7 +20,7 @@ $FreeBSD$ ifeq ($(LINUX_OR_BSD), true) - CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -+ CPPFLAGS += -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions ++ CPPFLAGS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/X11/extensions endif ifeq ($(PLATFORM), solaris) diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk index 772486e..a5ab5cf 100644 --- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk @@ -16,7 +16,7 @@ $FreeBSD$ override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = false -override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11BASE) ++override OPENWIN_HOME = $(LOCALBASE) override OPENWIN_LIB = $(OPENWIN_HOME)/lib override OTHER_M4FLAGS = -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = diff --git a/java/jdk15/files/patch-j2se::font::Makefile b/java/jdk15/files/patch-j2se::font::Makefile index 92c2e00..da8093d 100644 --- a/java/jdk15/files/patch-j2se::font::Makefile +++ b/java/jdk15/files/patch-j2se::font::Makefile @@ -7,7 +7,7 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) # XXXBSD: why here? -OTHER_INCLUDES += -I/usr/X11R6/include -+OTHER_INCLUDES += -I$(X11BASE)/include ++OTHER_INCLUDES += -I$(LOCALBASE)/include OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX) else ifeq ($(PLATFORM), linux) diff --git a/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java b/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java index c9ca568..198a71a 100644 --- a/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java +++ b/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java @@ -8,8 +8,8 @@ $FreeBSD$ System.getProperty("swing.gtkthemedir"), - "/usr/X11R6/share/gnome/themes", // FreeBSD - "/usr/X11R6/share/themes", // FreeBSD -+ "%%X11BASE%%/share/gnome/themes", // FreeBSD -+ "%%X11BASE%%/share/themes", // FreeBSD ++ "%%LOCALBASE%%/share/gnome/themes", // FreeBSD ++ "%%LOCALBASE%%/share/themes", // FreeBSD "/usr/share/themes" // Debian/Redhat/Solaris/SuSE }; diff --git a/java/jdk15/files/patch-j2se::gtk::Metacity.java b/java/jdk15/files/patch-j2se::gtk::Metacity.java index 1d705f5..8f79c21 100644 --- a/java/jdk15/files/patch-j2se::gtk::Metacity.java +++ b/java/jdk15/files/patch-j2se::gtk::Metacity.java @@ -8,8 +8,8 @@ $FreeBSD$ System.getProperty("swing.metacitythemedir"), - "/usr/X11R6/share/themes", - "/usr/X11R6/share/gnome/themes", -+ "%%X11BASE%%/share/themes", -+ "%%X11BASE%%/share/gnome/themes", ++ "%%LOCALBASE%%/share/themes", ++ "%%LOCALBASE%%/share/gnome/themes", "/usr/share/themes", "/usr/gnome/share/themes", // Debian/Redhat/Solaris "/opt/gnome2/share/themes" // SuSE diff --git a/java/jdk15/files/patch-j2se::xawt::Makefile b/java/jdk15/files/patch-j2se::xawt::Makefile index 6220ec6..f1ca39b 100644 --- a/java/jdk15/files/patch-j2se::xawt::Makefile +++ b/java/jdk15/files/patch-j2se::xawt::Makefile @@ -7,7 +7,7 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) - CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include -+ CPPFLAGS += -I$(X11BASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include ++ CPPFLAGS += -I$(LOCALBASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include endif ifeq ($(PLATFORM), solaris) diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 91e2586..3d377a8 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -19,7 +19,7 @@ COMMENT= Java Development Kit 1.6.0 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ - ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ + ${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-base RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper @@ -123,7 +123,7 @@ RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ - ALT_MOTIF_DIR="${X11BASE}" \ + ALT_MOTIF_DIR="${LOCALBASE}" \ ALT_DEVTOOLS_PATH="${LOCALBASE}" \ LANG="C" \ LC_ALL="C" \ @@ -134,7 +134,6 @@ MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ LOCALBASE="${LOCALBASE}" \ - X11BASE="${X11BASE}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if defined(WITH_DEBUG) @@ -287,7 +286,7 @@ post-patch: ${WRKSRC}/$${file}; \ done @for file in ${X11_FILES}; do \ - ${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \ + ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done @for file in ${DESKTOP_FILES}; do \ diff --git a/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk index e8530a7..e67d961 100644 --- a/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk +++ b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk @@ -8,7 +8,7 @@ $FreeBSD$ PATH_SEP = / -X11DIR = /usr/X11R6 -LOCALDIR = /usr/local -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} +LOCALDIR = ${LOCALBASE} ifneq ($(OS_VENDOR), NetBSD) LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv diff --git a/java/jdk16/files/patch-deploy-jvmnative-Makefile b/java/jdk16/files/patch-deploy-jvmnative-Makefile index 552150c..5276288 100644 --- a/java/jdk16/files/patch-deploy-jvmnative-Makefile +++ b/java/jdk16/files/patch-deploy-jvmnative-Makefile @@ -7,7 +7,7 @@ $FreeBSD$ include $(DEPLOY_TOPDIR)/make/plugin/common/Defs.gmk -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} ifeq ($(PLATFORM), bsd) LDLIBS = -L$(X11DIR)/lib -lX11 diff --git a/java/jdk16/files/patch-deploy-oji-adapter-Makefile b/java/jdk16/files/patch-deploy-oji-adapter-Makefile index 71126c7..9a91564 100644 --- a/java/jdk16/files/patch-deploy-oji-adapter-Makefile +++ b/java/jdk16/files/patch-deploy-oji-adapter-Makefile @@ -6,7 +6,7 @@ $FreeBSD$ dummy:=$(shell $(MKDIR) -p $(LIB_LOCATION)) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} ifeq ($(PLATFORM), solaris) LDLIBS = -lX11 -ldl -lCrun -lc diff --git a/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk b/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk index 608e65b..bed54a9 100644 --- a/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk +++ b/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk @@ -7,4 +7,4 @@ $FreeBSD$ PLUGIN_PLATFORM_SRC := $(DEPLOY_TOPDIR)/src/plugin/solaris -OTHER_LDFLAGS = -L/usr/X11R6/lib -+OTHER_LDFLAGS = -L${X11BASE}/lib ++OTHER_LDFLAGS = -L${LOCALBASE}/lib diff --git a/java/jdk16/files/patch-deploy-unix-Makefile b/java/jdk16/files/patch-deploy-unix-Makefile index 332b52f..81ab95c 100644 --- a/java/jdk16/files/patch-deploy-unix-Makefile +++ b/java/jdk16/files/patch-deploy-unix-Makefile @@ -7,7 +7,7 @@ $FreeBSD$ include $(DEPLOY_TOPDIR)/make/plugin/common/Defs.gmk -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} ifeq ($(PLATFORM), linux) LDLIBS = -lX11 -ldl -lc diff --git a/java/jdk16/files/patch-j2se-awt-fontpath.c b/java/jdk16/files/patch-j2se-awt-fontpath.c index bebc39f..4105d38 100644 --- a/java/jdk16/files/patch-j2se-awt-fontpath.c +++ b/java/jdk16/files/patch-j2se-awt-fontpath.c @@ -11,11 +11,11 @@ $FreeBSD$ - "/usr/X11R6/lib/X11/fonts/tt", - "/usr/X11R6/lib/X11/fonts/TTF", - "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ -+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ -+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */ -+ "%%X11BASE%%/lib/X11/fonts/tt", -+ "%%X11BASE%%/lib/X11/fonts/TTF", -+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ ++ "%%LOCALBASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ ++ "%%LOCALBASE%%/lib/X11/fonts/truetype", /* SuSE */ ++ "%%LOCALBASE%%/lib/X11/fonts/tt", ++ "%%LOCALBASE%%/lib/X11/fonts/TTF", ++ "%%LOCALBASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */ "/usr/share/fonts/truetype", "/usr/share/fonts/ko/TrueType", /* RH 9.0 */ @@ -23,7 +23,7 @@ $FreeBSD$ "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */ "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */ - "/usr/X11R6/lib/X11/fonts/Type1", -+ "%%X11BASE%%/lib/X11/fonts/Type1", ++ "%%LOCALBASE%%/lib/X11/fonts/Type1", "/usr/share/fonts/default/Type1", /* RH 9.0 */ NULL, /* terminates the list */ }; diff --git a/java/jdk16/files/patch-j2se-awt-mawt.gmk b/java/jdk16/files/patch-j2se-awt-mawt.gmk index ddbab71..ff56d99 100644 --- a/java/jdk16/files/patch-j2se-awt-mawt.gmk +++ b/java/jdk16/files/patch-j2se-awt-mawt.gmk @@ -7,13 +7,13 @@ $FreeBSD$ else # Allows for builds on Debian GNU Linux, X11 is in a different place - LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \ -+ LIBXT = $(firstword $(wildcard ${X11BASE}/lib/libXt.a) \ ++ LIBXT = $(firstword $(wildcard ${LOCALBASE}/lib/libXt.a) \ $(wildcard /usr/lib/libXt.a)) - LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \ -+ LIBSM = $(firstword $(wildcard ${X11BASE}/lib/libSM.a) \ ++ LIBSM = $(firstword $(wildcard ${LOCALBASE}/lib/libSM.a) \ $(wildcard /usr/lib/libSM.a)) - LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \ -+ LIBICE = $(firstword $(wildcard ${X11BASE}/lib/libICE.a) \ ++ LIBICE = $(firstword $(wildcard ${LOCALBASE}/lib/libICE.a) \ $(wildcard /usr/lib/libICE.a)) endif endif @@ -23,8 +23,8 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ - -I/usr/X11R6/include -+ CPPFLAGS += -I${X11BASE}/include/X11/extensions \ -+ -I${X11BASE}/include ++ CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \ ++ -I${LOCALBASE}/include endif LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ diff --git a/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk b/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk index 0473594..5dae8f0 100644 --- a/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk +++ b/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk @@ -7,7 +7,7 @@ $FreeBSD$ override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = false -override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = ${X11BASE} ++override OPENWIN_HOME = ${LOCALBASE} override OPENWIN_LIB = $(OPENWIN_HOME)/lib override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = diff --git a/java/jdk16/files/patch-j2se-font-Makefile b/java/jdk16/files/patch-j2se-font-Makefile index 87630b0..2258735 100644 --- a/java/jdk16/files/patch-j2se-font-Makefile +++ b/java/jdk16/files/patch-j2se-font-Makefile @@ -7,7 +7,7 @@ $FreeBSD$ # setup the list of libraries to link in... ifeq ($(PLATFORM), bsd) -OTHER_INCLUDES += -I/usr/X11R6/include -+OTHER_INCLUDES += -I${X11BASE}/include ++OTHER_INCLUDES += -I${LOCALBASE}/include OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) else ifeq ($(PLATFORM), linux) diff --git a/java/jdk16/files/patch-j2se-gtk-Metacity.java b/java/jdk16/files/patch-j2se-gtk-Metacity.java index eaf3939..906baec 100644 --- a/java/jdk16/files/patch-j2se-gtk-Metacity.java +++ b/java/jdk16/files/patch-j2se-gtk-Metacity.java @@ -10,8 +10,8 @@ $FreeBSD$ - "/usr/X11R6/share/gnome/themes", - "/usr/local/share/themes", - "/usr/local/share/gnome/themes", -+ "%%X11BASE%%/share/themes", -+ "%%X11BASE%%/share/gnome/themes", ++ "%%LOCALBASE%%/share/themes", ++ "%%LOCALBASE%%/share/gnome/themes", + "%%LOCALBASE%%/share/themes", + "%%LOCALBASE%%/share/gnome/themes", "/usr/share/themes", diff --git a/java/jdk16/files/patch-j2se-xawt-Makefile b/java/jdk16/files/patch-j2se-xawt-Makefile index f2517a6..2b6f82a 100644 --- a/java/jdk16/files/patch-j2se-xawt-Makefile +++ b/java/jdk16/files/patch-j2se-xawt-Makefile @@ -16,7 +16,7 @@ $FreeBSD$ ifeq ($(PLATFORM), linux) # Allows for builds on Debian GNU Linux, X11 is in a different place - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ -+ CPPFLAGS += -I${X11BASE}/include/X11/extensions \ ++ CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \ -I/usr/include/X11/extensions \ -I$(MOTIF_DIR)/include \ -I$(OPENWIN_HOME)/include @@ -24,7 +24,7 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) - CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include -+ CPPFLAGS += -I${X11BASE}/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include ++ CPPFLAGS += -I${LOCALBASE}/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include endif ifeq ($(PLATFORM), solaris) diff --git a/java/jmp/Makefile b/java/jmp/Makefile index f5810da..76338a4 100644 --- a/java/jmp/Makefile +++ b/java/jmp/Makefile @@ -7,7 +7,7 @@ PORTNAME= jmp PORTVERSION= 0.51 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://www.khelekore.org/jmp/ \ http://www.klop.ws/~ronald/software-mirrors/ @@ -50,7 +50,7 @@ PLIST_FILES= lib/libjmp.la lib/libjmp.so lib/libjmp.so.0 \ .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --enable-noui .else -USE_XLIB= yes +USE_XORG= x11 LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 .endif diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile index 11be64b..75ea152 100644 --- a/java/kaffe/Makefile +++ b/java/kaffe/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaffe PORTVERSION= 1.1.7.r1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel #MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ MASTER_SITES= http://www.kaffe.org/~robilad/ @@ -29,14 +29,13 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ ONLY_FOR_ARCHS= i386 amd64 +USE_XORG= x11 ice xtst USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-iconv-prefix=${LOCALBASE} PREFIX= ${LOCALBASE}/kaffe NO_MTREE= yes diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile index 5e4676d..bd07c43 100644 --- a/java/sablevm-classpath/Makefile +++ b/java/sablevm-classpath/Makefile @@ -8,6 +8,7 @@ PORTNAME= sablevm-classpath PORTVERSION= 1.13 +PORTREVISION= 1 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sablevm @@ -22,6 +23,7 @@ OPTIONS= GTK2 "Enable Gtk+ AWT peer" ON \ CONFLICTS= classpath-* +USE_XORG= x11 ice xtst GNU_CONFIGURE= yes USE_GNOME= # empty USE_GMAKE= yes diff --git a/java/simplicity/Makefile b/java/simplicity/Makefile index b368102..4416836 100644 --- a/java/simplicity/Makefile +++ b/java/simplicity/Makefile @@ -7,7 +7,7 @@ PORTNAME= simplicity PORTVERSION= 1.2.6b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= # http://www.datarepresentations.com/products/simplicity/ DISTNAME= simpjava @@ -22,7 +22,6 @@ JDK13DIR?= ${LOCALBASE}/jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java RESTRICTED= "Restrictive license" -USE_XLIB= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/Simplicity diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile index 36cd748..14b76ff 100644 --- a/korean/baekmukfonts-bdf/Makefile +++ b/korean/baekmukfonts-bdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= baekmukfonts PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \ ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ @@ -21,10 +21,9 @@ EXTRACT_ONLY= baekmuk-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= cjh@freebsd.org COMMENT= Free Hangul fonts for X11(baekmuk) -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \ batang16 batang16b batang18 batang18b batang20 batang20b \ diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile index 5e3fdb5..b4eb583 100644 --- a/korean/eterm/Makefile +++ b/korean/eterm/Makefile @@ -7,7 +7,7 @@ PORTNAME= eterm PORTVERSION= 0.8.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= korean x11 MASTER_SITES= ftp://ftp.holywar.net/pub/FreeBSD/ \ ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanya USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 xext ice sm xt USE_GNOME= imlib USE_LDCONFIG= yes USE_PERL5_BUILD=yes diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile index c00c7ee..9c0f42e 100644 --- a/korean/gtkcomm/Makefile +++ b/korean/gtkcomm/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.kldp.net/gtkcomm/ MAINTAINER= cjh@kr.freebsd.org COMMENT= Serial controlling software, with gtk+ widget -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf USE_PERL5_BUILD=yes USE_GNOME= imlib diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile index c3550d1..0bc6d2b 100644 --- a/korean/hanIM/Makefile +++ b/korean/hanIM/Makefile @@ -14,10 +14,10 @@ MASTER_SITES= ftp://ftp.mizi.com/pub/hanIM/ MAINTAINER= cjh@FreeBSD.org COMMENT= Mizi Research's Korean X11 Input Method -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf USE_IMAKE= YES -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/hanIM post-install: diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile index e104c87..5ea04ee 100644 --- a/korean/hanterm-xf86/Makefile +++ b/korean/hanterm-xf86/Makefile @@ -7,7 +7,7 @@ PORTNAME= hanterm PORTVERSION= 2.0.5.173 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= korean x11 MASTER_SITES= http://kldp.net/frs/download.php/282/ PKGNAMESUFFIX= -xf @@ -16,11 +16,11 @@ DISTNAME= hanterm${PKGNAMESUFFIX}-2.0.5-173 MAINTAINER= cjh@FreeBSD.org COMMENT= X11R6-based xterm hacked for managing Korean languages -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf +USE_XORG= xaw xext x11 CONFLICTS= ko-hanterm-3.* USE_ICONV= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-boxchar --enable-ansi-color \ --enable-256-color --enable-chat --enable-now-chat diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile index 3ae2bd4..9247b4c 100644 --- a/korean/hanterm/Makefile +++ b/korean/hanterm/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://hanterm.org/download/ \ MAINTAINER= cjh@FreeBSD.org COMMENT= An xterm hacked for managing Korean languages -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts CONFLICTS= ko-hanterm-xf-2.* USE_IMAKE= yes diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile index 0f247a6..1d1363e 100644 --- a/korean/hanyangfonts/Makefile +++ b/korean/hanyangfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= hanyangfonts PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \ ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \ @@ -17,9 +17,9 @@ DISTNAME= hanyang-font-pcf MAINTAINER= cjh@FreeBSD.org COMMENT= Hanyang Hangul fonts for X11 -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index c3985ab..60935ed 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-hangul PORTVERSION= 12.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= korean textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -20,9 +20,9 @@ RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server ONLY_FOR_ARCHS= i386 +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -34,8 +34,8 @@ BUILDDIR= ${WRKSRC}/leif IGNORE= is supported on FreeBSD 5.3 and later only .endif -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile index be34d95..31c056d 100644 --- a/korean/johabfonts/Makefile +++ b/korean/johabfonts/Makefile @@ -15,8 +15,9 @@ DISTNAME= hanterm-font-${PORTVERSION} MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(johab) used in many hangul-related programs -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index e4c927c..7356c26 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaistfonts-ksc PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ DISTNAME= ${PKGNAME} @@ -17,10 +17,9 @@ DISTFILES= kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \ MAINTAINER= cjh@FreeBSD.org COMMENT= X11 KAIST font(ksc5601.1987-0 encoding) collection -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_GMAKE= yes NO_WRKSUBDIR= yes diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile index 89ee9b3..4ecaf57 100644 --- a/korean/mizifont/Makefile +++ b/korean/mizifont/Makefile @@ -7,7 +7,7 @@ PORTNAME= mizifonts PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= korean x11-fonts MASTER_SITES= ftp://ftp.mizi.co.kr/pub/hanIM/ DISTNAME= xfntmizi-1.1-2.noarch @@ -18,9 +18,10 @@ COMMENT= Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding) EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +RUN_DEPENDENS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes @@ -48,7 +49,7 @@ do-install: for i in ${WRKDIR}/*.gz; do \ ${INSTALL_DATA} $$i ${PREFIX}/lib/X11/fonts/local/; \ done - cd ${PREFIX}/lib/X11/fonts/local/ ; mkfontdir + cd ${PREFIX}/lib/X11/fonts/local/ ; ${LOCALBASE}/bin/mkfontdir post-install: @${CAT} ${PKGMESSAGE} diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile index 3da39c5..cbfa565 100644 --- a/korean/pinetreefonts/Makefile +++ b/korean/pinetreefonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= pinetreefonts PORTVERSION= 1.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= korean x11-fonts MASTER_SITES= ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \ ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \ @@ -18,10 +18,10 @@ DISTNAME= pinetree.precomposed-${PORTVERSION}-bdf MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding) -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +RUN_DEPENDENS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/pinetree.precomposed/bdf diff --git a/korean/uniksc/Makefile b/korean/uniksc/Makefile index a3b9fec..ff2d52c 100644 --- a/korean/uniksc/Makefile +++ b/korean/uniksc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ MAINTAINER= cjh@freebsd.org COMMENT= Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES .if ${MACHINE_ARCH:L} == "amd64" CFLAGS+= "-fPIC" diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile index 9829d7b..fc1f696 100644 --- a/korean/xpdf/Makefile +++ b/korean/xpdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpdf PORTVERSION= 3.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= korean MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ DISTNAME= xpdf-korean @@ -17,10 +17,9 @@ COMMENT= Korean xpdf font support RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf \ ${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \ - ${X11BASE}/lib/X11/fonts/TrueType/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf + ${LOCALBASE}/lib/X11/fonts/TrueType/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf NO_BUILD= yes -USE_X_PREFIX= yes SUB_FILES= dot.xpdfrc SUB_LIST= ADOBECMAPDIR=${ADOBECMAPDIR} diff --git a/korean/xpdf/files/dot.xpdfrc.in b/korean/xpdf/files/dot.xpdfrc.in index 87d1f4d..f8ceb13 100644 --- a/korean/xpdf/files/dot.xpdfrc.in +++ b/korean/xpdf/files/dot.xpdfrc.in @@ -4,13 +4,13 @@ cidToUnicode Adobe-Korea1 %%PREFIX%%/share/xpdf/korean/Adobe-Korea1.cidToUnicode unicodeMap ISO-2022-KR %%PREFIX%%/share/xpdf/korean/ISO-2022-KR.unicodeMap cMapDir Adobe-Korea1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% -displayNamedCIDFontTT Batang "%%X11BASE%%/lib/X11/fonts/TrueType/UnBatang.ttf" -displayNamedCIDFontTT Batang,Bold "%%X11BASE%%/lib/X11/fonts/TrueType/UnBatangBold.ttf" -displayNamedCIDFontTT Dotum "%%X11BASE%%/lib/X11/fonts/TrueType/UnDotum.ttf" -displayNamedCIDFontTT Dotum,Bold "%%X11BASE%%/lib/X11/fonts/TrueType/UnDotumBold.ttf" -displayNamedCIDFontTT Gulim "%%X11BASE%%/lib/X11/fonts/TrueType/UnGraphic.ttf" -displayNamedCIDFontTT Gulim,Bold "%%X11BASE%%/lib/X11/fonts/TrueType/UnGraphicBold.ttf" -displayNamedCIDFontTT Gungsuh "%%X11BASE%%/lib/X11/fonts/TrueType/UnGungseo.ttf" +displayNamedCIDFontTT Batang "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnBatang.ttf" +displayNamedCIDFontTT Batang,Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnBatangBold.ttf" +displayNamedCIDFontTT Dotum "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnDotum.ttf" +displayNamedCIDFontTT Dotum,Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnDotumBold.ttf" +displayNamedCIDFontTT Gulim "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGraphic.ttf" +displayNamedCIDFontTT Gulim,Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGraphicBold.ttf" +displayNamedCIDFontTT Gungsuh "%%LOCALBASE%%/lib/X11/fonts/TrueType/UnGungseo.ttf" psFont16 Adobe-Korea1 H Batang-UniKS-UCS2-H UCS-2 psFont16 Adobe-Korea1 V Batang-UniKS-UCS2-V UCS-2 diff --git a/lang/STk/Makefile b/lang/STk/Makefile index eaa43dc..88a647b 100644 --- a/lang/STk/Makefile +++ b/lang/STk/Makefile @@ -7,7 +7,7 @@ PORTNAME= STk PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_SUNSITE} \ ftp://kaolin.unice.fr/pub/STk/ @@ -16,8 +16,9 @@ MASTER_SITE_SUBDIR= devel/lang/lisp MAINTAINER= ports@FreeBSD.org COMMENT= A scheme interpreter with full access to the Tk graphical package -USE_XLIB= yes +USE_XORG= x11 ice sm xt GNU_CONFIGURE= yes +CFLAGS= -I${LOCALBASE}/include PLIST_SUB= STK_VERSION=${PORTVERSION} STK_ARCH=${STK_ARCH} diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile index e281d45..319ad36 100644 --- a/lang/Sather/Makefile +++ b/lang/Sather/Makefile @@ -31,7 +31,7 @@ INFO= sather sather-mode sather-tutorial SAT_CFLAGS= ${CFLAGS} -I. -I${BC_DIR}/include \ -I../System/Common \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 SAT_LIBS= -L${BC_DIR}/.libs -L${LOCALBASE}/lib -lgc -lm SAT_LIBDIR= ${PREFIX}/lib/sather @@ -59,8 +59,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -E \ -e "s,/usr/lib/sather,${SAT_LIBDIR}," \ - -e "s,/usr/X11R6,${X11BASE}," \ - -e "s,/usr/X11R6,${X11BASE}," \ + -e "s,/usr/X11R6,${LOCALBASE}," \ + -e "s,/usr/X11R6,${LOCALBASE}," \ ${WRKSRC}/Boot/sacomp.code/strings.c \ ${WRKSRC}/Doc/Installation.html \ ${WRKSRC}/Doc/man/man1/sabrowse.1 \ diff --git a/lang/caml-light/files/patch-ab b/lang/caml-light/files/patch-ab index 6b50684..338db1e 100644 --- a/lang/caml-light/files/patch-ab +++ b/lang/caml-light/files/patch-ab @@ -51,14 +51,14 @@ # (usually /usr/include; for SunOS with OpenLook, /usr/openwin/include) # Needed for the "libgraph" and "camltk" packages. -X11_INCLUDES=/usr/X11R6/include -+X11_INCLUDES=${X11BASE}/include ++X11_INCLUDES=${LOCALBASE}/include #X11_INCLUDES=/usr/include/X11 # The path to the directory containing the X11 libraries. # (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib) # Needed for the "libgraph" and "camltk" packages. -X11_LIB=/usr/X11R6/lib -+X11_LIB=${X11BASE}/lib ++X11_LIB=${LOCALBASE}/lib #X11_LIB=/usr/lib/X11 # Name of the target architecture. diff --git a/lang/caml-light/files/patch-contrib_libgraph_Makefile b/lang/caml-light/files/patch-contrib_libgraph_Makefile index dfd6501..705c006 100644 --- a/lang/caml-light/files/patch-contrib_libgraph_Makefile +++ b/lang/caml-light/files/patch-contrib_libgraph_Makefile @@ -10,8 +10,8 @@ -X11_INCLUDES=/usr/include -X11_LIB=/usr/lib -CPP=/lib/cpp -P -+X11_INCLUDES=${X11BASE} -+X11_LIB=${X11BASE}/lib ++X11_INCLUDES=${LOCALBASE} ++X11_LIB=${LOCALBASE}/lib +CPP=/usr/bin/cpp -P -BINDIR=/usr/local/bin diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 064253e..c1702b2 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= drscheme PORTVERSION= 370 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \ http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \ @@ -23,17 +23,15 @@ EXTRACT_ONLY= plt-${PORTVERSION}-src-unix.tgz MAINTAINER= ports@FreeBSD.org COMMENT= An interactive, integrated, graphical Scheme programming environment -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ - Xrender.1:${PORTSDIR}/x11/libXrender \ - cairo.2:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png +USE_XORG= xft x11 xrender GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --enable-xft --enable-gl \ --enable-xrender --enable-cairo --with-x --enable-pthread \ --enable-lt=${LIBTOOL} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ CPPFLAGS="${CPPFLAGS}" diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile index 601169a..0d34c25 100644 --- a/lang/dylan/Makefile +++ b/lang/dylan/Makefile @@ -43,7 +43,7 @@ PLIST_SUB+= DYLANARCH="x86-freebsd-elf-gcc" ONLY_FOR_ARCHS= i386 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%% USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index d68dfa6..fd2522a 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -34,7 +34,7 @@ OPTIONS= ASDF "Enable ASDF building facility" on \ MAN1= ecl.1 INFO= ecl ecldev -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/ecl .include <bsd.port.pre.mk> diff --git a/lang/elan/Makefile b/lang/elan/Makefile index 78a6f32..1f04ff2 100644 --- a/lang/elan/Makefile +++ b/lang/elan/Makefile @@ -23,7 +23,7 @@ MAN1= elancc.1 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 8513cfc..32e7e06 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -26,9 +26,8 @@ USE_LDCONFIG= yes MAN1= elk.1 -CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include \ - -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/lang/ezm3/scripts/configure b/lang/ezm3/scripts/configure index 34ff864..db975d9 100644 --- a/lang/ezm3/scripts/configure +++ b/lang/ezm3/scripts/configure @@ -4,6 +4,6 @@ cfg=${WRKSRC}/m3config/src/${TARGET} cp -p ${cfg} ${cfg}.bak || exit sed \ -e "/^INSTALL_ROOT = /s|\".*\"|\"${PREFIX}\"|" \ - -e "/^X11ROOT = /s|\".*\"|\"${X11BASE}/lib\"|" \ + -e "/^X11ROOT = /s|\".*\"|\"${LOCALBASE}/lib\"|" \ ${cfg} > ${cfg}.tmp || exit mv ${cfg}.tmp ${cfg} diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile index 43aaa13..68f6be0 100644 --- a/lang/ferite/Makefile +++ b/lang/ferite/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH} MAN1= builder.1 ferite.1 diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 3f377d8..576988f 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -8,8 +8,7 @@ PORTNAME= gambas PORTVERSION= 1.0.19 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= thierry@FreeBSD.org COMMENT= Gambas Almost Means BASic @@ -30,7 +29,7 @@ CONFIGURE_ARGS= --with-conv-includes=${LOCALBASE}/include \ --with-conv-libraries=${LOCALBASE}/lib \ --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib \ - --with-moc=${X11BASE}/bin + --with-moc=${LOCALBASE}/bin CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index b701480..5898326 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ARGS= --disable-nls \ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} EXTRA_SHLIB= libgcc_s .else diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile index 2ed7e05..9f3e6bf 100644 --- a/lang/gcl/Makefile +++ b/lang/gcl/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \ --enable-tkconfig=${LOCALBASE}/lib/tk8.4 \ --enable-tclconfig=${LOCALBASE}/lib/tcl8.4 \ --with-x \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --disable-dlopen \ --disable-dynsysbfd \ --disable-statsysbfd \ diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile index fe41b11..9f2b1db 100644 --- a/lang/gnat/Makefile +++ b/lang/gnat/Makefile @@ -113,7 +113,7 @@ CONFIGURE_ENV= ${COMPILE_DATA} PATH=${have_boot} # Shared library handling .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} LIBRARY_VERSION= 2006 PLIST_SUB+= SHAREDLIB="" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 972f8ee..81c566b 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -44,7 +44,7 @@ post-extract: post-patch: @cd ${WRKSRC} ; \ ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES} - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/libguile/load.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libguile/load.c .include <bsd.port.post.mk> diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index b5782c0..8d582cb 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -36,8 +36,7 @@ BROKEN= dumps core during build on ${ARCH} .endif .if !defined(WITHOUT_X11) -USE_GL= yes -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut PLIST_SUB+= X11="" .else BROKEN= not supported at the moment @@ -55,7 +54,7 @@ post-patch: @${REINPLACE_CMD} -e '/^install :: install_notes/d ; \ /^install :: install_guide/d' \ ${WRKSRC}/src/MkInstal.in - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/packages/OpenGL/configure \ ${WRKSRC}/packages/GLUT/configure \ ${WRKSRC}/packages/X11/configure \ diff --git a/lang/icon/Makefile b/lang/icon/Makefile index 66e649b..4084991 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -7,7 +7,7 @@ PORTNAME= icon PORTVERSION= 9.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.cs.arizona.edu/icon/ftp/packages/unix/ DISTNAME= ${PORTNAME}.v${PORTVERSION:S/.//g}src @@ -30,8 +30,8 @@ BINXS= colrbook colrpick fontpick palette vib wevents xgamma CONFIG_CMD= Configure PLIST_SUB= WITHOUT_X11="@comment " .else -USE_XLIB= yes -CFLAGS+= -I${X11BASE}/include +USE_XORG= x11 xpm +CFLAGS+= -I${LOCALBASE}/include CONFIG_CMD= X-Configure PLIST_SUB= WITHOUT_X11= .endif @@ -39,9 +39,9 @@ PLIST_SUB= WITHOUT_X11= post-patch: @${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \ s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|-lpthread|${PTHREAD_LIBS}| ; \ - s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \ + s|^XLIBS.*|XLIBS=-L${LOCALBASE}/lib -lX11|g" \ ${WRKSRC}/config/${ARCH_NAME}/Makedefs @${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin @${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \ diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile index 56aeb6a..087436a 100644 --- a/lang/lafontaine/Makefile +++ b/lang/lafontaine/Makefile @@ -8,7 +8,7 @@ PORTNAME= lafontaine PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.nongnu.org/lafontaine/archives/ DISTNAME= ${PORTNAME}_0.4-1 @@ -18,7 +18,6 @@ COMMENT= Graphical logo interpreter WRKSRC= ${WRKDIR}/${PORTNAME}-0.4 -USE_X_PREFIX= yes USE_GNOME= gnomehack gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/lang/linux-f10-libg2c/Makefile b/lang/linux-f10-libg2c/Makefile index 15307cc..f1034d8 100644 --- a/lang/linux-f10-libg2c/Makefile +++ b/lang/linux-f10-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-f8-libg2c/Makefile b/lang/linux-f8-libg2c/Makefile index 15307cc..f1034d8 100644 --- a/lang/linux-f8-libg2c/Makefile +++ b/lang/linux-f8-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-libg2c/Makefile b/lang/linux-libg2c/Makefile index 15307cc..f1034d8 100644 --- a/lang/linux-libg2c/Makefile +++ b/lang/linux-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-libperl5.8/Makefile b/lang/linux-libperl5.8/Makefile index 55dab73..adcc15b 100644 --- a/lang/linux-libperl5.8/Makefile +++ b/lang/linux-libperl5.8/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library for embedding the perl interpreter (linux version) USE_LINUX_RPM= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm diff --git a/lang/logo/Makefile b/lang/logo/Makefile index 1873df8..cf693a5 100644 --- a/lang/logo/Makefile +++ b/lang/logo/Makefile @@ -7,7 +7,7 @@ PORTNAME= ucblogo PORTVERSION= 5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ DISTNAME= ${PORTNAME} @@ -26,7 +26,7 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \ .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 ice sm USE_AUTOTOOLS= autoconf:261 MAKEFILE= makefile HAS_CONFIGURE= yes diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index 5dbc582..5fd4118 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -8,7 +8,7 @@ PORTNAME= mdk PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang gnome MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gnu/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} @@ -23,7 +23,6 @@ COMMENT= A set of utilities for developing programs using MIX and MIXAL LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \ readline.5:${PORTSDIR}/devel/readline -USE_X_PREFIX= yes USE_GNOME= gnometarget libglade2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile index fab567a..3049836 100644 --- a/lang/metaocaml/Makefile +++ b/lang/metaocaml/Makefile @@ -76,7 +76,7 @@ MANPREFIX= ${PREFIX}/share/metaocaml .if defined(WITH_X11) USE_XORG= x11 -CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib +CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 0bd0012..cec0db2 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -48,7 +48,7 @@ post-patch: s%^((MPD(CMD|LIB)|MAN[135]) =) /usr/local%\1 ${PREFIX}%" \ ${WRKSRC}/Configuration .if !defined(WITHOUT_X11) - @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${X11BASE}/include%' \ + @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${LOCALBASE}/include%' \ ${WRKSRC}/Configuration .else @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1%' ${WRKSRC}/Configuration diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index a170e7d..2cc85c6 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -7,7 +7,7 @@ PORTNAME= ocaml PORTVERSION= 3.10.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ @@ -54,8 +54,8 @@ CONFIGURE_ARGS+=-no-pthread .if !defined(WITHOUT_X11) PLIST_SUB+= X11="" -USE_XLIB= yes -CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib +USE_XORG= x11 +CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib .else PLIST_SUB+= X11="@comment " WITHOUT_TK= yes diff --git a/lang/ocs/Makefile b/lang/ocs/Makefile index 4f38e37..bd7c62a 100644 --- a/lang/ocs/Makefile +++ b/lang/ocs/Makefile @@ -42,9 +42,9 @@ CONFIGURE_ARGS= --prefix="${WRKDIR}" \ --disable-absolute-pathes \ --disable-locallinks \ --with-tcl-lib="-L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}" \ - --with-tcl-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${X11BASE}/include" \ + --with-tcl-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \ --with-tk-lib="-ltk${TK_VER:S/.//}" \ - --with-tk-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${X11BASE}/include" + --with-tk-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" MAN1= ocs.1 oc.1 genmake.1 diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile index 1996ce8..0636eed 100644 --- a/lang/ohugs/Makefile +++ b/lang/ohugs/Makefile @@ -24,7 +24,7 @@ BUILD_WRKSRC= ${WRKSRC}/src USE_BISON= build LDFLAGS+= -lm -lreadline -ltermcap .if !defined(WITHOUT_X11) -CFLAGS+= -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -ltk84 -ltcl84 -ltix8184 .endif MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile index 913807f..d4c8774 100644 --- a/lang/onyx/Makefile +++ b/lang/onyx/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libedit-prefix=${LOCALBASE} \ --with-pcre-prefix=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= onyx.1 onyx_config.1 diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile index ad7eb9e..ae3e794 100644 --- a/lang/otcl/Makefile +++ b/lang/otcl/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.13 PORTREVISION= 3 DISTVERSIONPREFIX= src- CATEGORIES= lang tcl tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= otcl-tclcl +MASTER_SITES= SF/otcl-tclcl MAINTAINER= mm@FreeBSD.org COMMENT= MIT Object Tcl @@ -35,11 +34,10 @@ PORTDOCS= ${DOCS:S/doc\///} .include <bsd.port.pre.mk> CFLAGS+= -DHAVE_UNISTD_H -CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e's|X11/Intrinsic.h|X11/Xlib.h|g' \ ${WRKSRC}/configure ${WRKSRC}/conf/configure.in.x11 @${REINPLACE_CMD} -e 's|../lib/tcl$$TCL_HI_VERS|${TCL_LIBDIR}|g' \ diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index 47db204..7edb16b 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -108,7 +108,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 36d0511..b183672 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -96,7 +96,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 36d0511..b183672 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -96,7 +96,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/pm3-base/scripts/configure b/lang/pm3-base/scripts/configure index 34ff864..db975d9 100644 --- a/lang/pm3-base/scripts/configure +++ b/lang/pm3-base/scripts/configure @@ -4,6 +4,6 @@ cfg=${WRKSRC}/m3config/src/${TARGET} cp -p ${cfg} ${cfg}.bak || exit sed \ -e "/^INSTALL_ROOT = /s|\".*\"|\"${PREFIX}\"|" \ - -e "/^X11ROOT = /s|\".*\"|\"${X11BASE}/lib\"|" \ + -e "/^X11ROOT = /s|\".*\"|\"${LOCALBASE}/lib\"|" \ ${cfg} > ${cfg}.tmp || exit mv ${cfg}.tmp ${cfg} diff --git a/lang/ptoc/files/patch-makefile.bsd b/lang/ptoc/files/patch-makefile.bsd index 3ec01eae..aa2d6a5 100644 --- a/lang/ptoc/files/patch-makefile.bsd +++ b/lang/ptoc/files/patch-makefile.bsd @@ -5,7 +5,7 @@ libXbgi.a: - (cd Xbgi; make) -+ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(X11BASE)") ++ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(LOCALBASE)") all : $(BINS) $(LIBS) diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ae0a12b..5dfd191 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -22,7 +22,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -111,7 +111,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\(prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${WRKSRC}/Lib/site.py .for ver in 6 7 8 ${MKDIR} ${WRKSRC}/Lib/plat-freebsd${ver} diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 7103949..a659af4 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -127,7 +127,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${WRKSRC}/Lib/site.py .if defined(WITH_FPECTL) && ${ARCH} == i386 ${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 1f99726..3e19ec1 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile index bdfbbff..eabdd32 100644 --- a/lang/rexx-imc/Makefile +++ b/lang/rexx-imc/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS= o all # configures and builds in one step NO_BUILD= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= rexx.1 rxstack.1 rxque.1 diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile index 64d4c9f..343c939 100644 --- a/lang/rexx-regina/Makefile +++ b/lang/rexx-regina/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/Regina-${PORTVERSION} USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= regina.1 diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile index 909cc2b..7ad3dee 100644 --- a/lang/schemetoc/Makefile +++ b/lang/schemetoc/Makefile @@ -18,7 +18,7 @@ COMMENT= Scheme-to-C, a compiler and interpreter for compiling scheme into C USE_GCC= 2.95 USE_XORG= x11 xi -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_WRKSUBDIR= yes MAN1= scc.1 sci.1 @@ -34,6 +34,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/scsc/*.sc + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scsc/*.sc .include <bsd.port.mk> diff --git a/lang/schemetoc/files/makefile-head b/lang/schemetoc/files/makefile-head index 14944c6..ba600cf 100644 --- a/lang/schemetoc/files/makefile-head +++ b/lang/schemetoc/files/makefile-head @@ -24,7 +24,7 @@ CPP = cpp # X library -XLIB = -L${X11BASE}/lib -lX11 +XLIB = -L${LOCALBASE}/lib -lX11 XLIBCFLAGS = PICFLAGS = -fpic -DPIC diff --git a/lang/schemetoc/files/patch-ah b/lang/schemetoc/files/patch-ah index b357978..87a28e4 100644 --- a/lang/schemetoc/files/patch-ah +++ b/lang/schemetoc/files/patch-ah @@ -105,12 +105,12 @@ + (if (member "-c" c-flags) + '() + (if (member "xlib" with-modules) -+ (list "-lm" sc-library scxl-library "-L%%X11BASE%%/lib -lX11") ++ (list "-lm" sc-library scxl-library "-L%%LOCALBASE%%/lib -lX11") + (list "-lm" sc-library)))) + (if (member "-c" c-flags) + '() + (if (member "xlib" with-modules) -+ (list "-L%%X11BASE%%/lib -lm -lsc -lscxl -lX11") ++ (list "-L%%LOCALBASE%%/lib -lm -lsc -lscxl -lX11") + (list "-lm -lsc")))))))))) (reset)) (catch-error diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 806faf9..3a67ecf 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -49,7 +49,7 @@ post-patch: @${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/build.scm + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm post-build: @cd ${WRKSRC} \ diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm index a7a9a3f..8e2ea75 100644 --- a/lang/scm/files/patch-build.scm +++ b/lang/scm/files/patch-build.scm @@ -31,7 +31,7 @@ (cond ((equal? (car fnames) "edline") "-lreadline") - ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") -+ ((equal? (car fnames) "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4") ++ ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4") (else "")) "-o" (string-append (car fnames) ".so") (map (lambda (fname) (string-append fname ".o")) fnames)) diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile index a549d67..f281143 100644 --- a/lang/scriba/Makefile +++ b/lang/scriba/Makefile @@ -99,7 +99,6 @@ post-patch: ${REINPLACE_CMD} \ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - -e 's,%%X11BASE%%,${X11BASE},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%DATADIR%%,${DATADIR},g' \ -e 's,%%CC%%,${CC},g' \ diff --git a/lang/scriba/files/patch-make_gcc.jim b/lang/scriba/files/patch-make_gcc.jim index 301f4e1..25037c4 100644 --- a/lang/scriba/files/patch-make_gcc.jim +++ b/lang/scriba/files/patch-make_gcc.jim @@ -5,7 +5,7 @@ -L where the libraries are } -{#define cc=gcc -w} -+{#define cc=cc -w %%CFLAGS%% -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include -L%%X11BASE%%/lib -I%%X11BASE%%/include -I%%LOCALBASE%%/include/libxml2 -L%%LOCALBASE%%/lib/mysql } ++{#define cc=cc -w %%CFLAGS%% -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/libxml2 -L%%LOCALBASE%%/lib/mysql } {#define CcOptOutput/X=-o X} {#define CcOptInput/X=X} {#define CcOptCompile=-c} @@ -14,7 +14,7 @@ {#define LibOptInput/X=X} -{#define ld=ld -shared -Bstatic} -+{#define ld=ld %%LDFLAGS%% -shared -Bstatic -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib/mysql } ++{#define ld=ld %%LDFLAGS%% -shared -Bstatic -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib/mysql } {#define LdOptOutput/X=-o X} {#define LdOptInput/X=X} diff --git a/lang/siod/Makefile b/lang/siod/Makefile index ffb1aca..0162ce0 100644 --- a/lang/siod/Makefile +++ b/lang/siod/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A small footprint implementation of the Scheme programming language -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_WRKSUBDIR= yes MAKEFILE= makefile diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile index 21693c8..5aac2af 100644 --- a/lang/squeak-dev/Makefile +++ b/lang/squeak-dev/Makefile @@ -85,8 +85,8 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../platforms/unix/config/configure CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ --without-quartz \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" # don't pass "-s" to install to avoid trying to strip a shell script CONFIGURE_ENV= @@ -163,7 +163,6 @@ PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\ post-patch: @${REINPLACE_CMD} \ -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakrun.in \ ${WRKSRC}/platforms/unix/npsqueak/Makefile diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile index f869204..d5def76 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile @@ -5,7 +5,7 @@ ############ Customize flags here ####################### -INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%X11BASE%%/include ++INC = -I./include -I%%LOCALBASE%%/include CC = gcc CFLAGS = $(INC) -O2 -fPIC -Wall LD = gcc @@ -14,7 +14,7 @@ npsqueak.so : npsqueak.o npunix.o - $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%X11BASE%%/lib -lXt -lX11 ++ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 npsqueak.o: npsqueak.c ../config.h $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in index a4ba55a..a7bd917 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in @@ -7,7 +7,7 @@ -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -BROWSER_DIRS="/usr/local/lib /usr/lib /opt" +BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" ++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" ACTION=register diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 21693c8..5aac2af 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -85,8 +85,8 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../platforms/unix/config/configure CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ --without-quartz \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" # don't pass "-s" to install to avoid trying to strip a shell script CONFIGURE_ENV= @@ -163,7 +163,6 @@ PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\ post-patch: @${REINPLACE_CMD} \ -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakrun.in \ ${WRKSRC}/platforms/unix/npsqueak/Makefile diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile index f869204..d5def76 100644 --- a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile +++ b/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile @@ -5,7 +5,7 @@ ############ Customize flags here ####################### -INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%X11BASE%%/include ++INC = -I./include -I%%LOCALBASE%%/include CC = gcc CFLAGS = $(INC) -O2 -fPIC -Wall LD = gcc @@ -14,7 +14,7 @@ npsqueak.so : npsqueak.o npunix.o - $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%X11BASE%%/lib -lXt -lX11 ++ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 npsqueak.o: npsqueak.c ../config.h $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in index a4ba55a..a7bd917 100644 --- a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in +++ b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in @@ -7,7 +7,7 @@ -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -BROWSER_DIRS="/usr/local/lib /usr/lib /opt" +BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" ++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" ACTION=register diff --git a/lang/sr/Makefile b/lang/sr/Makefile index edc843d..f4cd2d4 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -20,7 +20,7 @@ COMMENT= A parallel language "Synchronization Resources" HAS_CONFIGURE= yes CONFIGURE_ARGS= prefix -CONFIGURE_ENV= PREFIX="${PREFIX}" X11BASE="${X11BASE}" +CONFIGURE_ENV= PREFIX="${PREFIX}" NO_WRKSUBDIR= yes MAN1 = sr.1 srl.1 srm.1 srprof.1 srtex.1 srlatex.1 srgrind.1 \ ccr2sr.1 m2sr.1 csp2sr.1 diff --git a/lang/sr/files/patch-aa b/lang/sr/files/patch-aa index 01b67d7..b6c7a25 100644 --- a/lang/sr/files/patch-aa +++ b/lang/sr/files/patch-aa @@ -4,7 +4,7 @@ XINCL=/usr/include if [ -d /usr/X11/include/X11 ]; then XINCL=/usr/X11/include; fi if [ -d /usr/openwin/include/X11 ]; then XINCL=/usr/openwin/include; fi -+if [ -d ${X11BASE}/include/X11 ]; then XINCL=${X11BASE}/include; fi ++if [ -d ${LOCALBASE}/include/X11 ]; then XINCL=${LOCALBASE}/include; fi if [ ! -d $XINCL/X11 ]; then XINCL=; fi XTANGO=/home/sr/xtango/include @@ -14,15 +14,15 @@ +# on FreeBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "FreeBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi +# on OpenBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "OpenBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi +# on NetBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "NetBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi + # if this looks like an Arizona system, use our srmap file diff --git a/lang/xsb/Makefile b/lang/xsb/Makefile index a0fcba5..de01107 100644 --- a/lang/xsb/Makefile +++ b/lang/xsb/Makefile @@ -9,14 +9,13 @@ PORTNAME= XSB PORTVERSION= 2.6 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME:L} +MASTER_SITES= SF/${PORTNAME:L} DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g} MAINTAINER= c.rued@xsb.com COMMENT= A tabled Logic Programming and Deductive Database system -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend WRKSRC= ${WRKDIR}/XSB/build USE_GMAKE= yes diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index 67a3e5b..48f48cf 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -7,14 +7,14 @@ PORTNAME= yabasic PORTVERSION= 2.763 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.yabasic.de/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Yet another Basic for Unix and Windows -USE_XLIB= yes +USE_XORG= x11 ice sm xt USE_BISON= build GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile index 5c94da6..b409a2d 100644 --- a/mail/asmail/Makefile +++ b/mail/asmail/Makefile @@ -7,22 +7,21 @@ PORTNAME= asmail PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail afterstep MASTER_SITES= http://www.tigr.net/afterstep/download/asmail/ MAINTAINER= ports@FreeBSD.org COMMENT= Biff-type program, designed to match AfterStep -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shaping \ --with-xpm \ - --with-xpm-includes=${X11BASE}/include \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=${LOCALBASE}/include \ + --with-xpm-library=${LOCALBASE}/lib MAN1= asmail.1x MAN5= asmailrc.5x diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 1208a0d..d7c0442 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -8,7 +8,7 @@ PORTNAME= balsa PORTVERSION= 2.3.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ DISTNAME= balsa-${PORTVERSION} @@ -23,7 +23,6 @@ LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \ USE_GMAKE= yes USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PERL5= yes @@ -32,7 +31,6 @@ USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \ libgnomeprintui USE_GETTEXT= yes USE_AUTOTOOLS= libltdl:15 -USE_GCC= 3.4+ GNU_CONFIGURE= yes USE_ICONV= yes CONFIGURE_ARGS= --enable-threads \ diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index a1dadf3..d3a0c44 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -51,7 +51,7 @@ CONFIGURE_ARGS= \ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= ALL "Enable all options except GNUTLS." off \ diff --git a/mail/coolmail/files/patch-aa b/mail/coolmail/files/patch-aa index 62e88e6..4600d9e 100644 --- a/mail/coolmail/files/patch-aa +++ b/mail/coolmail/files/patch-aa @@ -9,8 +9,8 @@ LINK = $(CC) -INCLUDES = -I/usr/X11R5/include -LIB_DIRS = -L/usr/X11R5/lib -+INCLUDES = -I$(X11BASE)/include -+LIB_DIRS = -L$(X11BASE)/lib ++INCLUDES = -I$(LOCALBASE)/include ++LIB_DIRS = -L$(LOCALBASE)/lib BINDIR = /usr/local/bin MANDIR = /usr/local/man/man1 @@ -32,7 +32,7 @@ LIBS = $(LIB_DIRS) -lXt -lX11 -lm -lXext -COPTS = $(CFLAGS) $(AUDIO) -+LIBS += -Wl,-rpath,$(X11BASE)/lib ++LIBS += -Wl,-rpath,$(LOCALBASE)/lib +COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR) all: coolmail diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile index 35ee86e..e0b534a 100644 --- a/mail/dsbl-testers/Makefile +++ b/mail/dsbl-testers/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \ ${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 3c0301d..bd365af 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -97,7 +97,7 @@ USE_AUTOTOOLS= libtool:15 .ifdef(SNAP_DATE) USE_AUTOTOOLS+= autoconf:261:env automake:19 .endif -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes #CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile index 318348e..d30b496 100644 --- a/mail/enigmail-thunderbird/Makefile +++ b/mail/enigmail-thunderbird/Makefile @@ -7,6 +7,7 @@ PORTNAME= enigmail PORTVERSION= 0.95.6 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= http://www.mozilla-enigmail.org/download/source/ PKGNAMEPREFIX?= thunderbird- @@ -19,8 +20,7 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ nspr4:${PORTSDIR}/devel/nspr \ - nss3:${PORTSDIR}/security/nss \ - Xft.2:${PORTSDIR}/x11-fonts/libXft + nss3:${PORTSDIR}/security/nss RUN_DEPENDS= ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \ gpg:${PORTSDIR}/security/gnupg @@ -34,11 +34,11 @@ GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla WRKSRC= ${WRKDIR}/mozilla USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gtk20 libidl desktopfileutils +USE_XORG= xft xt x11 HAS_CONFIGURE= yes CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include XPI_FILE= ${DISTNAME}-${GECKO}-freebsd-${ARCH}.xpi PLIST_FILES= %%DATADIR%%/${XPI_FILE} diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index f5bb2fb..389e133 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-exchange PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +22,6 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_BDB= 41 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index c566a94..39c4ad5 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -8,7 +8,7 @@ PORTNAME= evolution PORTVERSION= 2.22.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,7 +24,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ desktopfileutils gnomedocutils ltasneededhack USE_AUTOTOOLS= libtool:15 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index afa787d..bee87b4 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -47,7 +47,7 @@ WITH_EXIMON= yes .endif .if defined(WITH_EXIMON) -USE_XLIB= yes +USE_XORG= x11 xaw xt .endif USE_BZIP2= yes diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist index 3ed3f6a..77b174b 100644 --- a/mail/faces/pkg-plist +++ b/mail/faces/pkg-plist @@ -9,5 +9,4 @@ include/compface.h lib/libcompface.a lib/libcompface.so lib/libcompface.so.1 -%%X11%%@cwd %%X11BASE%% %%X11%%lib/X11/app-defaults/Faces diff --git a/mail/firemime/Makefile b/mail/firemime/Makefile index b8ea912..08d8d04 100644 --- a/mail/firemime/Makefile +++ b/mail/firemime/Makefile @@ -17,7 +17,7 @@ COMMENT= Callback-based interface for parsing MIME-encoded messages USE_BZIP2= yes HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= mimedump.1 diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile index 7b0493f..1ea6f98 100644 --- a/mail/gbuffy/Makefile +++ b/mail/gbuffy/Makefile @@ -7,7 +7,7 @@ PORTNAME= gbuffy PORTVERSION= 0.2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}/ @@ -18,7 +18,6 @@ LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ compface.1:${PORTSDIR}/mail/faces PLIST_FILES= bin/gbuffy -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile index c01b779..06e067f 100644 --- a/mail/gkrellmmailwatch/Makefile +++ b/mail/gkrellmmailwatch/Makefile @@ -15,7 +15,7 @@ DISTNAME= mailwatch-${PORTVERSION} MAINTAINER= treif@mayn.de COMMENT= GKrellM mailwatch plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/mailwatch.so diff --git a/mail/gkrellmmailwatch/files/patch-aa b/mail/gkrellmmailwatch/files/patch-aa index af8a360..be4faf0 100644 --- a/mail/gkrellmmailwatch/files/patch-aa +++ b/mail/gkrellmmailwatch/files/patch-aa @@ -8,7 +8,7 @@ $FreeBSD$ GTK_LIB = `$(GTK_CONFIG) --libs` -GKRELLM_INCLUDE= -I/usr/local/include -+GKRELLM_INCLUDE= -I${X11BASE}/include/gkrellm ++GKRELLM_INCLUDE= -I${LOCALBASE}/include/gkrellm IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk` IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk` diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile index b9bb980..ff5cea0 100644 --- a/mail/gkrellmmailwatch2/Makefile +++ b/mail/gkrellmmailwatch2/Makefile @@ -18,13 +18,13 @@ COMMENT= GKrellM mailwatch plugin LATEST_LINK= gkrellmmailwatch2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/gkrellm-mailwatch USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins CC="${CC}" diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile index f5ba424..0b1c76c 100644 --- a/mail/glbiff/Makefile +++ b/mail/glbiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= glbiff PORTVERSION= 0.3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.dgp.utoronto.ca/~mac/code/projects/ \ http://freebsd.unixfreunde.de/sources/ @@ -18,7 +18,6 @@ COMMENT= Xbiff-like program for X Window System with nice 3D output LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut -USE_X_PREFIX= yes GNU_CONFIGURE= yes CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index ecb15a4..d437903 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmime PORTVERSION= 1.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://spruce.sourceforge.net/gmime/sources/v1.0/ @@ -16,7 +16,6 @@ COMMENT= Library (written in C) for parsing and creating messages using MIME CONFLICTS= gmime-2.1.* USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= YES USE_GMAKE= YES USE_GNOME= glib12 USE_ICONV= yes diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile index 45ba22d..b8dae15 100644 --- a/mail/hbiff/Makefile +++ b/mail/hbiff/Makefile @@ -8,7 +8,7 @@ PORTNAME= hbiff PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \ ${MASTER_SITE_LOCAL} @@ -17,11 +17,11 @@ MASTER_SITE_SUBDIR= obrien MAINTAINER= obrien@FreeBSD.org COMMENT= A replacement for xbiff that handles popup window with mail headers -USE_XLIB= yes +USE_XORG= x11 MAN1= hbiff.1 do-build: - cd ${WRKSRC} ; cc -I${X11BASE}/include hbiff.c -L${X11BASE}/lib -lX11 + cd ${WRKSRC} ; cc -I${LOCALBASE}/include hbiff.c -L${LOCALBASE}/lib -lX11 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/bin/hbiff diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile index 40d9cff..68be103 100644 --- a/mail/kiltdown/Makefile +++ b/mail/kiltdown/Makefile @@ -7,10 +7,9 @@ PORTNAME= kiltdown PORTVERSION= 0.8.045 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= kiltdown +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Kiltdown is an UI independant Email Client for UNIX @@ -18,13 +17,13 @@ COMMENT= Kiltdown is an UI independant Email Client for UNIX LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 PLIST_FILES= bin/kiltdown -USE_X_PREFIX= yes + USE_QT_VER= 3 USE_GMAKE= yes MY_CONFIGURE_ARGS= -release -MY_CONFIGURE_ARGS+= -qtinc ${X11BASE}/include -qtlib ${X11BASE}/lib +MY_CONFIGURE_ARGS+= -qtinc ${LOCALBASE}/include -qtlib ${LOCALBASE}/lib MY_CONFIGURE_ARGS+= -dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib -BUILD_ENV+= PATH=${PATH}:${X11BASE}/bin +BUILD_ENV+= PATH=${PATH}:${LOCALBASE}/bin .include <bsd.port.pre.mk> diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile index 617984a..2c624fb 100644 --- a/mail/lbdb/Makefile +++ b/mail/lbdb/Makefile @@ -28,7 +28,7 @@ WITH_GPG= yes .if exists (${LOCALBASE}/bin/abook) WITH_ABOOK= yes .endif -.if exists (${X11BASE}/bin/evolution) +.if exists (${LOCALBASE}/bin/evolution) WITH_EVOLUTION= yes .endif .if exists (/usr/bin/getent) diff --git a/mail/libdomainkeys/Makefile b/mail/libdomainkeys/Makefile index 67c72db..70262f8 100644 --- a/mail/libdomainkeys/Makefile +++ b/mail/libdomainkeys/Makefile @@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= DomainKeys library MAKE_ENV= PREFIX=${PREFIX} OPENSSLBASE="${OPENSSLBASE}" -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES SHLIB_MAJOR= 3 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index dc412b5..12afb7f 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index 915e96c..6f48d93 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_ICONV= yes USE_GETTEXT= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile index 4a83e41..27d86ed 100644 --- a/mail/libspf/Makefile +++ b/mail/libspf/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PORTDOCS= * diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile index 2da7d5d..9c8e813 100644 --- a/mail/libsrs_alt/Makefile +++ b/mail/libsrs_alt/Makefile @@ -15,7 +15,7 @@ COMMENT= Sender Rewriting Scheme C Implementation USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_MAJOR= 1 GNU_CONFIGURE= yes diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile index c5e9424..cc5feaf 100644 --- a/mail/lightning/Makefile +++ b/mail/lightning/Makefile @@ -7,7 +7,7 @@ PORTNAME= lightning PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}/source diff --git a/mail/mavbiff/files/patch-Makefile b/mail/mavbiff/files/patch-Makefile index fe6bc3b..89c8546 100644 --- a/mail/mavbiff/files/patch-Makefile +++ b/mail/mavbiff/files/patch-Makefile @@ -5,7 +5,7 @@ mavbiff: mavbiff.o mavraise.o - gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L/usr/X11R6/lib -+ gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L${X11BASE}/lib ++ gcc -o mavbiff -Wall mavbiff.o mavraise.o ${GTK_L} -L${LOCALBASE}/lib .c.o: $(CC) $(OPT_C) $(GTK_C) -o $@ $< diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile index d996da2..fb3c17b 100644 --- a/mail/mboxcheck-applet/Makefile +++ b/mail/mboxcheck-applet/Makefile @@ -6,7 +6,7 @@ PORTNAME= mboxcheck-applet PORTVERSION= 0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= http://perso.orange.fr/seb128/fichiers/ @@ -15,7 +15,6 @@ COMMENT= Mailbox checking applet for GNOME 2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 -USE_XLIB= yes USE_PYTHON= yes NO_BUILD= yes diff --git a/mail/ml/files/patch-ab b/mail/ml/files/patch-ab index 5ac9eca..21f8d4f 100644 --- a/mail/ml/files/patch-ab +++ b/mail/ml/files/patch-ab @@ -5,7 +5,7 @@ XCOMM dir, the parent of X11, and the parent of the Motif (Xm) include dir -EXTRA_INCLUDES = -I../Xm -I/usr/openwin/include -I$(INCROOT) -I./ -I../ -+EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${X11BASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I.. ++EXTRA_INCLUDES = -I/usr/dt/include -DDEFAULT_LIBDIR="\"${LOCALBASE}/lib/X11/ml\"" -I$(INCROOT) -I. -I.. XCOMM `Compile time defines: @@ -29,7 +29,7 @@ -OTHERLIBS=-lgen -ML_LIBDIR=/usr/local/lib/ml +OTHERLIBS=-lcrypt -+ML_LIBDIR=${X11BASE}/lib/X11/ml ++ML_LIBDIR=${LOCALBASE}/lib/X11/ml HELP_FILES=`find ../lib -type f -print` XCOMM Default font sizes. Linux folks will want FONTSIZE=14 (or diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile index ab752be..3761471 100644 --- a/mail/mmc/Makefile +++ b/mail/mmc/Makefile @@ -7,17 +7,15 @@ PORTNAME= mmc PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A tiny mail client for Gnome Desktop WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//} -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile index 58317c9..3908c4b 100644 --- a/mail/moztraybiff/Makefile +++ b/mail/moztraybiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= moztraybiff PORTVERSION= 1.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_MOZDEV} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,7 +26,6 @@ BROKEN= ${PORTNAME} needs the Thunderbird port in order to build TBVER!= cd ../thunderbird && ${MAKE} -V PORTVERSION .endif -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= libgnome MAKE_ARGS+= MOZILLA_PLATFORM=tbird TBVER=${TBVER} MOZ_TRUNK=0 diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile index f5b3ef1..42bf3b7 100644 --- a/mail/pmail/Makefile +++ b/mail/pmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= pmail PORTVERSION= 0.5.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail python gnome MASTER_SITES= # previous mastersites disappeared in 2001 and 2002 @@ -17,7 +17,6 @@ COMMENT= A GNOME/python email client BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome -USE_X_PREFIX= yes USE_GMAKE= yes USE_PYTHON= yes USE_GNOME= yes diff --git a/mail/popd/Makefile b/mail/popd/Makefile index 21f090c..569997e 100644 --- a/mail/popd/Makefile +++ b/mail/popd/Makefile @@ -17,7 +17,7 @@ COMMENT= Very fast, highly configurable POP3 server (fully RFC1939 compliant) MAN5= popd.conf.5 MAN8= popd.8 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MANCOMPRESSED= maybe .if defined(NOPROFILE) PLIST_SUB= NOPROFILE="@comment " diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile index 8a0043b..310920c 100644 --- a/mail/postilion/Makefile +++ b/mail/postilion/Makefile @@ -27,7 +27,7 @@ MAKE_ARGS= PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \ MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \ DIR=lib/postilionlib SED="${SED}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/imap/*' do-configure: diff --git a/mail/postilion/files/Makefile.bsd b/mail/postilion/files/Makefile.bsd index 3aac8a7..bf0eeff 100644 --- a/mail/postilion/files/Makefile.bsd +++ b/mail/postilion/files/Makefile.bsd @@ -5,7 +5,7 @@ LOCALBASE?= /usr/local TCL_VER?= 8.3 DIR?= lib/postlionlib -LDADD= -lm -L${LOCALBASE}/lib -L${X11BASE} -lc-client4 \ +LDADD= -lm -L${LOCALBASE}/lib -lc-client4 \ -ltk${TCL_VER:S/.//} -ltcl${TCL_VER:S/.//} -lX11 .if exists(/usr/lib/libpam.a) LDADD+= -lpam @@ -15,7 +15,7 @@ CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tk${TCL_VER} CFLAGS+= -DNDEBUG -I. CFLAGS+= -I${LOCALBASE}/include/c-client -I${LOCALBASE}/include -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include BINDIR = ${LOCALBASE}/${DIR} diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile index 8159dfe..8c5de3b 100644 --- a/mail/spruce/Makefile +++ b/mail/spruce/Makefile @@ -7,15 +7,13 @@ PORTNAME= spruce PORTVERSION= 0.6.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A simple GTK based email client -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 3194812..0bf61b6 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -24,8 +24,8 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes NO_LATEST_LINK= yes -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index 6be7992..dc6c671 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it) CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index c2a6e4b..66b9731 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it) CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index c2a6e4b..66b9731 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it) CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index d0313fc..627ad3e 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -8,7 +8,7 @@ PORTNAME= thunderbird DISTVERSION= 2.0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index d0313fc..627ad3e 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -8,7 +8,7 @@ PORTNAME= thunderbird DISTVERSION= 2.0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index d0313fc..627ad3e 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -8,7 +8,7 @@ PORTNAME= thunderbird DISTVERSION= 2.0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile index 319edce..cf5f7c8 100644 --- a/mail/tkrat2/Makefile +++ b/mail/tkrat2/Makefile @@ -7,7 +7,7 @@ PORTNAME= tkrat PORTVERSION= 2.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail tk MASTER_SITES= http://tkrat.org/downloads/stable/ \ ftp://ftp.tkrat.org/pub/tkrat/ @@ -19,7 +19,7 @@ LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 \ tk84:${PORTSDIR}/x11-toolkits/tk84 \ c-client4.9:${PORTSDIR}/mail/cclient -USE_XLIB= yes +USE_XORG= x11 xt GNU_CONFIGURE= yes diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile index ffc1689..de13d4f 100644 --- a/mail/whoson/Makefile +++ b/mail/whoson/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-config=${PREFIX}/etc/whoson.conf -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= whoson.sh diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index 8066199..02ad9ae 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -9,16 +9,14 @@ PORTNAME= wmbiff PORTVERSION= 0.4.27 PORTREVISION= 7 CATEGORIES= mail windowmaker afterstep -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An xbiff-like Window Maker dock app OPTIONS= GNUTLS "Support for SSL" off -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile index 89635d2..8caec91 100644 --- a/mail/wmmail/Makefile +++ b/mail/wmmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmmail PORTVERSION= 0.64 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail windowmaker MASTER_SITES= # none DISTNAME= WMMail.app-${PORTVERSION} @@ -17,8 +17,7 @@ COMMENT= A little mail notifier for the Window Maker dock LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-PL-libs="-L${LOCALBASE}/lib" \ diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile index 482dccb..3e479a2 100644 --- a/mail/wmmaiload/Makefile +++ b/mail/wmmaiload/Makefile @@ -7,23 +7,22 @@ PORTNAME= wmmaiload PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail windowmaker MASTER_SITES= http://tnemeth.free.fr/projets/programmes/ MAINTAINER= ports@FreeBSD.org COMMENT= Incoming mail monitor dockapp with a similar look to wmcpuload -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_OPENSSL= yes USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} MAKE_ARGS= CC="${CC}" \ CFLAGS="${CFLAGS} -D_GNU_SOURCE ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ LIB_SSL="-lssl -lcrypto" \ LIB_THREADS="${PTHREAD_LIBS}" \ DEBUG_CFLAGS="-I${OPENSSLINC}" \ diff --git a/mail/wmmultipop3/Makefile b/mail/wmmultipop3/Makefile index 67e4430..b741d46 100644 --- a/mail/wmmultipop3/Makefile +++ b/mail/wmmultipop3/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmmultipop3 PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail windowmaker MASTER_SITES= http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/ DISTNAME= wmMultiPop3-${PORTVERSION} @@ -16,8 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A WindowMaker dockapp that checks multiple pop3 accounts for new mail BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm DOC_FILES= ChangeLog INSTALL README diff --git a/mail/wmmultipop3/files/patch-Makefile b/mail/wmmultipop3/files/patch-Makefile index 1c225fb..dcba0ab 100644 --- a/mail/wmmultipop3/files/patch-Makefile +++ b/mail/wmmultipop3/files/patch-Makefile @@ -2,7 +2,7 @@ +++ wmmultipop3/Makefile Sun May 26 19:40:43 2002 @@ -1,14 +1,13 @@ -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -FLAGS = -O2 OBJS = wmmultipop3.o Pop3Client.o ../wmgeneral/wmgeneral.o ../wmgeneral/misc.o ../wmgeneral/list.o @@ -10,7 +10,7 @@ .c.o: - cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o -+ ${CC} -I${X11BASE}/include ${CFLAGS} -c -Wall $< -o $@ ++ ${CC} -I${LOCALBASE}/include ${CFLAGS} -c -Wall $< -o $@ wmmultipop3: $(OBJS) - cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS) diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile index a8c4af5..0f6d6df 100644 --- a/mail/wmpop3/Makefile +++ b/mail/wmpop3/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmpop3 PORTVERSION= 0.5.6a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail windowmaker MASTER_SITES= # DISTNAME= WMPop3-${PORTVERSION} @@ -17,8 +17,7 @@ COMMENT= A POP3 mail check for the Window Maker dock WRKSRC= ${WRKDIR}/${DISTNAME:L}/wmpop3 -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= clean all PLIST_FILES= bin/wmpop3 %%EXAMPLESDIR%%/wmpop3rc diff --git a/mail/wmymail/Makefile b/mail/wmymail/Makefile index 9ca7e19..0db07cf 100644 --- a/mail/wmymail/Makefile +++ b/mail/wmymail/Makefile @@ -6,7 +6,7 @@ PORTNAME= wmymail PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail x11 MASTER_SITES= http://yath.mine.nu/wmymail/ \ http://dockapps.org/files/65/96/ @@ -17,8 +17,6 @@ COMMENT= Check inbox using a WindowMaker DockApp LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp RUN_DEPENDS= fetchmail:${PORTSDIR}/mail/fetchmail -USE_X_PREFIX= yes - NOMAN= PLIST_FILES= bin/wmymail diff --git a/mail/wmymail/files/patch-Makefile b/mail/wmymail/files/patch-Makefile index f2512ee..98d70fa 100644 --- a/mail/wmymail/files/patch-Makefile +++ b/mail/wmymail/files/patch-Makefile @@ -17,9 +17,9 @@ -DISTFILES = Makefile README README.old ChangeLog wmymail.c raw-envelope.jpg +SRCS= wmymail.c + -+CFLAGS+= -I${X11BASE}/include -O2 -Wall ++CFLAGS+= -I${LOCALBASE}/include -O2 -Wall +LDADD+= -lXpm -lX11 -lXext -ldockapp -+LDADD+= -L${X11BASE}/lib ++LDADD+= -L${LOCALBASE}/lib -default all target: wmymail +NOMAN= @@ -29,7 +29,7 @@ -wmymail: wmymail.o - $(CC) $< $(CFLAGS) $(LIBS) -o $@ -+BINDIR?= ${X11BASE}/bin ++BINDIR?= ${LOCALBASE}/bin -wmymail.o: wmymail.c $(XPMS) - $(CC) $(CFLAGS) $(MY_INCS) -o $@ -c $< diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile index 2153fcc..d7c2722 100644 --- a/mail/xbuffy/Makefile +++ b/mail/xbuffy/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbuffy PORTVERSION= 3.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.fiction.net/blong/programs/xbuffy/ DISTNAME= ${PORTNAME}-3.3.bl.3 @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-3.3.bl.3 MAINTAINER= ports@FreeBSD.org COMMENT= A replacement for xbiff that handles multiple mail files -USE_X_PREFIX= yes +USE_XORG= xext xt xaw USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= xbuffy.1 diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile index b8bf47c..e57be03 100644 --- a/mail/xc-mail/Makefile +++ b/mail/xc-mail/Makefile @@ -7,10 +7,10 @@ PORTNAME= xc-mail PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xcmail MAINTAINER= ports@FreeBSD.org @@ -21,16 +21,14 @@ LIB_DEPENDS= Xclasses.1:${PORTSDIR}/x11-toolkits/xclasses GNU_CONFIGURE= yes ONLY_FOR_ARCHS= arm i386 USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 -CONFIGURE_ARGS= --includedir=${X11BASE}/include/ \ - --libdir=${X11BASE}/lib/ \ - --x-includes=${X11BASE}/include/ \ - --x-libraries=${X11BASE}/lib/ +CONFIGURE_ARGS= --includedir=${LOCALBASE}/include/ \ + --libdir=${LOCALBASE}/lib/ -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 8c0f3c0..d623834 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -26,7 +26,7 @@ USE_GNOME= glib12 USE_GMAKE= yes GNU_CONFIGURE= yes USE_XORG= xpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile index 6c2a184..10d69a3 100644 --- a/mail/xmail/Makefile +++ b/mail/xmail/Makefile @@ -17,8 +17,7 @@ MAINTAINER= sjr@comcast.net COMMENT= An X-based interface to the Berkeley mail program USE_IMAKE= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm MAN1= xmail.1 .include <bsd.port.mk> diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile index 318e233..71dcf4c 100644 --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Mailbox checker with sound and animation for X Window System USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xmailbox.1 post-patch: diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile index f6c080c4..3cf90eb 100644 --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -17,7 +17,7 @@ MAINTAINER?= ports@FreeBSD.org COMMENT?= A replacement for xbiff that handles popup window with mail header USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xpbiff WRKSRC= ${WRKDIR}/xpbiff diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-aa index acecf1c..e588e35 100644 --- a/math/abs/files/patch-aa +++ b/math/abs/files/patch-aa @@ -17,7 +17,7 @@ #for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext #for netBSD LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -+LIBS = -L${X11BASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ++LIBS = -L${LOCALBASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm #for hp DEFINE = -D_HPUX_SOURCE -#for AIX DEFINE = -D_AIX_SOURCE @@ -29,7 +29,7 @@ #for hp IncludeDir = /usr/contrib/X11R6/include #for net-BSD IncludeDir = /usr/X11R6/include -IncludeDir = . -+IncludeDir = ${X11BASE}/include ++IncludeDir = ${LOCALBASE}/include #for hp Ccompiler = c89 -Ccompiler = cc diff --git a/math/apc/Makefile b/math/apc/Makefile index ee7b8b1..6b8cf58 100644 --- a/math/apc/Makefile +++ b/math/apc/Makefile @@ -7,7 +7,7 @@ PORTNAME= apc PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved @@ -17,7 +17,7 @@ COMMENT= An xforms based Auto Payment Calculator LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms -USE_X_PREFIX= yes +USE_XORG= x11 xpm MAN1= apc.1 MANCOMPRESSED= yes PLIST_FILES= bin/apc diff --git a/math/apc/files/patch-aa b/math/apc/files/patch-aa index 9d55486..b5315b8 100644 --- a/math/apc/files/patch-aa +++ b/math/apc/files/patch-aa @@ -1,16 +1,21 @@ ---- Makefile.orig Mon Oct 13 15:25:38 1997 -+++ Makefile Tue Jul 2 01:04:00 2002 -@@ -1,8 +1,11 @@ +--- ./Makefile.orig 1997-10-13 21:25:38.000000000 +0200 ++++ ./Makefile 2008-04-13 18:59:23.000000000 +0200 +@@ -1,10 +1,13 @@ # New Makefile for apc (13 October 1997) # -CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include -+.if exists(${X11BASE}/include/X11/forms.h) -+XFORMSINC=-I${X11BASE}/include/X11 -+.endif -+CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include ${XFORMSINC} - LDFLAGS+=-L${X11BASE}/lib +-LDFLAGS+=-L${X11BASE}/lib -LDADD+=-lxforms -lX11 -lm +-BINDIR=${X11BASE}/bin +-MANDIR=${X11BASE}/man/man ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMSINC=-I${LOCALBASE}/include/X11 ++.endif ++CFLAGS+=-DOS=\"$(OSTYPE)\" -I${LOCALBASE}/include ${XFORMSINC} ++LDFLAGS+=-L${LOCALBASE}/lib +LDADD+=-lforms -lX11 -lm -lXpm - BINDIR=${X11BASE}/bin - MANDIR=${X11BASE}/man/man ++BINDIR=${LOCALBASE}/bin ++MANDIR=${LOCALBASE}/man/man PROG= apc + SRCS= about.c apc.c calculate.c main.c mathfun.c setfns.c + diff --git a/math/bamg/Makefile b/math/bamg/Makefile index f7ad0f3..7d36522 100644 --- a/math/bamg/Makefile +++ b/math/bamg/Makefile @@ -7,7 +7,7 @@ PORTNAME= bamg PORTVERSION= 0.68 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math science MASTER_SITES= http://pauillac.inria.fr/cdrom/ftp/bamg/ \ http://www-rocq1.inria.fr/gamma/cdrom/ftp/bamg/ \ @@ -24,7 +24,7 @@ RESTRICTED= No resale, contact author for commercial usage WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes ALL_TARGET= world diff --git a/math/bamg/files/patch-FLAG.linux b/math/bamg/files/patch-FLAG.linux index c16f16c..fa2fd9f 100644 --- a/math/bamg/files/patch-FLAG.linux +++ b/math/bamg/files/patch-FLAG.linux @@ -10,12 +10,12 @@ +O = $(longlong) +G = +CXXFLAGS+= $(O) -+CXXGRAPHIC = $(CXXFLAGS) -I$(X11BASE)/include -DDRAWING -DDEBUG ++CXXGRAPHIC = $(CXXFLAGS) -I$(LOCALBASE)/include -DDRAWING -DDEBUG CXXLINKFLAG = -X11LIB = -L/usr/lib/X11R6 -L/usr/X11R6/lib -lX11 -X11INCLUDE= -I/usr/include/X11R6 -+X11LIB = -L$(X11BASE)/lib -lX11 -+X11INCLUDE= -I$(X11BASE)/include ++X11LIB = -L$(LOCALBASE)/lib -lX11 ++X11INCLUDE= -I$(LOCALBASE)/include STDLIB = -F77FLAGS = -F77 = f77 diff --git a/math/biggles/Makefile b/math/biggles/Makefile index 946ecbc..2a4cfaf 100644 --- a/math/biggles/Makefile +++ b/math/biggles/Makefile @@ -10,8 +10,7 @@ PORTNAME= biggles PORTVERSION= 1.6.4 PORTREVISION= 1 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= python2-${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -26,7 +25,7 @@ PYDISTUTILS_PKGNAME= python2-biggles USE_LDCONFIG= yes post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/make.inc - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/make.inc + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile index 13b743d..5864cb2 100644 --- a/math/blitz++/Makefile +++ b/math/blitz++/Makefile @@ -33,7 +33,7 @@ MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ DOCSDIR= ${PREFIX}/share/doc/blitz -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|g++|\$${CXX}|g ; \ diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile index a98832e..2dfe8d8 100644 --- a/math/blocksolve95/Makefile +++ b/math/blocksolve95/Makefile @@ -7,7 +7,7 @@ PORTNAME= blocksolve95 PORTVERSION= 3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math parallel MASTER_SITES= ftp://info.mcs.anl.gov/pub/BlockSolve95/ \ ftp://ftp.irisa.fr/pub/mirrors/BlockSolve95/ @@ -22,7 +22,6 @@ BUILD_DEPENDS= ${MPIDIR}/lib/libmpich.a:${PORTSDIR}/net/mpich2 LIB_DEPENDS= f2c.2:${PORTSDIR}/lang/f2c RUN_DEPENDS= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2 -USE_XLIB= yes USE_GMAKE= yes MAKEFILE= makefile MAKE_ARGS= GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \ diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site index e93294c..bab7059 100644 --- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site +++ b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site @@ -12,7 +12,7 @@ # Location of X-windows software # -X11_INCLUDE = -+X11_INCLUDE = -I$(X11BASE)/include ++X11_INCLUDE = -I$(LOCALBASE)/include X11_LIB = -lX11 # # Location of MPI (Message Passing Interface) software diff --git a/math/calctool/Makefile b/math/calctool/Makefile index 5a7d86d..072c305 100644 --- a/math/calctool/Makefile +++ b/math/calctool/Makefile @@ -7,7 +7,7 @@ PORTNAME= calctool PORTVERSION= 2.4.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nsayer @@ -27,7 +27,7 @@ MAN1= calctool.1 .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 BINARIES+= xcalctool PLIST_SUB+= X11="" .else @@ -57,7 +57,7 @@ FPIC= -fpic post-patch: @${REINPLACE_CMD} -e "s#%%FPIC%%#${FPIC}#g" \ - -e "s#%%X11BASE%%#${X11BASE}#g" \ + -e "s#%%LOCALBASE%%#${LOCALBASE}#g" \ -e "s#%%BINARIES%%#${BINARIES}#g" \ -e "s#%%DATADIR%%#${DATADIR}#g" \ ${WRKSRC}/Makefile diff --git a/math/calctool/files/patch-ab b/math/calctool/files/patch-ab index d7b7799..5c8e17f 100644 --- a/math/calctool/files/patch-ab +++ b/math/calctool/files/patch-ab @@ -34,16 +34,16 @@ # -#X11INCDIR = -I$(OPENWINHOME)/include -#X11LIBDIR = -L$(OPENWINHOME)/lib -+X11INCDIR = -I%%X11BASE%%/include -+X11LIBDIR = -L%%X11BASE%%/lib ++X11INCDIR = -I%%LOCALBASE%%/include ++X11LIBDIR = -L%%LOCALBASE%%/lib #------------------------------------------------------------------------- # If you are compiling the XView version, then the following two lines # should be uncommented. # -XVIEWINCDIR = -I$(OPENWINHOME)/include -XVIEWLIBDIR = -L$(OPENWINHOME)/lib -+XVIEWINCDIR = -I%%X11BASE%%/include -+XVIEWLIBDIR = -L%%X11BASE%%/lib ++XVIEWINCDIR = -I%%LOCALBASE%%/include ++XVIEWLIBDIR = -L%%LOCALBASE%%/lib # #========================================================================= # diff --git a/math/cgal/Makefile b/math/cgal/Makefile index 510847e..9e9020b 100644 --- a/math/cgal/Makefile +++ b/math/cgal/Makefile @@ -18,7 +18,7 @@ COMMENT= A computational geometry library BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost RUN_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VERSION= 0 HAS_CONFIGURE= yes diff --git a/math/dislin/Makefile b/math/dislin/Makefile index 75cb703..487ad75 100644 --- a/math/dislin/Makefile +++ b/math/dislin/Makefile @@ -7,6 +7,7 @@ PORTNAME= dislin PORTVERSION= 9.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/unix/ DISTNAME= ${PORTNAME}-${PORTVERSION}.fbsd${BINVER} @@ -18,7 +19,7 @@ LIB_DEPENDS= f2c.2:${PORTSDIR}/lang/f2c RESTRICTED= free for non-commercial use. ONLY_FOR_ARCHS= i386 -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/math/emc2/Makefile b/math/emc2/Makefile index e806989..5252a0f 100644 --- a/math/emc2/Makefile +++ b/math/emc2/Makefile @@ -7,7 +7,7 @@ PORTNAME= emc2 PORTVERSION= 2.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math science MASTER_SITES= http://www-c.inria.fr/gamma/cdrom/ftp/emc2/ \ http://www-rocq1.inria.fr/gamma/cdrom/ftp/emc2/ @@ -24,7 +24,7 @@ RESTRICTED= No resale, contact author for commercial usage WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes ALL_TARGET= ${PORTNAME} diff --git a/math/emc2/files/patch-Makefile b/math/emc2/files/patch-Makefile index fd7cd9a..2dd8634 100644 --- a/math/emc2/files/patch-Makefile +++ b/math/emc2/files/patch-Makefile @@ -8,8 +8,8 @@ -X11INCLUDEDIR=/usr/include/X11R6 -X11LIBDIR=/usr/lib/X11R6 +BIN=$(PREFIX)/bin -+X11INCLUDEDIR=$(X11BASE)/include -+X11LIBDIR=$(X11BASE)/lib ++X11INCLUDEDIR=$(LOCALBASE)/include ++X11LIBDIR=$(LOCALBASE)/lib X11LIB= -L$(X11LIBDIR) -lX11 MATHLIB= -lm diff --git a/math/femlab/Makefile b/math/femlab/Makefile index 7f3090b..c8453c9 100644 --- a/math/femlab/Makefile +++ b/math/femlab/Makefile @@ -7,7 +7,7 @@ PORTNAME= femlab PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math science # mastersite disappeared in April 2000 MASTER_SITES= # ftp://ftp.md.chalmers.se/pub/Femlab/ @@ -16,16 +16,16 @@ DISTFILES= femlab-2d-v${PORTVERSION}.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Interactive program for solving partial differential equations in 2D -BUILD_DEPENDS= ${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx \ - xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx \ + imake:${PORTSDIR}/devel/imake +USE_XORG= xaw WANT_FORTRAN= yes #dummy but future use BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 FC= gfortran42 F77= gfortran42 MAKE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" -USE_X_PREFIX= yes FEMLAB_HOME= ${PREFIX}/lib/X11/femlab diff --git a/math/femlab/files/patch-aa b/math/femlab/files/patch-aa index 589c3cc..70c091b 100644 --- a/math/femlab/files/patch-aa +++ b/math/femlab/files/patch-aa @@ -11,7 +11,7 @@ # Change next line to the location of the libsx library # -EXTRA_LOAD_FLAGS = -L/users/math/martenl/projects/lib -+EXTRA_LOAD_FLAGS = -L$(X11BASE) ++EXTRA_LOAD_FLAGS = -L$(LOCALBASE) LOCAL_LIBRARIES = -lfreq -lsx -lm XawClientLibs DEPLIBS = XawClientDepLibs diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index a74071d..7823e5e 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -24,7 +24,7 @@ FFTW3_SUFX= GNU_CONFIGURE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_PERL5_BUILD=yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-threads CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \ diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile index 5327388..1dcda77 100644 --- a/math/freefem++/Makefile +++ b/math/freefem++/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS= --disable-download \ --with-umfpack="-lumfpack" \ --with-arpack="${ARPACK}" CONFIGURE_ENV= CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/suitesparse/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ + LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ FC=${FC} F77=${F77} FCFLAGS=${FCFLAGS} DOC_TARGET= freefem++doc.pdf @@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --without-mpi pre-configure: ${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - -e "s|/usr/X11R6|${X11BASE}|g" \ + -e "s|/usr/X11R6|${LOCALBASE}|g" \ ${WRKSRC}/${CONFIGURE_SCRIPT} ${REINPLACE_CMD} -e "s|mpicc|${LOCALBASE}/mpich2/bin/mpicxx|" \ ${WRKSRC}/src/mpi/Makefile.in diff --git a/math/freefem/Makefile b/math/freefem/Makefile index 0d9fbe5..d06d10b 100644 --- a/math/freefem/Makefile +++ b/math/freefem/Makefile @@ -7,14 +7,14 @@ PORTNAME= freefem PORTVERSION= 3.5.8 +PORTREVISION= 1 CATEGORIES= math science MASTER_SITES= SF/kfem MAINTAINER= ports@FreeBSD.org COMMENT= A language for the Finite Element Method -USE_XORG= ice sm x11 -USE_XLIB= yes +USE_XORG= ice sm x11 xt USE_GNOME= gnometarget USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 2ddc13b..0ddd2ff 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -35,7 +35,7 @@ QT_COMPONENTS= gui network opengl moc rcc uic xml svg GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-blas="${BLAS}" --without-llvm -CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${AMDINC} +CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC} CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile index 5097ec6..938fbf4 100644 --- a/math/fung-calc/Makefile +++ b/math/fung-calc/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut USE_KDELIBS_VER=3 USE_GL= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 4bd7223..9e82b9c 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -8,6 +8,7 @@ PORTNAME= gcalctool PORTVERSION= 5.22.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,7 +22,6 @@ USE_BZIP2= yes USE_BISON= build INSTALLS_OMF= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2 diff --git a/math/geg/Makefile b/math/geg/Makefile index 3b5cb73..565d4d8 100644 --- a/math/geg/Makefile +++ b/math/geg/Makefile @@ -26,6 +26,6 @@ MAN1= geg.1 PLIST_FILES= bin/geg pre-configure: - @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ${X11BASE}/share/aclocal + @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal .include <bsd.port.mk> diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 0785e86..fa505b7 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -9,6 +9,7 @@ PORTNAME= gnumeric PORTVERSION= 1.8.2 CATEGORIES= math gnome +PORTREVISION= 1 MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= gnome2 @@ -21,7 +22,6 @@ LIB_DEPENDS= goffice-0.6.6:${PORTSDIR}/devel/goffice \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomehier \ diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile index 2b6c368..9c74b29 100644 --- a/math/gnuplot+/Makefile +++ b/math/gnuplot+/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnuplot371+ PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math japanese graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.yama-ga.com/gnuplot/:patch \ @@ -23,6 +23,7 @@ COMMENT= A command-driven interactive function plotting program LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ VFlib2.24:${PORTSDIR}/japanese/vflib +USE_XORG= x11 USE_FREETYPE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:213 diff --git a/math/goblin/Makefile b/math/goblin/Makefile index 3857c72..d7301ac 100644 --- a/math/goblin/Makefile +++ b/math/goblin/Makefile @@ -8,7 +8,7 @@ PORTNAME= goblin PORTVERSION= 2.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://www.math.uni-augsburg.de/~fremuth/goblin.docs/ \ ${MASTER_SITE_LOCAL} @@ -23,6 +23,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 CONFLICTS= ImageMagick-[0-9]* display-* +USE_XORG= x11 USE_GMAKE= yes USE_GCC= 3.2 MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ @@ -32,9 +33,9 @@ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ ALL_TARGET= all goblin.a glpk.a PLIST_SUB+= VERSION=${PORTVERSION:R} -CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 \ - -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/ \ + ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} WISH= ${LOCALBASE}/bin/wish8.3 diff --git a/math/grace/Makefile b/math/grace/Makefile index 23f026e..e484c88 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -36,7 +36,7 @@ USE_GMAKE= YES USE_MOTIF= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= \ - --with-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \ + --with-extra-incpath=${LOCALBASE}/include/X11:${LOCALBASE}/include \ --with-extra-ldpath=${LOCALBASE}/lib --without-bundled_xbae \ --enable-grace-home=${DATADIR} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/math/grpn/Makefile b/math/grpn/Makefile index 85d6535..1ef8244 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -7,14 +7,13 @@ PORTNAME= grpn PORTVERSION= 1.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= http://lashwhip.com/grpn/ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+-based reverse polish notation (RPN) calculator -USE_X_PREFIX= yes USE_GNOME= gtk12 ALL_TARGET= diff --git a/math/grpn/files/patch-aa b/math/grpn/files/patch-aa index 443851e..4c2a2a4 100644 --- a/math/grpn/files/patch-aa +++ b/math/grpn/files/patch-aa @@ -14,10 +14,10 @@ -CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1 -+CFLAGS+= -I${X11BASE}/include -I${PREFIX}/include `${GTK_CONFIG} --cflags` -DGTK_VER_1_1 ++CFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include `${GTK_CONFIG} --cflags` -DGTK_VER_1_1 -DFLAGS = -L/usr/X11/lib -+DFLAGS = -L${X11BASE}/lib -L${PREFIX}/lib ++DFLAGS = -L${LOCALBASE}/lib -L${PREFIX}/lib # end of user configurable section diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile index eccf795..3f1deb7 100644 --- a/math/kaskade/Makefile +++ b/math/kaskade/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaskade PORTVERSION= 3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math science MASTER_SITES= ftp://ftp.zib.de/pub/kaskade/3.x/ DISTNAME= ${PORTVERSION} @@ -19,7 +19,7 @@ USE_FORTRAN= yes FORTRANLIBS= -lgfortranbegin -lgfortran GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/math/ldouble/Makefile b/math/ldouble/Makefile index 5d86eba..a5824dc 100644 --- a/math/ldouble/Makefile +++ b/math/ldouble/Makefile @@ -19,7 +19,7 @@ COMMENT= Long double math precision functions NO_WRKSUBDIR= yes MAKEFILE= makefile -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 sparc64 PLIST_FILES= lib/libml.a \ diff --git a/math/lensnns/files/patch-Makefile b/math/lensnns/files/patch-Makefile index fada5ce..c7b208b 100644 --- a/math/lensnns/files/patch-Makefile +++ b/math/lensnns/files/patch-Makefile @@ -5,7 +5,7 @@ #MACHINE = INTEL MAKE = /usr/bin/make -SYSLIB = -export-dynamic -ldl -L/usr/X11R6/lib -+SYSLIB = -export-dynamic -ldl -L${X11BASE}/lib ++SYSLIB = -export-dynamic -ldl -L${LOCALBASE}/lib # Windows 95/98/NT using Cygwin: ifeq ($(HOSTTYPE),i686) diff --git a/math/lensnns/files/patch-Src-Makefile b/math/lensnns/files/patch-Src-Makefile index 695a2fe..a0319e6 100644 --- a/math/lensnns/files/patch-Src-Makefile +++ b/math/lensnns/files/patch-Src-Makefile @@ -9,8 +9,8 @@ + TCLVER= 8.3 + TCLDIR= /usr/local/include + BINDIR= $(TOP)/Bin/$(HOSTTYPE) -+ INCL= -I$(TCLDIR)/tcl$(TCLVER)/generic -I$(TCLDIR)/tk$(TCLVER)/generic -I${X11BASE}/include -+ LIBS= -L$(BINDIR) -L/usr/local/lib -L${X11BASE}/lib -ltk83 -ltcl83 -lm -lX11 $(SYSLIB) ++ INCL= -I$(TCLDIR)/tcl$(TCLVER)/generic -I$(TCLDIR)/tk$(TCLVER)/generic -I${LOCALBASE}/include ++ LIBS= -L$(BINDIR) -L/usr/local/lib -L${LOCALBASE}/lib -ltk83 -ltcl83 -lm -lX11 $(SYSLIB) +else O= ../Obj/$(HOSTTYPE) TCLVER= 8.3.4 diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile index cc43e90..54d7637 100644 --- a/math/libmath++/Makefile +++ b/math/libmath++/Makefile @@ -17,6 +17,6 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile index 9e085dc..d2f7985 100644 --- a/math/linux-relview/Makefile +++ b/math/linux-relview/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_WRKSUBDIR= yes EXTRACT_AFTER_ARGS= > ${DISTNAME} diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile index 277b376..837c9f8 100644 --- a/math/lp_solve/Makefile +++ b/math/lp_solve/Makefile @@ -17,7 +17,7 @@ COMMENT= Linear Programming Solver PORTMAJOR_VER= 5.5 WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTMAJOR_VER} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if ${MACHINE_ARCH} == "sparc64" PICFLAG?= -fPIC diff --git a/math/matrix/Makefile b/math/matrix/Makefile index 62ccd7b..877b99b 100644 --- a/math/matrix/Makefile +++ b/math/matrix/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ library to manipulate matrices and vectors WRKSRC= ${WRKDIR}/matrix USE_ZIP= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= LIBVERSION=1 .include <bsd.port.pre.mk> diff --git a/math/maxima/Makefile b/math/maxima/Makefile index b30fc54..425aa3a 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -7,9 +7,9 @@ PORTNAME= maxima PORTVERSION= 5.14.0 +PORTREVISION= 1 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=${PORTNAME} +MASTER_SITES= SF MAINTAINER= sf@slappy.org COMMENT= Symbolic mathematics program @@ -20,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/${LISPPORT} \ ${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19 autoconf:261 CONFIGURE_ARGS+= --prefix=${PREFIX} \ diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile index 9979c57..51da411 100644 --- a/math/mbasecalc/Makefile +++ b/math/mbasecalc/Makefile @@ -17,8 +17,8 @@ COMMENT= Simple calculator program inspired by basecalc LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk -MAKE_ARGS= INCLUDES="-I${X11BASE}/include -I." \ - LIBS="-L${X11BASE}/lib -lfltk -lX11" +MAKE_ARGS= INCLUDES="-I${LOCALBASE}/include -I." \ + LIBS="-L${LOCALBASE}/lib -lfltk -lX11" PLIST_FILES= bin/mbasecalc diff --git a/math/ngraph/files/patch-aa b/math/ngraph/files/patch-aa index 7287ee4..4361c08 100644 --- a/math/ngraph/files/patch-aa +++ b/math/ngraph/files/patch-aa @@ -65,9 +65,9 @@ +STRIP = strip +DEFS = -DJAPANESE +PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' -+X11INCLUDE = -I${X11BASE}/include -I/usr/dt/include ++X11INCLUDE = -I${LOCALBASE}/include -I/usr/dt/include +STATICLINK = -+X11LIB = ${MOTIFLIB} -lm -L${X11BASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM ++X11LIB = ${MOTIFLIB} -lm -L${LOCALBASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM # ############################################################################### diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index d0dfaac..1dbaa22 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -9,8 +9,7 @@ PORTNAME= octave-forge PORTVERSION= 2006.03.17 PORTREVISION= 2 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= octave +MASTER_SITES= SF/octave MAINTAINER= maho@FreeBSD.org COMMENT= Many additional features to math/octave @@ -29,9 +28,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= # empty CONFIGURE_ARGS= --with-cc=${CC} \ - --with-cxx=${CXX} \ - --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include + --with-cxx=${CXX} USE_FORTRAN= yes diff --git a/math/oleo/Makefile b/math/oleo/Makefile index 5cb7320..8f7da87 100644 --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -18,8 +18,8 @@ COMMENT= The GNU spreadsheet for X11 and terminals USE_PERL5_BUILD= yes USE_BISON= build USE_AUTOTOOLS= autoconf:213 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot INFO= oleo diff --git a/math/petsc/Makefile b/math/petsc/Makefile index 28e3c93..012e932 100644 --- a/math/petsc/Makefile +++ b/math/petsc/Makefile @@ -7,6 +7,7 @@ PORTNAME= petsc DISTVERSION= 2.3.3-p0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ @@ -38,9 +39,9 @@ SUB_LIST= PETSC_ARCH=${TARGET} PETSC_DIR=${PREFIX}/${PFX} PKGMESSAGE= ${WRKDIR}/pkg-message .if !defined(WITHOUT_X11) -USE_XLIB= yes -CONFIGURE_ARGS+= --with-x-include=${X11BASE}/include \ - --with-x-lib=${X11BASE}/lib/libX11.so +USE_XORG= x11 +CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include \ + --with-x-lib=${LOCALBASE}/lib/libX11.so .endif USE_FORTRAN= yes diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 593b59a..ea89ead 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -7,10 +7,9 @@ PORTNAME= plplot PORTVERSION= 5.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A scientific plotting package @@ -45,7 +44,7 @@ PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11="@comment " .else -USE_XLIB= yes +USE_XORG= x11 LIB_DEPENDS+= LASi.0:${PORTSDIR}/devel/lasi PLIST_SUB+= X11="" .endif diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index fd39a67..49bdd7a 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -10,8 +10,7 @@ PORTNAME= matplotlib PORTVERSION= 0.90.0 PORTREVISION= 1 CATEGORIES= math python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= mainland@apeiron.net @@ -35,7 +34,7 @@ USE_PYDISTUTILS= yes USE_GNOME= gtk20 pygtk2 USE_TCL_RUN= yes USE_TK_RUN= yes -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile index 01ac5d7..d1ba41b 100644 --- a/math/qscanplot/Makefile +++ b/math/qscanplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= qscanplot PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math # per distfile survey, mastersite disappeared in March 2003 MASTER_SITES= # http://www.gae.ucm.es/~gonzalez/qscanplot/ @@ -17,7 +17,7 @@ COMMENT= A program to extract data from scanned plots, graphs and figures BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -USE_X_PREFIX= yes +USE_XORG= x11 xext xinerama USE_QT_VER= 3 USE_PERL5_BUILD=yes USE_GMAKE= yes diff --git a/math/reed-solomon/Makefile b/math/reed-solomon/Makefile index 8a7ba13..a6d16f0 100644 --- a/math/reed-solomon/Makefile +++ b/math/reed-solomon/Makefile @@ -15,7 +15,7 @@ COMMENT= A Reed-Solomon CODEC library GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKEFILE= makefile MAN3= rs.3 diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile index 9d8c69a..90a7ca5 100644 --- a/math/scigraphica/Makefile +++ b/math/scigraphica/Makefile @@ -7,10 +7,10 @@ PORTNAME= scigraphica PORTVERSION= 0.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math gnome MASTER_SITES= http://scigraphica.sourceforge.net/src/ \ - ${MASTER_SITE_SOURCEFORGE} \ + SF \ http://magnet.fsu.edu/~feiguin/scigraphica/src/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,7 +22,6 @@ LIB_DEPENDS= gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk -USE_X_PREFIX= yes USE_PERL5_BUILD=yes USE_GMAKE= yes USE_GNOME= yes diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 9f6b152..525ba22 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -7,7 +7,7 @@ PORTNAME= scilab PORTVERSION= 4.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math cad parallel MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/ EXTRACT_SUFX= -src.tar.gz @@ -20,6 +20,7 @@ BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ xsltproc:${PORTSDIR}/textproc/libxslt RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 +USE_XORG= x11 GNU_CONFIGURE= yes USE_GETTEXT= yes WANT_GNOME= yes @@ -31,12 +32,10 @@ CONFIGURE_ARGS= --with-tk \ --with-tcl-library=${LOCALBASE}/lib \ --with-tcl-include=${LOCALBASE}/include/tcl8.4 \ --with-xaw3d \ - --x-include=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --without-java \ --without-ocaml -CONFIGURE_ENV+= X11BASE=${X11BASE} F77=${F77} FFLAGS="${FFLAGS}" +CONFIGURE_ENV+= F77=${F77} FFLAGS="${FFLAGS}" OPTIONS= GTK2 "Use Gtk+2 interface" off \ PVM "Use PVM" off diff --git a/math/snns/Makefile b/math/snns/Makefile index a34fd69..f7e2e64 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -7,7 +7,7 @@ PORTNAME= snns PORTVERSION= 4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/ \ ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/ @@ -17,10 +17,9 @@ DISTNAME= SNNSv${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Fully featured neural network simulator -USE_XLIB= yes +USE_XORG= x11 xaw xt HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX}/snns --enable-global \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --prefix=${PREFIX}/snns --enable-global post-configure: @(${SED} -e "s#%prefix%#${PREFIX}#g" < ${FILESDIR}/snns > ${WRKSRC}/snns) diff --git a/math/surf/Makefile b/math/surf/Makefile index 269b882..f727f12 100644 --- a/math/surf/Makefile +++ b/math/surf/Makefile @@ -8,11 +8,11 @@ PORTNAME= surf PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF +USE_XORG= x11 xmu MAINTAINER= ports@FreeBSD.org COMMENT= Visualize some real algebraic geometry diff --git a/math/topaz/Makefile b/math/topaz/Makefile index daa99ff..e13b8fe 100644 --- a/math/topaz/Makefile +++ b/math/topaz/Makefile @@ -7,7 +7,7 @@ PORTNAME= topaz PORTVERSION= 3.40 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://hp.vector.co.jp/authors/VA007663/topaz/bin/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/}-src @@ -17,7 +17,7 @@ COMMENT= A command driven graph plotting system for scientists and engineers WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 MAKEFILE= Makefile.freebsd post-install: diff --git a/math/topaz/files/patch-aa b/math/topaz/files/patch-aa index 22c9908..d801946 100644 --- a/math/topaz/files/patch-aa +++ b/math/topaz/files/patch-aa @@ -13,11 +13,11 @@ # for FreeBSD -CFLAGS= -I/usr/local/include -I/usr/local/include/ncurses -I/usr/X11R6/include -O2 -Wall -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC -TOPAZLIB= -L/usr/local/lib -lm -lncurses -lgnugetopt -lreadline -lhistory -+CXXFLAGS+= -I${LOCALBASE}/include/ncurses -I${X11BASE}/include -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC ++CXXFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC +TOPAZLIB= -lm -lncurses -lreadline -lhistory PSLIB= -lm -VIEWLIB= -lm -L/usr/X11R6/lib -lX11 -+VIEWLIB= -lm -L${X11BASE}/lib -lX11 ++VIEWLIB= -lm -L${LOCALBASE}/lib -lX11 # obj OBJ=topaz.o plobj.o graph.o axis.o frame.o frame2.o valbuff.o script.o funcs.o\ diff --git a/math/triangle/Makefile b/math/triangle/Makefile index b02cee8..269ecd6 100644 --- a/math/triangle/Makefile +++ b/math/triangle/Makefile @@ -7,7 +7,7 @@ PORTNAME= triangle PORTVERSION= 1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://cm.bell-labs.com/netlib/voronoi/ DISTNAME= ${PORTNAME} @@ -20,7 +20,7 @@ NO_CDROM= "Triangle must not be sold for profit" NO_WRKSUBDIR= yes USE_ZIP= yes -USE_XLIB= yes +USE_XORG= x11 MAKEFILE= makefile PLIST_FILES= bin/triangle bin/showme diff --git a/math/triangle/files/patch-makefile b/math/triangle/files/patch-makefile index abd4ddd..c20ae2a 100644 --- a/math/triangle/files/patch-makefile +++ b/math/triangle/files/patch-makefile @@ -14,7 +14,7 @@ # CSWITCHES = -O -DNO_TIMER -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib -CSWITCHES = -O -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib -+CSWITCHES = ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib ++CSWITCHES = ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib # TRILIBDEFS is a list of definitions used to compile an object code version # of Triangle (triangle.o) to be called by another program. The file diff --git a/math/ump/Makefile b/math/ump/Makefile index 60c147c..b601997 100644 --- a/math/ump/Makefile +++ b/math/ump/Makefile @@ -7,10 +7,9 @@ PORTNAME= ump PORTVERSION= 0.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= u-m-p +MASTER_SITES= SF/u-m-p MAINTAINER= nivit@FreeBSD.org COMMENT= A graphical, easy to use math program @@ -21,14 +20,12 @@ LATEST_LINK= math-ump USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= glu ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_ENV+= CXX="${CXX}" CC="${CC}" DATADIR="${DATADIR}" \ - X11BASE="${X11BASE}" +MAKE_ENV+= CXX="${CXX}" CC="${CC}" DATADIR="${DATADIR}" FIND_DIRS= -type d FIND_DATA= -type f diff --git a/math/ump/files/patch-Makefile b/math/ump/files/patch-Makefile index 7bda4ae..8ebe30a 100644 --- a/math/ump/files/patch-Makefile +++ b/math/ump/files/patch-Makefile @@ -20,7 +20,7 @@ FLAGS += -DPLOT_3D ## You might have to change this path -GL_LIB = -lGL -lGLU -L/usr/X11/lib -+GL_LIB = -lGL -lGLU -L$(X11BASE)/lib ++GL_LIB = -lGL -lGLU -L$(LOCALBASE)/lib ## The next path will be required on some Mac-systems to compile ##FLAGS += -I/usr/X11/include/GL @@ -42,7 +42,7 @@ +FLAGS += -DDONT_HAVE_LOG2 +## X11 includes -+FLAGS += -I$(X11BASE)/include ++FLAGS += -I$(LOCALBASE)/include ## If you'd like to compile with debuging info avaliable ##FLAGS += -ggdb diff --git a/math/vtk/Makefile b/math/vtk/Makefile index e7ec8ec..785e5a0 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -56,7 +56,7 @@ BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data USE_GMAKE= yes USE_GL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated diff --git a/math/wingz/Makefile b/math/wingz/Makefile index 9355b43..87501eb 100644 --- a/math/wingz/Makefile +++ b/math/wingz/Makefile @@ -18,7 +18,7 @@ COMMENT= A Commercial Spreadsheet ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_WRKSUBDIR= yes diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile index 83ab6bd..f0903da 100644 --- a/math/wingz3/Makefile +++ b/math/wingz3/Makefile @@ -20,17 +20,17 @@ NO_PACKAGE= "nothing to build. commercial software" ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes # XXX: this is missing "${BRANDELF} -t Linux <executables>" do-install: - ${TAR} -xzp -C ${X11BASE} -f ${DISTDIR}/${DISTFILES} - ${SED} 's%_X11BASE_%${X11BASE}%' \ + ${TAR} -xzp -C ${LOCALBASE} -f ${DISTDIR}/${DISTFILES} + ${SED} 's%_LOCALBASE_%${LOCALBASE}%' \ < ${FILESDIR}/Wingz3 \ - > ${X11BASE}/bin/Wingz3 - ${CHMOD} 755 ${X11BASE}/bin/Wingz3 + > ${LOCALBASE}/bin/Wingz3 + ${CHMOD} 755 ${LOCALBASE}/bin/Wingz3 .include <bsd.port.mk> diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile index bdd780a..4548fd7 100644 --- a/math/wmcalc/Makefile +++ b/math/wmcalc/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmcalc PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math windowmaker MASTER_SITES= http://members.cox.net/ehf_dockapps/wmcalc/ \ ${MASTER_SITE_LOCAL} @@ -18,8 +18,7 @@ COMMENT= Simple dockable calculator ALL_TARGET= clean wmcalc PLIST_FILES= bin/wmcalc -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmcalc ${PREFIX}/bin diff --git a/math/wmcalc/files/patch-aa b/math/wmcalc/files/patch-aa index 81c8b6c..115d5bd 100644 --- a/math/wmcalc/files/patch-aa +++ b/math/wmcalc/files/patch-aa @@ -3,8 +3,8 @@ @@ -1,15 +1,15 @@ -INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11 -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib -+INCLUDES =-I${X11BASE}/include -I${X11BASE}/include/X11 -+LIBINC =-L${X11BASE}/lib ++INCLUDES =-I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ++LIBINC =-L${LOCALBASE}/lib LIBS = -lX11 -lXpm -lXext -lm TARGET = wmcalc diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile index 3d059a3..74976a4 100644 --- a/math/xgfe/Makefile +++ b/math/xgfe/Makefile @@ -7,7 +7,7 @@ PORTNAME= xgfe PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_TEX_CTAN} MASTER_SITE_SUBDIR= graphics/gnuplot/contrib @@ -18,7 +18,6 @@ COMMENT= An X11 front-end for Gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot USE_QT_VER= 3 -USE_X_PREFIX= yes MAKE_ENV+= DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \ PTHREAD_LIBS="$(PTHREAD_LIBS)" QT_PREFIX="${QT_PREFIX}" diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa index 41d2704..fa5c9ea 100644 --- a/math/xgfe/files/patch-aa +++ b/math/xgfe/files/patch-aa @@ -11,12 +11,12 @@ +#CC = gcc +CXXFLAGS += ${PTHREAD_CFLAGS} +QTDIR = $(QT_PREFIX) -+INCPATH = -I$(X11BASE)/include ++INCPATH = -I$(LOCALBASE)/include +LINK = $(CXX) LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc -+LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS} ++LIBS = -L$(LOCALBASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS} +MOC = ${QTDIR}/bin/moc ####### Files diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile index 6aa3456..42431c0 100644 --- a/math/xgobi/Makefile +++ b/math/xgobi/Makefile @@ -7,7 +7,7 @@ PORTNAME= xgobi PORTVERSION= 2002.06.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://public.research.att.com/~stat/xgobi/ DISTNAME= xgobi @@ -23,8 +23,7 @@ CONFIGURE_WRKSRC= ${PATCH_WRKSRC} BUILD_WRKSRC= ${PATCH_WRKSRC} USE_IMAKE= true -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm XFREE86_HTML_MAN= no MANCOMPRESSED= no diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index 119c5bf..04090b5 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -7,7 +7,7 @@ PORTNAME= xldlas PORTVERSION= 0.85 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/visualization @@ -20,8 +20,6 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms WRKSRC= ${WRKDIR}/xldlas -USE_X_PREFIX= yes - MAN1= xldlas.1 do-install: diff --git a/math/xldlas/files/patch-aa b/math/xldlas/files/patch-aa index a8cc4e7..6dacb93 100644 --- a/math/xldlas/files/patch-aa +++ b/math/xldlas/files/patch-aa @@ -9,14 +9,14 @@ -COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm -SHAREDLIBS = -lforms -STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a -+.if exists(${X11BASE}/include/X11/forms.h) -+XFORMSINC = -I${X11BASE}/include/X11 ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMSINC = -I${LOCALBASE}/include/X11 +.endif -+CCFLAG = $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(X11BASE)/include ${XFORMSINC} ++CCFLAG = $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(LOCALBASE)/include ${XFORMSINC} +#CC = gcc -+COMMONLIBS = -L$(X11BASE)/lib/ -lX11 -lm ++COMMONLIBS = -L$(LOCALBASE)/lib/ -lX11 -lm +SHAREDLIBS = -lforms -lXpm -+STATICLIBS = $(X11BASE)/lib/libxforms.a -lXpm ++STATICLIBS = $(LOCALBASE)/lib/libxforms.a -lXpm ECHO = echo RM = rm RMOPTS = -f diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile index fa73408..4884565 100644 --- a/math/xlispstat/Makefile +++ b/math/xlispstat/Makefile @@ -7,7 +7,7 @@ PORTNAME= xlispstat PORTVERSION= 3.52.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math lang lisp MASTER_SITES= ftp://ftp.stat.umn.edu/pub/xlispstat/current/ \ http://lib.stat.cmu.edu/xlispstat/Src/current/ \ @@ -19,9 +19,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g} MAINTAINER= ports@FreeBSD.org COMMENT= A statistics/X11 based lisp interpreter -USE_XLIB= yes GNU_CONFIGURE= yes ALL_TARGET= ${PORTNAME} +USE_XORG= x11 post-patch: @${REINPLACE_CMD} '/^static double fmax/d' ${WRKSRC}/lowess.c diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile index 6756fff..0603bfd 100644 --- a/math/xppaut/Makefile +++ b/math/xppaut/Makefile @@ -7,7 +7,7 @@ PORTNAME= xppaut PORTVERSION= 5.96 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://www.math.pitt.edu/~bard/bardware/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -16,8 +16,7 @@ MAINTAINER= stephen@math.missouri.edu COMMENT= Graphical tool for solving differential equations, etc MAN1= xppaut.1 -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xproto MAKE_ARGS= CC="${CC}" WRKSRC= ${WRKDIR} diff --git a/math/xppaut/files/patch-Makefile b/math/xppaut/files/patch-Makefile index 9493e11..b3ca7e0 100644 --- a/math/xppaut/files/patch-Makefile +++ b/math/xppaut/files/patch-Makefile @@ -17,11 +17,11 @@ # Standard Linux distributions # ################################## -CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include -+CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(X11BASE)/include ++CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(LOCALBASE)/include #CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include -LDFLAGS= -L/usr/X11R6/lib -LIBS= -lX11 -lm -ldl -+LDFLAGS= -L$(X11BASE)/lib ++LDFLAGS= -L$(LOCALBASE)/lib +LIBS= -lX11 -lm # NOTE: Recent (RedHat 8) versions of GCC seem to no longer have # the integer errno, so compile with the -DNOERRNO option as well diff --git a/math/xspread/Makefile b/math/xspread/Makefile index 1bb0f2f..2461dd3 100644 --- a/math/xspread/Makefile +++ b/math/xspread/Makefile @@ -7,7 +7,7 @@ PORTNAME= xspread PORTVERSION= 3.1.1c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= # disappeared DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -17,10 +17,9 @@ COMMENT= A spreadsheet program for X and terminals WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig -USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= xspread.1 pxspread.1 diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 5d760d0..fe6263c 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= X11 "Build with X11 features" off \ GMP "Use libgmp for arbitrary precision arithmetic" off @@ -51,8 +51,8 @@ PLIST_SUB+= GMP="@comment " NOGMP="" USE_GL= yes CONFIGURE_ARGS+= --with-x PLIST_SUB+= X11="" -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11="@comment " diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd index 948ca8f..379dae4 100644 --- a/mbone/imm/files/Makefile.freebsd +++ b/mbone/imm/files/Makefile.freebsd @@ -1,11 +1,11 @@ # Some versions of make, like SGI's, use the following variable to # determine which shell to use for executing commands: SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include +INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include # Libraries to use when linking: LIBS = -lm -TKLIBS= -L${X11BASE}/lib -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 +TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 TARGET = ../freebsd diff --git a/mbone/mcl/Makefile b/mbone/mcl/Makefile index 259be87..d087695 100644 --- a/mbone/mcl/Makefile +++ b/mbone/mcl/Makefile @@ -16,11 +16,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \ +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ gdome-config:${PORTSDIR}/textproc/gdome2 \ glib-gettextize:${PORTSDIR}/devel/glib20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile index 2888e9d..d260339 100644 --- a/mbone/nte/Makefile +++ b/mbone/nte/Makefile @@ -7,7 +7,7 @@ PORTNAME= nte PORTVERSION= 1.5a29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mbone tk MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/ @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/nte PLIST_FILES= bin/nte USE_GMAKE= yes -USE_X_PREFIX= yes MAKE_ENV= LOCALBASE="${LOCALBASE}" diff --git a/mbone/nte/files/Makefile.freebsd b/mbone/nte/files/Makefile.freebsd index 1f02b96..d2f6822 100644 --- a/mbone/nte/files/Makefile.freebsd +++ b/mbone/nte/files/Makefile.freebsd @@ -1,7 +1,7 @@ CC=cc -INCLUDES=-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tk8.0/generic -I${X11BASE}/include +INCLUDES=-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include LIB_DIR=${LOCALBASE}/lib -LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11 +LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${LOCALBASE}/lib -lX11 CFLAGS+=-ggdb $(INCLUDES) -DFREEBSD -DPROTOTYPES -DHAVE_NO_VALUES_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H -DMAXINT=INT_MAX -DDEFINED_ERRLIST # for search.h CFLAGS+=-I../src diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index 70db2f2..b750d98 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -19,8 +19,7 @@ USE_TK= yes USE_XORG= x11 xext sm ice USE_AUTOTOOLS= autoconf:213 USE_GMAKE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ - --enable-ipv6 +CONFIGURE_ARGS= --enable-ipv6 MAN1= rat.1 MANCOMPRESSED= no diff --git a/mbone/rat30/files/patch-Makefile_FreeBSD_4 b/mbone/rat30/files/patch-Makefile_FreeBSD_4 index 61d2025..d4a838d 100644 --- a/mbone/rat30/files/patch-Makefile_FreeBSD_4 +++ b/mbone/rat30/files/patch-Makefile_FreeBSD_4 @@ -3,7 +3,7 @@ @@ -0,0 +1,6 @@ +TCL_INC = ${LOCALBASE}/include/tcl8.2 +TK_INC = ${LOCALBASE}/include/tk8.2 -+INCS = -I${X11BASE}/include \ ++INCS = -I${LOCALBASE}/include \ + -I$(TCL_INC)/generic -I$(TK_INC)/generic +LDLIBS = -L${LOCALBASE}/lib \ -+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm ++ -L${LOCALBASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm diff --git a/mbone/relate/files/patch-Makefile b/mbone/relate/files/patch-Makefile index fcc881c..b82c818 100644 --- a/mbone/relate/files/patch-Makefile +++ b/mbone/relate/files/patch-Makefile @@ -8,8 +8,8 @@ + +# for FreeBSD +CC = cc -+LIBFLAGS = -L$(LIBDIR) -L$(X11BASE)/lib -+IFLAGS = -I$(INCDIR)/tk8.2 -I$(INCDIR)/tcl8.2 -I$(X11BASE)/include ++LIBFLAGS = -L$(LIBDIR) -L$(LOCALBASE)/lib ++IFLAGS = -I$(INCDIR)/tk8.2 -I$(INCDIR)/tcl8.2 -I$(LOCALBASE)/include +LIBS = -ltk82 -ltcl82 -lm -lX11 + +TCL_FILES = \ diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile index a78d7fc..b54862f 100644 --- a/mbone/rqm/Makefile +++ b/mbone/rqm/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase WRKSRC= ${WRKDIR}/rqm/ HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${X11BASE} +CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} ALL_TARGET= rqm diff --git a/mbone/rqm/files/patch-aa b/mbone/rqm/files/patch-aa index ba0b3c0..3169756 100644 --- a/mbone/rqm/files/patch-aa +++ b/mbone/rqm/files/patch-aa @@ -18,7 +18,7 @@ FreeBSD ) CC="gcc" WFLAGS=$GCCWFLAGS - INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${PREFIX}/include -I${X11BASE}/include" ++ INCLUDE="-I${LOCALBASE}/include" LDLIBS="-lm" DEBUG="-g" CHAR="-fsigned-char" diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile index 632c47d..7308a60 100644 --- a/mbone/rtpmon/Makefile +++ b/mbone/rtpmon/Makefile @@ -7,7 +7,7 @@ PORTNAME= rtpmon PORTVERSION= 1.0a7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mbone tk MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= fenner @@ -19,7 +19,6 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 USE_AUTOTOOLS= autoconf:261:env GNU_CONFIGURE= yes -USE_X_PREFIX= yes USE_GCC= 3.2 MAN1= rtpmon.1 PLIST_FILES= bin/rtpmon diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index f6bcc8f..7854475 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdr PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ @@ -21,7 +21,6 @@ PLIST_FILES= bin/sdr WRKSRC= ${WRKDIR}/sdr/freebsd HAS_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes post-extract: @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd diff --git a/mbone/sdr/files/Makefile.freebsd b/mbone/sdr/files/Makefile.freebsd index 3039501..34a7a8c 100644 --- a/mbone/sdr/files/Makefile.freebsd +++ b/mbone/sdr/files/Makefile.freebsd @@ -1,6 +1,6 @@ CC = gcc -g -O -fwritable-strings -INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm +INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase +LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD all:: sdr diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index ebffe32..d1026e0 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -7,7 +7,7 @@ PORTNAME= vat PORTVERSION= 4.0b2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mbone tk MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ DISTFILES= vatsrc-4.0b2.tar.gz @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ gsm.1:${GSM_DIR} -USE_X_PREFIX= yes +USE_XORG= x11 USE_AUTOTOOLS= autoconf:213 CONFIGURE_ARGS= --with-gsm=${GSM_WORK} INSTALL_TARGET= install install-man diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index b9a5417..358a578 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -7,7 +7,7 @@ PORTNAME= vic PORTVERSION= 2.8.1.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/ DISTNAME= ${PORTNAME}-2.8ucl1.1.6 @@ -16,15 +16,15 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= MBONE video tool BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat - LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase + USE_TK= yes USE_TK_BUILD= yes USE_AUTOTOOLS= autoconf:213 -USE_X_PREFIX= yes -CONFIGURE_ARGS= -x-libraries=${X11BASE}/lib \ - -x-includes=${X11BASE}/include \ +USE_XORG= xext +CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ + -x-includes=${LOCALBASE}/include \ -without-ucltcl \ -with-tcl=${LOCALBASE} \ -without-ucltk \ diff --git a/mbone/wbd/files/patch-aa b/mbone/wbd/files/patch-aa index b118477..fdc3f89 100644 --- a/mbone/wbd/files/patch-aa +++ b/mbone/wbd/files/patch-aa @@ -40,8 +40,8 @@ +# Uncomment these lines for FreeBSD +CC ?= cc -+LIBFLAGS = -L$(LIBDIR) -L${X11BASE}/lib -+IFLAGS = -I$(INCDIR)/tk8.0 -I$(INCDIR)/tcl8.0 -I${X11BASE}/include ++LIBFLAGS = -L$(LIBDIR) -L${LOCALBASE}/lib ++IFLAGS = -I$(INCDIR)/tk8.0 -I$(INCDIR)/tcl8.0 -I${LOCALBASE}/include +LIBS = -ll -ltk80 -ltcl80 -lm -lX11 + # Tcl initialisation files to be compiled into a C string. diff --git a/mbone/xspeakfree/Makefile b/mbone/xspeakfree/Makefile index d52027c..963575b 100644 --- a/mbone/xspeakfree/Makefile +++ b/mbone/xspeakfree/Makefile @@ -7,7 +7,7 @@ PORTNAME= xspeakfree PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone net audio MASTER_SITES= http://www.liquidx.org/distfiles/ @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ ${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely \ NO_BUILD= yes -USE_X_PREFIX= yes PORTDOCS= BUGS HISTORY INSTALL LICENSE README TODO diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile index 9216db6..9024a70 100644 --- a/misc/alevt/Makefile +++ b/misc/alevt/Makefile @@ -7,7 +7,7 @@ PORTNAME= alevt PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= http://www.goron.de/~froese/alevt/ @@ -17,7 +17,7 @@ COMMENT= X11 teletext decoding and display program OPTIONS= PNG "Export pages as PNG image" on \ SMALLFONT "Use a smaller and thiner font" off -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= alevt.1x alevt-date.1 alevt-cap.1 .include <bsd.port.pre.mk> diff --git a/misc/alevt/files/patch-aa b/misc/alevt/files/patch-aa index 2c32a2d..90d529d 100644 --- a/misc/alevt/files/patch-aa +++ b/misc/alevt/files/patch-aa @@ -19,8 +19,8 @@ +.endif -CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W -+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${X11BASE}/include -I${LOCALBASE}/include -W -+X11_LIBS=-L${X11BASE}/lib -lX11 ++CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${LOCALBASE}/include -W ++X11_LIBS=-L${LOCALBASE}/lib -lX11 EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS) diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 33bc49a..7f29fb4 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 33bc49a..7f29fb4 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 33bc49a..7f29fb4 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 33bc49a..7f29fb4 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile index 5b9271d..d13e2e5 100644 --- a/misc/asbutton/Makefile +++ b/misc/asbutton/Makefile @@ -7,18 +7,17 @@ PORTNAME= asbutton PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://www.tigr.net/afterstep/download/asbutton/ MAINTAINER= ports@FreeBSD.org COMMENT= A dockapp that displays 4 or 9 buttons to run apps of your choice -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xpm ALL_TARGET= asbutton -MAKE_ARGS= INCLUDES="-I${X11BASE}/include/X11 -I${X11BASE}/include" \ - LIBINC="-L${X11BASE}/lib" LIBS="-lm -lX11 -lXpm -lXext" \ +MAKE_ARGS= INCLUDES="-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \ + LIBINC="-L${LOCALBASE}/lib" LIBS="-lm -lX11 -lXpm -lXext" \ CCFLAGS="${CFLAGS}" .include <bsd.port.pre.mk> diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 738ec25..ceb79f8 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -10,7 +10,7 @@ PORTNAME= astrolog PORTVERSION= 5.40 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= misc MASTER_SITES= http://www.astrolog.org/ftp/ephem/:ephem \ http://www.astrolog.org/ftp/:dist @@ -23,7 +23,7 @@ COMMENT= An astrology program for X11 and alpha-numeric terminals USE_ZIP= yes .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 MAKE_ARGS= -DX11 .endif EXTRACT_CMD= ${SH} diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa index 292bf68..0598b08 100644 --- a/misc/astrolog/files/patch-aa +++ b/misc/astrolog/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -lm -lX11 -CFLAGS = -O +.if defined(X11) -+LIBS = -L${X11BASE}/lib -lX11 -lm -+CFLAGS += -DX11 -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" ++LIBS = -L${LOCALBASE}/lib -lX11 -lm ++CFLAGS += -DX11 -I${LOCALBASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" +.else +LIBS = -lm +CFLAGS += -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile index 275bac9..2d62d05 100644 --- a/misc/bdelta/Makefile +++ b/misc/bdelta/Makefile @@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org COMMENT= An advanced delta creator, patcher, and library USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= bin/bdelta \ bin/bpatch \ lib/libbdelta.so diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index a3e1151..b0ce00a 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -67,7 +67,7 @@ PLIST_SUB+= AMD64_ONLY="" AMD64NA="@comment " PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .undef USE_LDCONFIG -INSTALLS_SHLIB= no +USE_LDCONFIG= no .else PLIST_SUB+= AMD64_ONLY="@comment " AMD64NA="" .endif diff --git a/misc/earthview/Makefile b/misc/earthview/Makefile index ee86d80..a85e082 100644 --- a/misc/earthview/Makefile +++ b/misc/earthview/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Produces a view output of an arbitrary region of the Earth USE_XORG= xpm -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= earthview PLIST_FILES= bin/earthview share/earthview/topography/topography.cps \ @@ -29,7 +29,7 @@ PLIST_DIRS= share/earthview/topography share/earthview/population \ post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%CC%%|${CC}|g" \ - -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/Makefile pre-build: diff --git a/misc/earthview/files/patch-Makefile b/misc/earthview/files/patch-Makefile index 8f17805..cfecbaa 100644 --- a/misc/earthview/files/patch-Makefile +++ b/misc/earthview/files/patch-Makefile @@ -11,7 +11,7 @@ earthview: earthview.c - gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2 -+ %%CC%% %%CFLAGS%% -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L%%X11BASE%%/lib -lX11 -lm -lz -lbz2 ++ %%CC%% %%CFLAGS%% -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L%%LOCALBASE%%/lib -lX11 -lm -lz -lbz2 install: install -c -s earthview $(BINDIR) diff --git a/misc/estic/files/patch-estic-freebsd-x.mak b/misc/estic/files/patch-estic-freebsd-x.mak index 4ae9076..4582aa7 100644 --- a/misc/estic/files/patch-estic-freebsd-x.mak +++ b/misc/estic/files/patch-estic-freebsd-x.mak @@ -12,7 +12,7 @@ INCDIR = ../spunk -CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(LOCALBASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ @@ -34,7 +34,7 @@ xestic: $(LIB) $(OBJS) - $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11 -+ $(CC) -L $(X11BASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11 ++ $(CC) -L $(LOCALBASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11 # ------------------------------------------------------------------------------ diff --git a/misc/estic/files/patch-spunk-freebsd-x.mak b/misc/estic/files/patch-spunk-freebsd-x.mak index 7cf9d00..2ee6263 100644 --- a/misc/estic/files/patch-spunk-freebsd-x.mak +++ b/misc/estic/files/patch-spunk-freebsd-x.mak @@ -9,7 +9,7 @@ # Flags for the gnu compiler -CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(LOCALBASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip @@ -20,7 +20,7 @@ -xresed: $(LIB) $(RESEDITOBJS) - $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11 +resed: $(LIB) $(RESEDITOBJS) -+ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(X11BASE)/lib -lX11 ++ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(LOCALBASE)/lib -lX11 lib: $(LIB) diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile index 80801f2..54590ab 100644 --- a/misc/explosions/Makefile +++ b/misc/explosions/Makefile @@ -7,7 +7,7 @@ PORTNAME= explosions PORTVERSION= 0.2005.07.31 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= ftp://ftp.billsgames.com/unix/x/explosions/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//} @@ -18,7 +18,6 @@ COMMENT= 3D objects flying around resembling explosions with various effects USE_SDL= sdl image USE_GMAKE= yes USE_PERL5_BUILD=yes -USE_X_PREFIX= yes post-patch: @${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \ diff --git a/misc/fcalc/Makefile b/misc/fcalc/Makefile index 3fc8dda..1204695 100644 --- a/misc/fcalc/Makefile +++ b/misc/fcalc/Makefile @@ -7,7 +7,7 @@ PORTNAME= fcalc PORTVERSION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ DISTNAME= ${PORTNAME}-tcl @@ -18,7 +18,7 @@ COMMENT= F/Calc is a calculator for photographic formulas RUN_DEPENDS= ${LOCALBASE}/lib/tix8.1/Tix.tcl:${PORTSDIR}/x11-toolkits/tix NO_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_TK_RUN= 84 WRKSRC= ${WRKDIR}/${PORTNAME}-1.00 diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile index c76c778..3fa47f7 100644 --- a/misc/firestring/Makefile +++ b/misc/firestring/Makefile @@ -17,7 +17,7 @@ COMMENT= A library to make string handling easier in C USE_BZIP2= yes HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/misc/floatator/Makefile b/misc/floatator/Makefile index 0f3dcd7..368a2e7 100644 --- a/misc/floatator/Makefile +++ b/misc/floatator/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_MOTIF= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNDEBUG" \ - X11INCLUDE="-I${X11BASE}/include" X11LIB="-L${X11BASE}/lib" + X11INCLUDE="-I${LOCALBASE}/include" X11LIB="-L${LOCALBASE}/lib" PLIST_FILES= bin/floatator bin/floatator_X_interface do-install: diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile index f84d8fa..9448dd2 100644 --- a/misc/flyway/Makefile +++ b/misc/flyway/Makefile @@ -8,7 +8,7 @@ PORTNAME= flyway PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc python geography MASTER_SITES= http://www.bellz.org/flyway/ @@ -18,7 +18,6 @@ COMMENT= A VFR/IFR Route Planner for Pilots BUILD_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt RUN_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt -USE_X_PREFIX= yes USE_PYTHON= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/FlyWay diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile index 7b09912..06e76a1 100644 --- a/misc/gkrellm-gamma/Makefile +++ b/misc/gkrellm-gamma/Makefile @@ -7,16 +7,17 @@ PORTNAME= gkrellm-gamma PORTVERSION= 2.03 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/gamma/dist/ MAINTAINER= pav@FreeBSD.org COMMENT= XFree86 gamma correction plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 +USE_XORG= x11 xxf86vm PLIST_FILES= libexec/gkrellm2/plugins/gamma.so MAKE_ENV= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins ALL_TARGET= gamma.so diff --git a/misc/gkrellm-gamma/files/patch-Makefile b/misc/gkrellm-gamma/files/patch-Makefile index 846399f..c907dd6 100644 --- a/misc/gkrellm-gamma/files/patch-Makefile +++ b/misc/gkrellm-gamma/files/patch-Makefile @@ -5,7 +5,7 @@ CFLAGS ?= -O -g CFLAGS += $(FLAGS) -LIBS = -L/usr/X11R6/lib $(GTK_LIB) -+LIBS = -L${X11BASE}/lib $(GTK_LIB) -lXxf86vm ++LIBS = -L${LOCALBASE}/lib $(GTK_LIB) -lXxf86vm LFLAGS = -shared CC ?= gcc INSTALL = install -c diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile index 9764641..2c2d420 100644 --- a/misc/gkrellm-helium/Makefile +++ b/misc/gkrellm-helium/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org COMMENT= GKrellM plugin reading data from helium thermometer at Strahov, Prague -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile index 1974f17..4ca5a14 100644 --- a/misc/gkrellm-xkb/Makefile +++ b/misc/gkrellm-xkb/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/xkb/dist/ MAINTAINER= pav@FreeBSD.org COMMENT= X keyboard layout plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/xkb.so diff --git a/misc/gkrellmbgchg/Makefile b/misc/gkrellmbgchg/Makefile index 20b74b0..efc27bf 100644 --- a/misc/gkrellmbgchg/Makefile +++ b/misc/gkrellmbgchg/Makefile @@ -14,10 +14,9 @@ MASTER_SITES= http://www.bender-suhl.de/stefan/comp/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM, which changes the desktop's background image -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -USE_X_PREFIX= yes USE_GNOME= imlib PLIST_FILES= libexec/gkrellm/plugins/gkrellmbgchg.so diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile index 504cfc1a..05275ed 100644 --- a/misc/gkrellmbgchg2/Makefile +++ b/misc/gkrellmbgchg2/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.bender-suhl.de/stefan/comp/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM, which changes the desktop's background image -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile index 19feab7..3d6e192 100644 --- a/misc/gkrellmfmonitor/Makefile +++ b/misc/gkrellmfmonitor/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM FMonitor plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/fmonitor.so diff --git a/misc/gkrellmfmonitor2/Makefile b/misc/gkrellmfmonitor2/Makefile index 1ff41a0..9d6f63d 100644 --- a/misc/gkrellmfmonitor2/Makefile +++ b/misc/gkrellmfmonitor2/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM FMonitor plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 LATEST_LINK= gkrellmfmonitor2 diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile index 03059b9..e5482e0 100644 --- a/misc/gkrellmlaunch/Makefile +++ b/misc/gkrellmlaunch/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= An application launcher plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/gkrellmlaunch.so diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile index 162352a..63e46fd 100644 --- a/misc/gkrellmlaunch2/Makefile +++ b/misc/gkrellmlaunch2/Makefile @@ -9,14 +9,13 @@ PORTNAME= gkrellmlaunch PORTVERSION= 0.5 PORTREVISION= 3 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= 2 MAINTAINER= hideo@lastamericanempire.com COMMENT= An application launcher plugin for GKrellM2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/gkrellmlaunch.so diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile index cbc980d..7dc82b9 100644 --- a/misc/gkrellshoot/Makefile +++ b/misc/gkrellshoot/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= elitetek@tekrealm.net COMMENT= A screen locking and screen capture plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \ import:${PORTSDIR}/graphics/ImageMagick diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile index fb1ac70..84f5f38 100644 --- a/misc/gkrellweather2/Makefile +++ b/misc/gkrellweather2/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org COMMENT= GKrellWeather is a weather plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes diff --git a/misc/gkx86info/Makefile b/misc/gkx86info/Makefile index 58c2150..e92941c 100644 --- a/misc/gkx86info/Makefile +++ b/misc/gkx86info/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that simply prints the current clock speed -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm ONLY_FOR_ARCHS= i386 diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile index b026063..3e52e8d 100644 --- a/misc/gkx86info2/Makefile +++ b/misc/gkx86info2/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://anchois.free.fr/ \ MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that simply prints the current clock speed -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 ONLY_FOR_ARCHS= i386 diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile index 2106620..2d8ec33 100644 --- a/misc/gnome-osd/Makefile +++ b/misc/gnome-osd/Makefile @@ -7,14 +7,13 @@ PORTNAME= gnome-osd DISTVERSION= 0.11.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/ MAINTAINER= ports@FreeBSD.org COMMENT= An On-Screen-Display infrastructure using Pango text rendering -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 USE_PYTHON= yes USE_GMAKE= yes diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index cafe1e6..ba7b72c 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-user-docs PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +21,6 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes diff --git a/misc/goblin/Makefile b/misc/goblin/Makefile index 3857c72..d7301ac 100644 --- a/misc/goblin/Makefile +++ b/misc/goblin/Makefile @@ -8,7 +8,7 @@ PORTNAME= goblin PORTVERSION= 2.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://www.math.uni-augsburg.de/~fremuth/goblin.docs/ \ ${MASTER_SITE_LOCAL} @@ -23,6 +23,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 CONFLICTS= ImageMagick-[0-9]* display-* +USE_XORG= x11 USE_GMAKE= yes USE_GCC= 3.2 MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ @@ -32,9 +33,9 @@ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ ALL_TARGET= all goblin.a glpk.a PLIST_SUB+= VERSION=${PORTVERSION:R} -CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 \ - -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/ \ + ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} WISH= ${LOCALBASE}/bin/wish8.3 diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile index b4f306f..c6c7578 100644 --- a/misc/gplbp/Makefile +++ b/misc/gplbp/Makefile @@ -7,7 +7,7 @@ PORTNAME= gplbp PORTVERSION= 0.92 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= ftp://ftp.stampede.org/skibum/gplbp/ \ http://freebsd.unixfreunde.de/sources/ @@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.stampede.org/skibum/gplbp/ \ MAINTAINER= ports@FreeBSD.org COMMENT= GNOME Pilot Logbook application -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile index 33cef33..606f598 100644 --- a/misc/gregexp/Makefile +++ b/misc/gregexp/Makefile @@ -8,7 +8,7 @@ PORTNAME= gregexp PORTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MASTER_SITES= http://dentrassi.de/download/gregexp/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -18,7 +18,6 @@ COMMENT= A graphical regular expression explorer LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre -USE_X_PREFIX= yes USE_GNOME= gnomeprefix libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index cb5ad31..3b898f3 100644 --- a/misc/gtkfind/Makefile +++ b/misc/gtkfind/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkfind PORTVERSION= 1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_BACKUP} @@ -17,7 +17,6 @@ COMMENT= The program to use to have to remember all the options to find(1) BUILD_DEPENDS= appres:${PORTSDIR}/x11/appres \ xterm:${PORTSDIR}/x11/xterm -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile index 09b4d28a..8d6842b 100644 --- a/misc/gtktalog/Makefile +++ b/misc/gtktalog/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtktalog PORTVERSION= 1.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,6 @@ BUILD_DEPENDS= plaympeg:${PORTSDIR}/multimedia/smpeg RUN_DEPENDS= plaympeg:${PORTSDIR}/multimedia/smpeg USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index 74a90d4..95473c3 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -6,7 +6,7 @@ PORTNAME= hotkeys PORTVERSION= 0.5.7.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= http://ypwong.org/hotkeys/${PORTVERSION}/ \ ${MASTER_SITE_XCONTRIB} @@ -20,10 +20,9 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \ --with-db3-lib=${BDB_LIB_DIR} \ - --with-db-name=${BDB_LIB_NAME} \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib + --with-db-name=${BDB_LIB_NAME} +USE_XORG= x11 xkbfile xmu GNU_CONFIGURE= yes USE_BDB= yes USE_GMAKE= yes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 3f23b4d..b3032c5 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index 3f23b4d..b3032c5 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index 9fd873f..ca5509a 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -9,8 +9,7 @@ PORTNAME= krecipes PORTVERSION= 0.9.1 PORTREVISION= 1 CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks @@ -31,13 +30,13 @@ USE_SQLITE= yes .endif .if defined(WITH_MYSQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRESQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .else CONFIGURE_ARGS+= --without-postgresql .endif diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile index 9fd873f..ca5509a 100644 --- a/misc/krecipes/Makefile +++ b/misc/krecipes/Makefile @@ -9,8 +9,7 @@ PORTNAME= krecipes PORTVERSION= 0.9.1 PORTREVISION= 1 CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks @@ -31,13 +30,13 @@ USE_SQLITE= yes .endif .if defined(WITH_MYSQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRESQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .else CONFIGURE_ARGS+= --without-postgresql .endif diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index fac7b43..740054c 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -26,7 +26,7 @@ SUB_LIST= LDCONFIG_DIR=${LDCONFIG_DIR} \ LDCONFIG32_DIR=${LDCONFIG32_DIR} .if !defined(WITHOUT_X11) -LOCAL_PREFIXES= ${PREFIX} ${X11BASE} +LOCAL_PREFIXES= ${PREFIX} ${LOCALBASE} .else LOCAL_PREFIXES= ${PREFIX} .endif diff --git a/misc/ldconfig_compat/files/ldconfig_compat.sh.in b/misc/ldconfig_compat/files/ldconfig_compat.sh.in index a489903..1c3fe81 100644 --- a/misc/ldconfig_compat/files/ldconfig_compat.sh.in +++ b/misc/ldconfig_compat/files/ldconfig_compat.sh.in @@ -15,8 +15,8 @@ start_cmd="ldconfig_start" stop_cmd=":" load_rc_config $name -: ${ldconfig_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%X11BASE%%/%%LDCONFIG_DIR%%"} -: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%X11BASE%%/%%LDCONFIG32_DIR%%"} +: ${ldconfig_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%LOCALBASE%%/%%LDCONFIG_DIR%%"} +: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%LOCALBASE%%/%%LDCONFIG32_DIR%%"} ldconfig_start() { diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile index ad650f9..5a89766 100644 --- a/misc/libpri-bristuff/Makefile +++ b/misc/libpri-bristuff/Makefile @@ -22,7 +22,7 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= A C implementation of the Primary Rate ISDN specification USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/misc/mc/Makefile b/misc/mc/Makefile index e841a6d..56ae36f 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -64,7 +64,7 @@ _MANLANG= es hu it pl ru.KOI8-R sr .if !defined(WITH_X11) || defined(MINIMAL) CONFIGURE_ARGS+=--without-x .else -USE_XLIB= yes +USE_XORG= x11 xext .endif .if !defined(WITH_EDIT) && (defined(WITHOUT_EDIT) || defined(MINIMAL)) diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile index befd4e5..ed4369e 100644 --- a/misc/menushki/Makefile +++ b/misc/menushki/Makefile @@ -7,18 +7,16 @@ PORTNAME= menushki PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Menu converter between varieties of Window Managers -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XLIB= yes USE_GCC= 2.95 PLIST_FILES= bin/menushki diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile index 6505db4..9ccd8d0 100644 --- a/misc/misterproper/Makefile +++ b/misc/misterproper/Makefile @@ -7,16 +7,14 @@ PORTNAME= misterproper PORTVERSION= 0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF #ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \ -MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A GNOME application designed to manage cyclic tasks -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile index 694ceb4..8eca0f1 100644 --- a/misc/opencyc/Makefile +++ b/misc/opencyc/Makefile @@ -9,15 +9,14 @@ PORTNAME= opencyc PORTVERSION= 0.7.0 PORTREVISION= 3 CATEGORIES= misc linux -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= General knowledge base and commonsense reasoning engine USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/misc/pspresent/Makefile b/misc/pspresent/Makefile index 09941cd..6b43b2b 100644 --- a/misc/pspresent/Makefile +++ b/misc/pspresent/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/pspresent MAN1= pspresent.1 post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|' ${WRKSRC}/Makefile do-install: @${INSTALL_PROGRAM} ${WRKSRC}/pspresent ${PREFIX}/bin diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile index 74204ef..1b836d5 100644 --- a/misc/py-osd/Makefile +++ b/misc/py-osd/Makefile @@ -28,7 +28,7 @@ PORTDOCS= AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile index 346bd32..b17476b 100644 --- a/misc/quick-lounge-applet/Makefile +++ b/misc/quick-lounge-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= quick-lounge-applet PORTVERSION= 2.12.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -18,7 +18,6 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= Applet to orginize your preferred applications on the GNOME Panel USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile index d2c4c4e..3c90a84 100644 --- a/misc/snowflake/Makefile +++ b/misc/snowflake/Makefile @@ -7,7 +7,7 @@ PORTNAME= snowflake PORTVERSION= 0.01a -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -18,7 +18,6 @@ COMMENT= A snowflake image generator WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig PLIST_FILES= bin/snowflake -USE_X_PREFIX= yes USE_GNOME= gtk12 MAKE_ARGS= CC="${CC} ${CFLAGS}" diff --git a/misc/sonytv/Makefile b/misc/sonytv/Makefile index 0a6a98e..45639d8 100644 --- a/misc/sonytv/Makefile +++ b/misc/sonytv/Makefile @@ -7,7 +7,7 @@ PORTNAME= sonytv PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc tk MASTER_SITES= http://tools.ana.com/demos/ @@ -16,8 +16,6 @@ COMMENT= Sony-compatible TV remote RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 -USE_X_PREFIX= yes - NO_BUILD= yes IS_INTERACTIVE= yes diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile index a7023a8..d1f318d 100644 --- a/misc/terraform/Makefile +++ b/misc/terraform/Makefile @@ -8,17 +8,16 @@ PORTNAME= terraform PORTVERSION= 0.9.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Interactive height field generation and manipulation program BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio -USE_X_PREFIX= yes +USE_XORG= x11 USE_BISON= build USE_GNOME= gnomeprefix gnomehack gnomeprint USE_GMAKE= yes diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 85b5a31..6407d9a 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -23,8 +23,8 @@ USE_GMAKE= yes MAKE_ARGS= WISH="${PREFIX}/bin/wish8.4" \ texinfodir="${PREFIX}/${INFO_PATH}" \ gzgrep="\"/usr/bin/zgrep -E\"" \ - mastermen="\"/usr/share/man ${PREFIX}/man ${X11BASE}/man\"" \ - masterbin="\"/usr/bin ${PREFIX}/bin ${X11BASE}/bin\"" \ + mastermen="\"/usr/share/man ${PREFIX}/man ${LOCALBASE}/man\"" \ + masterbin="\"/usr/bin ${PREFIX}/bin ${LOCALBASE}/bin\"" \ manformat="{groff -Tlatin1 -te -mandoc}" \ manprint="{groff -mandoc -Tps -te -l}" diff --git a/misc/translator/Makefile b/misc/translator/Makefile index e76e949..21c3747 100644 --- a/misc/translator/Makefile +++ b/misc/translator/Makefile @@ -7,7 +7,7 @@ PORTNAME= translator PORTVERSION= 0.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://jodrell.net/files/attic/translator/ @@ -19,7 +19,6 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 ${SITE_PERL}/${PERL_ARCH}/Gnome2/GConf.pm:${PORTSDIR}/devel/p5-Gnome2-GConf \ ${SITE_PERL}/WWW/Babelfish.pm:${PORTSDIR}/www/p5-WWW-Babelfish -USE_X_PREFIX= yes USE_PERL5= 5.8.0+ NO_BUILD= yes diff --git a/misc/videotext/files/patch-ba b/misc/videotext/files/patch-ba index 4f95ae6..85b5d5a 100644 --- a/misc/videotext/files/patch-ba +++ b/misc/videotext/files/patch-ba @@ -35,8 +35,8 @@ -INCLUDEDIRS = -I/usr/openwin/include -I/usr/X11R6/include -LIBDIRS = -L/usr/openwin/lib -L/usr/X11R6/lib -+INCLUDEDIRS = -I${X11BASE}/include -+LIBDIRS = -L${X11BASE}/lib ++INCLUDEDIRS = -I${LOCALBASE}/include ++LIBDIRS = -L${LOCALBASE}/lib -CC = gcc -CCFLAGS = -O2 -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile index dbdc436..b97f4a0 100644 --- a/misc/wmScoreBoard/Makefile +++ b/misc/wmScoreBoard/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmScoreBoard PORTVERSION= 0.30 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pat @@ -19,8 +19,7 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm post-install: .ifndef(NOPORTDOCS) diff --git a/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile b/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile index e497816..1ea667d 100644 --- a/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile +++ b/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile @@ -9,8 +9,8 @@ -LIBDIR = -L/usr/X11R6/lib -DESTDIR = /usr/X11R6 +CFLAGS += -g -Wall -+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +DESTDIR = $(PREFIX) # for linux diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile index 7421e53..c30d2c7 100644 --- a/misc/wmcalendar/Makefile +++ b/misc/wmcalendar/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= bin/wmCalendar post-patch: ${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ - -e 's#/usr/X11R6#${X11BASE}#g' \ + -e 's#/usr/X11R6#${LOCALBASE}#g' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmCalendar ${PREFIX}/bin diff --git a/misc/wmfirew/Makefile b/misc/wmfirew/Makefile index edf7de0..8b36315 100644 --- a/misc/wmfirew/Makefile +++ b/misc/wmfirew/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmfirew PORTVERSION= 0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://web.novalis.org/programs/ @@ -17,8 +17,7 @@ COMMENT= A dockapp that shows fireworks in action PLIST_FILES= bin/wmfirew WRKSRC= ${WRKDIR}/${PORTNAME}.app/${PORTNAME} USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/misc/wmfirew/files/patch-Makefile b/misc/wmfirew/files/patch-Makefile index ccb43e8..0f086a3 100644 --- a/misc/wmfirew/files/patch-Makefile +++ b/misc/wmfirew/files/patch-Makefile @@ -9,8 +9,8 @@ $FreeBSD$ -OBJS = wmfirew.o ../wmgeneral/wmgeneral.o +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 +OBJS = wmfirew.o ../wmgeneral/wmgeneral.o diff --git a/misc/wminfo/Makefile b/misc/wminfo/Makefile index 86cf25c..42b7add 100644 --- a/misc/wminfo/Makefile +++ b/misc/wminfo/Makefile @@ -21,7 +21,7 @@ USE_XORG= xpm post-patch: @${REINPLACE_CMD} -e 's|$$(LIBS)$$|& $$(OBJS)|g' \ - -e 's|/usr/X11R6|$$(X11BASE)|g' \ + -e 's|/usr/X11R6|$$(LOCALBASE)|g' \ -e 's|/share/include|/include|g' \ ${WRKSRC}/Makefile diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile index da75830..a4bc8c3 100644 --- a/misc/wmjulia/Makefile +++ b/misc/wmjulia/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmjulia PORTVERSION= 0.40 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://web.novalis.org/programs/ @@ -17,7 +17,7 @@ COMMENT= A dockapp that creates an animated Julia set PLIST_FILES= bin/wmjulia WRKSRC= ${WRKDIR}/${PORTNAME}.app/${PORTNAME} USE_GMAKE= yes -USE_XPM= xpm xext +USE_XORG= xpm xext do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/misc/wmjulia/files/patch-Makefile b/misc/wmjulia/files/patch-Makefile index 40d5d17..cc43c4b 100644 --- a/misc/wmjulia/files/patch-Makefile +++ b/misc/wmjulia/files/patch-Makefile @@ -9,8 +9,8 @@ $FreeBSD$ -OBJS = wmjulia.o ../wmgeneral/wmgeneral.o +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 -lm +OBJS = wmjulia.o ../wmgeneral/wmgeneral.o diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile index e37d512..0ba00e2 100644 --- a/misc/wmpal/Makefile +++ b/misc/wmpal/Makefile @@ -16,8 +16,8 @@ COMMENT= A one of the most useless dockapps in the world USE_XORG= xpm USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PORTDOCS= README PLIST_FILES= bin/wmpal diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile index b48f3d0..831d3cf 100644 --- a/misc/wmtunlo/Makefile +++ b/misc/wmtunlo/Makefile @@ -7,14 +7,14 @@ PORTNAME= wmtunlo PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker MASTER_SITES= http://clay.ll.pl/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A falling-down-a-tunnel dockapp -USE_X_PREFIX= yes +USE_XORG= x11 xpm xextproto ALL_TARGET= wmtunlo do-install: diff --git a/misc/wmtunlo/files/patch-Makefile b/misc/wmtunlo/files/patch-Makefile index d24a245..2323f55 100644 --- a/misc/wmtunlo/files/patch-Makefile +++ b/misc/wmtunlo/files/patch-Makefile @@ -6,8 +6,8 @@ -INCS = -I/usr/X11R6/include/X11 -LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lXext -lm +CFLAGS += -Wall -+INCS = -I${X11BASE}/include -I${X11BASE}/include/X11 -+LIBS = -L${X11BASE}/lib -lXpm -lX11 -lXext -lm ++INCS = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ++LIBS = -L${LOCALBASE}/lib -lXpm -lX11 -lXext -lm INSTALL_PREFIX = /usr/local diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile index 9be5e17..43dd83a 100644 --- a/misc/wmweather+/Makefile +++ b/misc/wmweather+/Makefile @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes USE_ICONV= yes USE_XORG= xpm -CONFIGURE_ARGS+= --with-libwraster=${X11BASE} +CONFIGURE_ARGS+= --with-libwraster=${LOCALBASE} MAN1= wmweather+.1 diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile index ebfbf2f..aba7d98 100644 --- a/misc/wmweather/Makefile +++ b/misc/wmweather/Makefile @@ -14,12 +14,12 @@ MAINTAINER= kris@FreeBSD.org COMMENT= A WMaker dockapp which displays meteorological data for your city LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl -BUILD_DEPENDS= xmessage:${X_CLIENTS_PORT} -RUN_DEPENDS= xmessage:${X_CLIENTS_PORT} +BUILD_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage +RUN_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_GMAKE= yes USE_XORG= xpm diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile index 9801195..db8a64c 100644 --- a/misc/wmwork/Makefile +++ b/misc/wmwork/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmwork PORTVERSION= 0.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://www.godisch.de/debian/wmwork/ @@ -16,8 +16,7 @@ COMMENT= A dockapp that keeps track of time you have spent on something WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -26,8 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= wmwork.1 PLIST_FILES= bin/wmwork -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmwork ${PREFIX}/bin diff --git a/misc/wmx10/Makefile b/misc/wmx10/Makefile index e0f09f0..26ce6de 100644 --- a/misc/wmx10/Makefile +++ b/misc/wmx10/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmx10 PORTVERSION= 0.03 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc windowmaker MASTER_SITES= http://www.cs.uml.edu/~jhawkins/wmx10/ @@ -16,7 +16,7 @@ COMMENT= Remote control for X10 devices WRKSRC= ${WRKDIR}/wmx10.app/wmx10 -USE_XPM= xpm x11 ice +USE_XORG= xpm x11 ice USE_GMAKE= yes PLIST_FILES= bin/wmx10 diff --git a/misc/wmx10/files/patch-aa b/misc/wmx10/files/patch-aa index e8d848d..0cec3ac 100644 --- a/misc/wmx10/files/patch-aa +++ b/misc/wmx10/files/patch-aa @@ -3,8 +3,8 @@ @@ -1,12 +1,12 @@ -INCDIR = -I/usr/X11R6/include -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 OBJS = br_cmd.o wmx10.o ../wmgeneral/wmgeneral.o -CFLAGS = -D$(shell echo `uname -s`) #-DDEBUG @@ -26,4 +26,4 @@ - strip wmx10 - mv wmx10 /usr/local/bin +install: wmx10 -+ ${BSD_INSTALL_PROGRAM} wmx10 ${X11BASE}/bin ++ ${BSD_INSTALL_PROGRAM} wmx10 ${LOCALBASE}/bin diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index 1a35095..0bbbb62 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -16,15 +16,15 @@ MASTER_SITE_SUBDIR= perky MAINTAINER= perky@FreeBSD.org COMMENT= X On-Screen-Display Library and XMMS plug-in -XMMS_CONFIG?= ${X11BASE}/bin/xmms-config +XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \ - CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \ + CFLAGS='${CFLAGS}' LOCALBASE='${LOCALBASE}' \ GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \ - XMMS_PLUGINDIR=${X11BASE}/lib/xmms + XMMS_PLUGINDIR=${LOCALBASE}/lib/xmms MAN1= osd_cat.1 xosd-config.1 MAN3= xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \ diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile index fc78b33..156708e 100644 --- a/misc/xpns/Makefile +++ b/misc/xpns/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpns PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc cad MASTER_SITES= http://robotics.ee.uwa.edu.au/pns/ftp/ DISTFILES= pns_source.tar.Z @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Petri-Net Simulator for Xwindows NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 xaw MAKEFILE= makefile ALL_TARGET= pns diff --git a/misc/xpns/files/patch-aa b/misc/xpns/files/patch-aa index 761738a..b59bf9c 100644 --- a/misc/xpns/files/patch-aa +++ b/misc/xpns/files/patch-aa @@ -11,10 +11,10 @@ -I = -I/usr/local/X11R5/include - -L = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11 -lm -+I = -I$(X11BASE)/include ++I = -I$(LOCALBASE)/include -+L = -L$(X11BASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm -+L +=-Wl,-rpath,$(X11BASE)/lib ++L = -L$(LOCALBASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm ++L +=-Wl,-rpath,$(LOCALBASE)/lib #------------------------------------------ # COMPILER UND LINKER diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile index 7ccd0f2..53f22a0 100644 --- a/multimedia/avidemux2/Makefile +++ b/multimedia/avidemux2/Makefile @@ -28,10 +28,10 @@ USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15 aclocal:19:env USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gtk20 WANT_SDL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include \ -I${LOCALBASE}/include/a52dec" \ - LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ + LIBFLAGS="-L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} CONFIGURE_ARGS= --disable-warnings \ diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 215995a..919b333 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -49,7 +49,7 @@ VERSION= 0.7 # qt -- USE_QT_VER has to happen befor bsd.port.pre.mk .if !defined(WITHOUT_QT) -. if exists(${X11BASE}/include/qt2/qapp.h) +. if exists(${LOCALBASE}/include/qt2/qapp.h) USE_QT_VER= 2 . else USE_QT_VER= 3 @@ -237,11 +237,11 @@ post-patch: ${WRKSRC}/plugins/libmad/Makefile.in .endif .if !defined(WITHOUT_QT) -. if exists(${X11BASE}/include/qt2/qapp.h) +. if exists(${LOCALBASE}/include/qt2/qapp.h) @${REINPLACE_CMD} -e 's|qt-mt|qt2-mt|' ${WRKSRC}/configure . endif - @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${X11BASE}/include \@QT_CFLAGS\@|; \ - s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${X11BASE}/lib \@QT_LIBS\@|' \ + @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${LOCALBASE}/include \@QT_CFLAGS\@|; \ + s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${LOCALBASE}/lib \@QT_LIBS\@|' \ ${WRKSRC}/libavqt/Makefile.in .endif .if !defined(WITHOUT_XVID) diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index 1507504..1219034 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 0.9.7.1 PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= beepmp +MASTER_SITES= SF/beepmp DISTNAME= bmp-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -19,7 +18,7 @@ COMMENT= GTK2 multimedia player USE_GNOME= gtk20 libglade2 desktopfileutils WANT_GNOME= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 8766341..40c77f7 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.40.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://files.backtrace.info/releases/0.40/ @@ -31,6 +31,7 @@ CONFLICTS= bmpx-devel-[0-9]* USE_AUTOTOOLS= automake:19 autoconf:261 USE_BISON= build +USE_XORG= ice sm USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libglade2 desktopfileutils @@ -46,8 +47,6 @@ CONFIGURE_ARGS+= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib MAN1= beep-media-player-2.1 diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index dca1dbe..6e5aac9 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf:261 libtool:15 libltdl:15 USE_EFL= imlib2 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/gtk12 \ -I${LOCALBASE}/include/gdk-pixbuf-1.0 \ -I${LOCALBASE}/include/glib12" \ diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile index c389bcb..6427a27 100644 --- a/multimedia/dtv/Makefile +++ b/multimedia/dtv/Makefile @@ -7,16 +7,16 @@ PORTNAME= dtv PORTVERSION= 0.50 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/ MAINTAINER= ports@FreeBSD.org COMMENT= A client/server based TV capture/display program -USE_XLIB= yes RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 +USE_XORG= xau x11 xext xxf86dga NOT_FOR_ARCHS= sparc64 post-patch: diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile index 1b02c68..b6345eb 100644 --- a/multimedia/dvd-slideshow/Makefile +++ b/multimedia/dvd-slideshow/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ jhead:${PORTSDIR}/graphics/jhead \ flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \ - ${X11BASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf + ${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1 @@ -78,7 +78,7 @@ PLIST_SUB+= NOPORTDOCS="" post-patch: .for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow @${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \ - s|/usr/share/fonts/|${X11BASE}/lib/X11/fonts/|g ; \ + s|/usr/share/fonts/|${LOCALBASE}/lib/X11/fonts/|g ; \ s|seq |seq2 |g' \ ${WRKSRC}/${FILE} .ifdef(WITH_THEMES) diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index 9abc659..c8fc3f5 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -53,15 +53,15 @@ OPTIONS= MPLAYER "Enable mplayer video playback support" On \ # AUTODETECTION ### -.if exists(${X11BASE}/bin/xmame) && !defined(WITHOUT_MAME) +.if exists(${LOCALBASE}/bin/xmame) && !defined(WITHOUT_MAME) WITH_MAME= YES .endif -.if exists(${X11BASE}/bin/snes9x) && !defined(WITHOUT_SNES9X) +.if exists(${LOCALBASE}/bin/snes9x) && !defined(WITHOUT_SNES9X) WITH_SNES9X= YES .endif -.if exists(${X11BASE}/bin/zsnes) && !defined(WITHOUT_ZSNES) +.if exists(${LOCALBASE}/bin/zsnes) && !defined(WITHOUT_ZSNES) WITH_ZSNES= YES .endif diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index e4c9524..48e7309 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= fxtv PORTVERSION= 1.03 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= rhh @@ -19,8 +19,7 @@ COMMENT= X-based TV Display and Capture Application (for use with bt848 driver) LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xf86vidmodeproto xxf86dga USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile index 3d91d1f..4749166 100644 --- a/multimedia/goggles/Makefile +++ b/multimedia/goggles/Makefile @@ -7,7 +7,7 @@ PORTNAME= goggles PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www.fifthplanet.net/files/ @@ -20,7 +20,7 @@ RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xv pre-everything:: .ifndef(WITH_DVD_DEVICE) @@ -79,8 +79,6 @@ do-build: --prefix=${PREFIX} \ --fox-prefix=${LOCALBASE} \ --ogle-prefix=${LOCALBASE} \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-xv=yes post-build: diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile index 17ca689..7bde9ae 100644 --- a/multimedia/gopchop/Makefile +++ b/multimedia/gopchop/Makefile @@ -10,7 +10,7 @@ PORTNAME= gopchop PORTVERSION= 1.0.0 PORTREVISION= 5 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://outflux.net/unix/software/GOPchop/download/ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= GOPchop-${PORTVERSION} @@ -25,8 +25,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-sdl -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -DHAVE_DECL_GETOPT -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 706f953e..229a270 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -8,6 +8,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg @@ -17,7 +18,6 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams CFLAGS:= ${CFLAGS} -O2 -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index c4f828c..3c5394a 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -56,8 +56,8 @@ USE_AUTOTOOLS= libtool:15 GST_PLUGIN?= base CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile index 8e507bd..6b11d2d 100644 --- a/multimedia/gsubedit/Makefile +++ b/multimedia/gsubedit/Makefile @@ -8,16 +8,14 @@ PORTNAME= GSubEdit PORTVERSION= 0.4.p1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME:L} +MASTER_SITES= SF/${PORTNAME:L} DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME Subtitle Editor is a tool for editing/converting video subtitles -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes diff --git a/multimedia/gtksubtitler/Makefile b/multimedia/gtksubtitler/Makefile index 762673b..c5839c3 100644 --- a/multimedia/gtksubtitler/Makefile +++ b/multimedia/gtksubtitler/Makefile @@ -7,7 +7,7 @@ PORTNAME= GTKsubtitler PORTVERSION= 0.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia gnome MASTER_SITES= http://matrix.kamp.pl/~pawelb/gtksubtitler/download/ DISTNAME= ${PORTNAME}-v${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A small GNOME program for editing and converting subtitles -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomelibs GNU_CONFIGURE= yes diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile index d0a3d23..cd23351 100644 --- a/multimedia/gxanim/Makefile +++ b/multimedia/gxanim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxanim PORTVERSION= 0.50 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://www.rswarren.com/code/ DISTNAME= GXAnim-${PORTVERSION} @@ -21,7 +21,6 @@ PLIST_FILES= bin/gxanim WRKSRC= ${WRKDIR}/gxanim-${PORTVERSION} USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gtk12 .include <bsd.port.mk> diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 1203900..bc34b87c 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= gxine PORTVERSION= 0.5.901 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR= xine @@ -20,11 +21,12 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 gnomehier USE_GMAKE= yes +USE_XORG= x11 xaw ice MAKE_ARGS+= LDFLAGS=-shared-libgcc USE_GCC= 4.2 CNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --without-hal INSTALLS_ICONS= yes diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile index 9e6c5af..2bc2262 100644 --- a/multimedia/helixplayer/Makefile +++ b/multimedia/helixplayer/Makefile @@ -86,7 +86,7 @@ pre-configure: .for cf in ${CF2FIX} ${REINPLACE_CMD} -e "s|%%CC%%|${CC}|;s|%%CFLAGS%%|${CFLAGS}|" \ -e "s|%%CXX%%|${CXX}|;s|%%CXXFLAGS%%|${CXXFLAGS}|" \ - -e "s|/usr/X11R6|${X11BASE}|;s|/usr/local|${LOCALBASE}|" \ + -e "s|/usr/X11R6|${LOCALBASE}|;s|/usr/local|${LOCALBASE}|" \ -e "s|%%PREFIX%%|${PREFIX}|" \ -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|" \ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \ @@ -98,7 +98,7 @@ pre-configure: ${WRKSRC}/player/app/gtk/hxplay .if defined(WITH_PLUGIN) ${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \ - -e 's|"%%GECKO_PREFIX%%/include\(.*\)"|"${LOCALBASE}/include\1", "${X11BASE}/include\1"|' \ + -e 's|"%%GECKO_PREFIX%%/include\(.*\)"|"${LOCALBASE}/include\1"|' \ ${WRKSRC}/player/app/plugin/unix.pcf .endif diff --git a/multimedia/helixplayer/files/msg.withplugin.in b/multimedia/helixplayer/files/msg.withplugin.in index d749736..c8d2a06 100644 --- a/multimedia/helixplayer/files/msg.withplugin.in +++ b/multimedia/helixplayer/files/msg.withplugin.in @@ -7,13 +7,13 @@ to your Mozilla plugins directory, which is usually found at - %%X11BASE%%/lib/mozilla/plugins + %%LOCALBASE%%/lib/mozilla/plugins To use it with Firefox, create the symbolic link to - %%X11BASE%%/lib/firefox/plugins + %%LOCALBASE%%/lib/firefox/plugins E.g. -ln -sf %%PREFIX%%/HelixPlayer/mozilla/nphelix.so %%X11BASE%%/lib/firefox/plugins +ln -sf %%PREFIX%%/HelixPlayer/mozilla/nphelix.so %%LOCALBASE%%/lib/firefox/plugins ================================================================================ diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile index 362588d..5fb1457 100644 --- a/multimedia/jahshaka/Makefile +++ b/multimedia/jahshaka/Makefile @@ -7,10 +7,9 @@ PORTNAME= jahshaka PORTVERSION= 1.9a9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME}fx +MASTER_SITES= SF/${PORTNAME}fx DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,12 +17,10 @@ COMMENT= Video and film composing, editing and special fx system BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \ - glut.4:${PORTSDIR}/graphics/libglut \ freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.9:${PORTSDIR}/graphics/jpeg -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= glut USE_QT_VER= 3 MAKE_ENV= QMAKESPEC=${QMAKESPEC} QTDIR=${QT_PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 019da58..30fc5cd 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,-O2,,g ; \ diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile index 019da58..30fc5cd 100644 --- a/multimedia/k9copy/Makefile +++ b/multimedia/k9copy/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,-O2,,g ; \ diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile index 00bc2fc..e021586 100644 --- a/multimedia/kaffeine-mozilla/Makefile +++ b/multimedia/kaffeine-mozilla/Makefile @@ -8,20 +8,19 @@ PORTNAME= kaffeine-mozilla PORTVERSION= 0.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= kaffeine +MASTER_SITES= SF/kaffeine MAINTAINER= ports@FreeBSD.org COMMENT= Kaffeine Mozilla plugin RUN_DEPENDS= kaffeine:${PORTSDIR}/multimedia/kaffeine -USE_XLIB= yes +USE_XORG= x11 xaw USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" USE_AUTOTOOLS= libtool:15 post-patch: diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index 5865e2b..98bbbc7 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -7,7 +7,7 @@ PORTNAME= kino PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,6 +24,7 @@ RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \ OPTIONS= QUICKTIME "With Quicktime support" off \ FFMPEG_KINO "With ffmpeg-kino" off +USE_XORG= x11 xv ice USE_AUTOTOOLS= autoconf:261 USE_GETTEXT= yes USE_GMAKE= yes @@ -31,9 +32,9 @@ USE_GNOME= gnomehack gnomeprefix libglade2 libxml2 USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \ - -I${LOCALBASE}/include -I${X11BASE}/include" \ + -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib/libquicktime \ - -L${LOCALBASE}/lib -L${X11BASE}/lib" \ + -L${LOCALBASE}/lib" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-dv1394 MAN1= kino.1 kino2raw.1 diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 638c27a..883fb77 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -22,13 +22,13 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GNOME= gnometarget WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gtk-prefix="${X11BASE}" \ - --x-includes="${X11BASE}/include" \ - --x-libraries="${X11BASE}/lib" +CONFIGURE_ARGS= --with-gtk-prefix="${LOCALBASE}" \ + --x-includes="${LOCALBASE}/include" \ + --x-libraries="${LOCALBASE}/lib" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/libdata/pkgconfig -INSTALLS_SHLIB= yes + PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig +USE_LDCONFIG= yes MAN1= dubdv.1 dvconnect.1 encodedv.1 @@ -67,7 +67,7 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${PREFIX}/libdata\2|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \ + @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${LOCALBASE}/lib|; \ /objformat=/s|=.*|=elf|; \ s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile index 12c07a9..4d7a0f9 100644 --- a/multimedia/libdvdcss/Makefile +++ b/multimedia/libdvdcss/Makefile @@ -22,7 +22,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .ifndef(WITH_DOXYGEN) NOPORTDOCS= yes diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile index 4ca7a96..61c3d4d 100644 --- a/multimedia/libdvdnav/Makefile +++ b/multimedia/libdvdnav/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --program-transform-name='' -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 autoconf:261 automake:16 post-patch: diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 0df457a..53d5969 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmpeg2 PORTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://libmpeg2.sourceforge.net/files/ DISTNAME= mpeg2dec-${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= mpeg2dec-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams -USE_XLIB= yes USE_GNOME= gnometarget USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 620ea16..0bda124 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -9,8 +9,7 @@ PORTNAME= libquicktime PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SFE MAINTAINER= multimedia@FreeBSD.org COMMENT= A library for reading and writing quicktime files @@ -22,8 +21,8 @@ USE_GNOME= gnometarget gnomehack pkgconfig USE_XORG= xaw xv USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lintl" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" CONFIGURE_ARGS= --with-x --enable-gpl CFLAGS+= -fPIC MAN1= lqtplay.1 diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index b36d338..21d77fe 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,10 +7,9 @@ PORTNAME= xine PORTVERSION= 1.1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMEPREFIX= lib DISTNAME= ${PORTNAME}-lib-${PORTVERSION} @@ -33,20 +32,19 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ dca.0:${PORTSDIR}/multimedia/libdca USE_BZIP2= yes -USE_GCC= 3.4+ USE_GETTEXT= yes USE_ICONV= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes WANT_GNOME= yes USE_GNOME= gnomehack gnometarget USE_GMAKE= yes -USE_GL= yes +USE_XORG= x11 xv xinerama +USE_GL= gl glu USE_SDL= sdl USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" \ EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm" @@ -125,7 +123,7 @@ CONFIGURE_ARGS+= --without-pulseaudio .endif .if defined(WITH_XVMC) -.if defined(WITH_NVIDIA_GL) || exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) +.if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver .else diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index 54e0f19..c39ae39 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/linux-realplayer/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/l WRKSRC= ${WRKDIR}/usr/local/RealPlayer ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes RESTRICTED= Redistribution not allowed NO_BUILD= yes WANT_GNOME= yes diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile index 7306083..c93f99c 100644 --- a/multimedia/linux-xmovie/Makefile +++ b/multimedia/linux-xmovie/Makefile @@ -9,8 +9,7 @@ PORTNAME= xmovie PORTVERSION= 1.9.8.1 PORTREVISION= 3 CATEGORIES= multimedia linux -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= heroines +MASTER_SITES= SF/heroines PKGNAMEPREFIX= linux- DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm EXTRACT_SUFX= @@ -22,7 +21,7 @@ EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes EXTRACT_CMD= rpm2cpio EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet diff --git a/multimedia/manencode/Makefile b/multimedia/manencode/Makefile index 7031cda6..588e73a 100644 --- a/multimedia/manencode/Makefile +++ b/multimedia/manencode/Makefile @@ -47,7 +47,7 @@ DESKTOP_ENTRIES= "Manencode" \ do-configure: @cd ${WRKSRC} \ && ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC} \ - INCLUDEPATH+=${X11BASE}/include + INCLUDEPATH+=${LOCALBASE}/include pre-install: ${MKDIR} ${MANENCODEDIR}/Interface diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 92a28ee..bdbe64f 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -118,7 +118,7 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${X11BASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index 25ea4d7..bd0a850 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -32,7 +32,7 @@ USE_GSTREAMER= python INSTALLS_EGGINFO= yes BUILD_WRKSRC= ${WRKSRC}/platform/gtk-x11 -MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" +MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" DATADIR= ${PREFIX}/share/${PORTNAME:L} PLIST_SUB= VER=${PORTVERSION} PYTHON_VER=${_PYTHON_VERSION} \ @@ -47,7 +47,7 @@ MANCOMPRESSED= yes pre-configure: .for pyscr in setup.py platform/resources.py ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/share|${PREFIX}/share|g' \ -e 's|/usr/libexec|${PREFIX}/libexec|g' \ -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index e0bf391..3afa76d 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,10 +7,9 @@ PORTNAME= mjpegtools DISTVERSION= 1.9.0rc3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mjpeg +MASTER_SITES= SF/mjpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= Set of tools to record/playback/edit videos in MPEG format @@ -54,7 +53,7 @@ PLIST_SUB+= PNG:="@comment " .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+=--with-x .else CONFIGURE_ARGS+=--without-x diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index 91402a6..c454279 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes post-patch: diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile index 91402a6..c454279 100644 --- a/multimedia/mpeg4ip-libmp4v2/Makefile +++ b/multimedia/mpeg4ip-libmp4v2/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes post-patch: diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile index 652c1c4..ec4a750 100644 --- a/multimedia/mpegedit/Makefile +++ b/multimedia/mpegedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpegedit PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://www.netsw.org/graphic/movie/mpeg/mpegedit/ DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A program to edit encoded mpeg streams LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm -USE_X_PREFIX= yes +USE_XORG= x11 xext USE_GCC= 2.95 PORTDOCS= README manual.ps PLIST_FILES= bin/mpeg_edit diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj index 5f6ad71..2ee226b 100644 --- a/multimedia/mpegedit/files/patch-aj +++ b/multimedia/mpegedit/files/patch-aj @@ -16,7 +16,7 @@ OBJS = main.o globals/version.o ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a - LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm -+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm ++ LIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm # # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) @@ -30,7 +30,7 @@ - -IMpegCodec/encoder -Ieditor -CPPFLAGS = -Wall -pipe -O4 -CFLAGS = -Wall -pipe -O4 -+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include ++ -IMpegCodec/encoder -Ieditor -I$(LOCALBASE)/include +CPPFLAGS = ${CXXFLAGS} +#CFLAGS = -Wall -pipe -O4 SHMEM = -DSH_MEM diff --git a/multimedia/mpegedit/files/patch-ar b/multimedia/mpegedit/files/patch-ar index 0ce8184..04c4c36 100644 --- a/multimedia/mpegedit/files/patch-ar +++ b/multimedia/mpegedit/files/patch-ar @@ -12,7 +12,7 @@ RANLIB = ranlib -INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -+INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(X11BASE)/include ++INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(LOCALBASE)/include DEPFILE = Dependancies SUBDIRS = decoder encoder HEADERS = bstream.H frame.H mpeg.H diff --git a/multimedia/mpegedit/files/patch-au b/multimedia/mpegedit/files/patch-au index f514b16..69f37c8 100644 --- a/multimedia/mpegedit/files/patch-au +++ b/multimedia/mpegedit/files/patch-au @@ -9,7 +9,7 @@ +#CC = gcc +CPP = ${CXX} RANLIB = ranlib -+INCLUDES = -I$(X11BASE)/include ++INCLUDES = -I$(LOCALBASE)/include DEPFILE = Dependencies CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer ANALYSIS = -DANALYSIS diff --git a/multimedia/mpegedit/files/patch-az b/multimedia/mpegedit/files/patch-az index a0a3117..962200f 100644 --- a/multimedia/mpegedit/files/patch-az +++ b/multimedia/mpegedit/files/patch-az @@ -12,7 +12,7 @@ RM = rm -f INCLUDES = -I../globals -I../ui -I../MpegCodec -I../MpegCodec/decoder \ - -I../MpegCodec/encoder -I$(PBMDIR) -+ -I../MpegCodec/encoder -I$(PBMDIR) -I$(X11BASE)/include ++ -I../MpegCodec/encoder -I$(PBMDIR) -I$(LOCALBASE)/include DEPFILE = Dependancies HEADERS = yuv.H 2x2_window.H mono_window.H bw_window.H effects.H \ diff --git a/multimedia/mpegedit/files/patch-ba b/multimedia/mpegedit/files/patch-ba index 041f337..78af815 100644 --- a/multimedia/mpegedit/files/patch-ba +++ b/multimedia/mpegedit/files/patch-ba @@ -8,7 +8,7 @@ +CPP = ${CXX} RANLIB = ranlib RM = rm -f -+INCLUDES = -I../globals -I$(X11BASE)/include ++INCLUDES = -I../globals -I$(LOCALBASE)/include # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 665137d..2acb914 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= High performance media player supporting many formats @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= --disable-freetype .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .else WITHOUT_GUI= yes CONFIGURE_ARGS+=--disable-x11 \ @@ -229,7 +229,7 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${X11BASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 80cdedc..19e20b0 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -147,7 +147,7 @@ CONFIGURE_ARGS+= --disable-speex .if defined(WITH_XANIM) BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim -CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim +CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${LOCALBASE}/lib/X11/xanim .else CONFIGURE_ARGS+=--disable-xanim .endif @@ -272,7 +272,7 @@ CONFIGURE_ARGS+= --disable-win32dll \ .if defined(WITH_REALPLAYER) CONFIGURE_ARGS+= --enable-real \ - --realcodecsdir=${X11BASE}/lib/RealPlayer/codecs + --realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer .else diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 6c2560b..77530be 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -7,10 +7,9 @@ PORTNAME= mplayerxp PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Multi-threaded branch of the well known mplayer media player @@ -24,10 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fon ONLY_FOR_ARCHS= i386 USE_BZIP2= yes -#USE_GNOME= gtk12 -USE_GCC= 3.4+ USE_ICONV= yes -USE_XLIB= yes USE_GMAKE= yes HAS_CONFIGURE= yes WANT_SDL= yes @@ -46,8 +42,8 @@ BROKEN= Does not compile with GCC 4.2 # add this after <bsd.port.pre.mk> so that we inherit /etc/make.conf CONFIGURE_ARGS+= --with-extralibdir=${LOCALBASE}/lib \ --with-extraincdir=${LOCALBASE}/include \ - --with-x11incdir=${X11BASE}/include \ - --with-x11libdir=${X11BASE}/lib \ + --with-x11incdir=${LOCALBASE}/include \ + --with-x11libdir=${LOCALBASE}/lib \ --cc=${CC} \ --prefix=${PREFIX} \ --confdir=${PREFIX}/etc/${PORTNAME} \ diff --git a/multimedia/mplayerxp/files/patch-codecs__common.mak b/multimedia/mplayerxp/files/patch-codecs__common.mak index 61e5eb6..44390ea 100644 --- a/multimedia/mplayerxp/files/patch-codecs__common.mak +++ b/multimedia/mplayerxp/files/patch-codecs__common.mak @@ -5,7 +5,7 @@ ifneq ($(TARGET_OS),WIN32) -LDFLAGS+=-Xlinker -rpath=$(BINDIR) -+LDFLAGS+=-L${LOCALBASE}/lib -L${X11BASE}/lib -Xlinker -rpath=$(BINDIR) ++LDFLAGS+=-L${LOCALBASE}/lib -Xlinker -rpath=$(BINDIR) endif ifeq ($(TARGET_ARCH_SPARC64),yes) diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 964ef09..8108247 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake \ ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \ - ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \ + ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \ wget:${PORTSDIR}/ftp/wget BROKEN= Incorrect handling of user addition diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile index b357670..e67602d 100644 --- a/multimedia/netshow/Makefile +++ b/multimedia/netshow/Makefile @@ -21,7 +21,7 @@ RESTRICTED= "Commercial software" ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes PLIST_FILES= bin/netshow pre-extract: diff --git a/multimedia/nuppelvideo/Makefile b/multimedia/nuppelvideo/Makefile index f692f21..94d8e05 100644 --- a/multimedia/nuppelvideo/Makefile +++ b/multimedia/nuppelvideo/Makefile @@ -27,8 +27,8 @@ USE_GMAKE= yes PORTDOCS= README # find dependencies -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include \ - -L${LOCALBASE}/lib -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include \ + -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile index aa1db61..973a213 100644 --- a/multimedia/nxtvepg/Makefile +++ b/multimedia/nxtvepg/Makefile @@ -9,8 +9,7 @@ PORTNAME= nxtvepg PORTVERSION= 2.7.6 PORTREVISION= 2 CATEGORIES= multimedia tcl tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=${PORTNAME} +MASTER_SITES= SF/${PORTNAME} MAINTAINER= barner@FreeBSD.org COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver) @@ -19,7 +18,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xmu MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} MAN1= nxtvepg.1 @@ -36,9 +35,9 @@ post-patch: .endif post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${X11BASE}/bin - ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${X11BASE}/lib/X11/app-defaults/Nxtvepg - ${INSTALL_MAN} ${WRKSRC}/nxtvepg.1 ${X11BASE}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${LOCALBASE}/bin + ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${LOCALBASE}/lib/X11/app-defaults/Nxtvepg + ${INSTALL_MAN} ${WRKSRC}/nxtvepg.1 ${LOCALBASE}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/multimedia/nxtvepg/files/patch-Makefile b/multimedia/nxtvepg/files/patch-Makefile index 6fe995b..eebd969 100644 --- a/multimedia/nxtvepg/files/patch-Makefile +++ b/multimedia/nxtvepg/files/patch-Makefile @@ -4,8 +4,8 @@ include Makefile.bsd else -+ifndef X11BASE -+ X11BASE=/usr/X11R6 ++ifndef LOCALBASE ++ LOCALBASE=/usr/X11R6 +endif + +ifndef LOCALBASE @@ -13,7 +13,7 @@ +endif + +ifndef PREFIX -+ PREFIX=$(X11BASE) ++ PREFIX=$(LOCALBASE) +endif + ROOT = @@ -23,7 +23,7 @@ bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 -resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = $(ROOT)$(X11BASE)/lib/X11 ++resdir = $(ROOT)$(LOCALBASE)/lib/X11 # if you have perl set the path here, else just leave it alone PERL = /usr/bin/perl diff --git a/multimedia/nxtvepg/files/patch-Makefile.bsd b/multimedia/nxtvepg/files/patch-Makefile.bsd index da5df9b..a8377b1 100644 --- a/multimedia/nxtvepg/files/patch-Makefile.bsd +++ b/multimedia/nxtvepg/files/patch-Makefile.bsd @@ -12,7 +12,7 @@ +mandir = ${prefix}/man/man1 ifeq ($(OS), FreeBSD) -resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = ${X11BASE}/lib/X11 ++resdir = ${LOCALBASE}/lib/X11 else resdir = $(LOCALBASE)/lib/X11 endif diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile index 11f4a3f..cf271fc 100644 --- a/multimedia/ogle-gui/Makefile +++ b/multimedia/ogle-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogle PORTVERSION= 0.9.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia gnome MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ PKGNAMESUFFIX= -gui @@ -22,13 +22,12 @@ LIB_DEPENDS= glade-2.0:${PORTSDIR}/devel/libglade2 \ RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomehack \ gnomehier \ gnomeprefix \ gtk20 WANT_GNOME= yes -USE_XPM= yes +USE_XORG= xpm USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \ diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 72a9dd9..1665c08 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogle PORTVERSION= 0.9.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -21,8 +21,8 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ xml2.5:${PORTSDIR}/textproc/libxml2 USE_AUTOTOOLS= libtool:15 +USE_XORG= x11 xext sm USE_SUBMAKE= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} \ --with-dvdread=${LOCALBASE} \ --with-libmad=${LOCALBASE} \ --with-liba52=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DEFAULT_DVD_DEVICE?= /dev/acd0c @@ -47,7 +47,7 @@ post-patch: @${REINPLACE_CMD} -E -e "s|(DEFAULT_DVD_DEVICE=\")/dev/acd0c(\")|\1${DEFAULT_DVD_DEVICE}\2|" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif - @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/scripts/ogle.in # hack to make ogle work with liba52 + djbfft # CFLAGS safeness @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|; \ diff --git a/multimedia/ogle/files/patch-ogle.in b/multimedia/ogle/files/patch-ogle.in index 513c6eb..b1d9fd1 100644 --- a/multimedia/ogle/files/patch-ogle.in +++ b/multimedia/ogle/files/patch-ogle.in @@ -5,7 +5,7 @@ DVDP_UI=$DVDP_ROOT/ogle_gui$gui_debug else -DVDP_UI=$exec_prefix/bin/ogle_gui$gui_debug -+DVDP_UI=%%X11BASE%%/lib/ogle/ogle_gui$gui_debug ++DVDP_UI=%%LOCALBASE%%/lib/ogle/ogle_gui$gui_debug fi fi export DVDP_UI diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 58843ab..34ccaf6 100644 --- a/multimedia/py-gstreamer/Makefile +++ b/multimedia/py-gstreamer/Makefile @@ -27,8 +27,8 @@ USE_GNOME= pygtk2 gnomehack pkgconfig USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${GST_VERSION}" -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}" post-patch: @${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile index 4607c6e..af58aa0 100644 --- a/multimedia/py-pybmp/Makefile +++ b/multimedia/py-pybmp/Makefile @@ -25,6 +25,6 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes post-extract: - ${SED} -e 's|%%X11BASE%%|${X11BASE}|g' ${FILESDIR}/setup.cfg.port >> ${WRKSRC}/setup.cfg + ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${FILESDIR}/setup.cfg.port >> ${WRKSRC}/setup.cfg .include <bsd.port.mk> diff --git a/multimedia/py-pybmp/files/setup.cfg.port b/multimedia/py-pybmp/files/setup.cfg.port index b1a359a..bfa2f0c 100644 --- a/multimedia/py-pybmp/files/setup.cfg.port +++ b/multimedia/py-pybmp/files/setup.cfg.port @@ -2,5 +2,5 @@ # $FreeBSD$ # [build_ext] -include-dirs=%%X11BASE%%/include -library-dirs=%%X11BASE%%/lib +include-dirs=%%LOCALBASE%%/include +library-dirs=%%LOCALBASE%%/lib diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile index 3713ad5..27b04fc 100644 --- a/multimedia/qdvdauthor/Makefile +++ b/multimedia/qdvdauthor/Makefile @@ -50,7 +50,7 @@ HAS_CONFIGURE= yes USE_QT_VER= 3 QT_NONSTANDARD= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --prefix=${PREFIX} --qt-dir=${X11BASE} --with-qt-lib=qt-mt \ +CONFIGURE_ARGS= --prefix=${PREFIX} --qt-dir=${LOCALBASE} --with-qt-lib=qt-mt \ --build-qslideshow --build-qplayer NO_BUILD= yes diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile index ed9edea..27242e5 100644 --- a/multimedia/quark/Makefile +++ b/multimedia/quark/Makefile @@ -6,7 +6,7 @@ PORTNAME= quark PORTVERSION= 3.21 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia gnome MASTER_SITES= http://quark.sunsite.dk/ \ http://demian.dyndns.org/src/ @@ -16,7 +16,6 @@ COMMENT= An audio player, for geeks, by geeks LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget gnomevfs2 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 577a22d..53043e8 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -7,7 +7,7 @@ PORTNAME= quodlibet PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio python gnome MASTER_SITES= http://www.sacredchao.net/~piman/software/ \ http://www.tortall.net/mirrors/piman-software/ @@ -22,7 +22,6 @@ USE_PYTHON= 2.4+ USE_GNOME= pygtk2 USE_GETTEXT= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GSTREAMER= gconf good python MAN1= exfalso.1 quodlibet.1 @@ -107,7 +106,7 @@ PLIST_SUB+= EXTENSIONS="@comment " .if defined(PACKAGE_BUILDING) 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} .endif do-configure: diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 4c55d57..c16e132 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= smpeg-xmms PORTVERSION= 0.3.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia gnome MASTER_SITES= http://www.xmms.org/files/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/ @@ -20,7 +20,6 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \ xmms.4:${PORTSDIR}/multimedia/xmms PLIST_FILES= lib/xmms/Input/libsmpeg_xmms.so -USE_X_PREFIX= yes USE_SDL= sdl USE_GNOME= gnomehack gtk12 GNU_CONFIGURE= yes @@ -31,7 +30,7 @@ post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/Input do-install: ${MKDIR} ${PREFIX}/lib/xmms/Input ${INSTALL_PROGRAM} \ diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 0453c1a..81d4d0d 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -22,8 +22,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_SDL= sdl USE_LDCONFIG= yes -CONFIGURE_ENV= GLBASE="${X11BASE}" \ - CPPFLAGS="-I${X11BASE}/include" \ +CONFIGURE_ENV= GLBASE="${LOCALBASE}" \ + CPPFLAGS="-I${LOCALBASE}/include" \ CC="${CXX}" REAL_CC="${CC}" #If you want to try the opengl player (which doesn't seem to work) diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile index dfb88e0..1f4358f 100644 --- a/multimedia/subtitleripper/Makefile +++ b/multimedia/subtitleripper/Makefile @@ -55,7 +55,7 @@ post-patch: ${BUILD_WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E \ -e 's|^(DB_PATH[[:space:]]*=).*$$|\1\$${HOME}/.db/|' \ - -e 's|^(IMAGE_VIWER[[:space:]]*=).*$$|\1${X11BASE}/bin/xv|' \ + -e 's|^(IMAGE_VIWER[[:space:]]*=).*$$|\1${LOCALBASE}/bin/xv|' \ -e 's|^(PATH_TO_LANGUAGE_FILTER[[:space:]]*=).*$$|\1${EXAMPLESDIR}/|' \ -e 's|(gocr[[:space:]]+)|${LOCALBASE}/bin/\1|' \ ${WRKSRC}/pgm2txt diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 45a7bd0..4cc1e52 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -8,7 +8,7 @@ PORTNAME= totem PORTVERSION= 2.22.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co USE_PYTHON= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ nautiluscdburner ltverhack pygtk2 GNOME_DESKTOP_VERSION=2 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 3d8eadb..895cd88 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://transcode.kabewm.com/ \ http://fromani.exit1.org/ @@ -24,7 +24,6 @@ BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv USE_BZIP2= yes FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes WANT_SDL= yes diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile index b9a5417..358a578 100644 --- a/multimedia/vic/Makefile +++ b/multimedia/vic/Makefile @@ -7,7 +7,7 @@ PORTNAME= vic PORTVERSION= 2.8.1.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/ DISTNAME= ${PORTNAME}-2.8ucl1.1.6 @@ -16,15 +16,15 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= MBONE video tool BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat - LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase + USE_TK= yes USE_TK_BUILD= yes USE_AUTOTOOLS= autoconf:213 -USE_X_PREFIX= yes -CONFIGURE_ARGS= -x-libraries=${X11BASE}/lib \ - -x-includes=${X11BASE}/include \ +USE_XORG= xext +CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ + -x-includes=${LOCALBASE}/include \ -without-ucltcl \ -with-tcl=${LOCALBASE} \ -without-ucltk \ diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index b12fb9a..21cefc1 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -28,7 +28,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ tar.0:${PORTSDIR}/devel/libtar \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera OPTIONS+= A52 "a52 audio support, many DVDs use this" On OPTIONS+= AALIB "Aalib Console Graphics Support" Off @@ -70,7 +70,7 @@ OPTIONS+= X264 "Enable H.264/AVC codec support" On WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.0-svn CONFLICTS= vlc-[0-9]* -WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf USE_BZIP2= yes USE_GETTEXT= yes @@ -86,8 +86,8 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ - LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ + LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" CONFIGURE_ARGS+= --enable-ffmpeg \ diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc index 9c42fe8..a1fa6ee 100644 --- a/multimedia/vlc-devel/Makefile.inc +++ b/multimedia/vlc-devel/Makefile.inc @@ -218,7 +218,7 @@ # Disable ALL streaming plugins. # # WITH_VLC_DEFAULT_FONT=/path/to/font -# default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +# default: ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf # This option lets you change the default font for subtitles # # NOPORTDOCS=yes diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 48b7e99..d58187c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -24,7 +24,7 @@ COMMENT= Multimedia streaming server and player for various audio/video formats BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera OPTIONS+= A52 "a52 audio support, many DVDs use this" On OPTIONS+= AALIB "Aalib Console Graphics Support" Off @@ -63,7 +63,7 @@ OPTIONS+= X264 "Enable H.264/AVC codec support" On CONFLICTS= vlc-devel-[0-9]* -WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf USE_BZIP2= yes USE_GETTEXT= yes @@ -79,8 +79,8 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ - LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ + LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" CONFIGURE_ARGS+= --enable-ffmpeg \ diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index 4b2f5f9..295441e 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -218,7 +218,7 @@ # Disable ALL streaming plugins. # # WITH_VLC_DEFAULT_FONT=/path/to/font -# default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +# default: ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf # This option lets you change the default font for subtitles # # NOPORTDOCS=yes diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 91bc10c..3adea29 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20080409 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -29,8 +29,8 @@ HAS_CONFIGURE= yes OPTIONS= DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \ --enable-shared .include <bsd.port.pre.mk> @@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --enable-mp4-output .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize -USE_XLIB= yes +USE_XORG= x11 .endif post-patch: diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 91bc10c..3adea29 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -7,7 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20080409 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -29,8 +29,8 @@ HAS_CONFIGURE= yes OPTIONS= DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \ --enable-shared .include <bsd.port.pre.mk> @@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --enable-mp4-output .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize -USE_XLIB= yes +USE_XORG= x11 .endif post-patch: diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index e682367..43cff38 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xawtv PORTVERSION= 3.95 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -15,11 +15,10 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A TV viewing application and a few TV utilities BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ - ${X11BASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts + ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts RUN_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ - ${X11BASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts -LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ - png.5:${PORTSDIR}/graphics/png \ + ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg OPTIONS= AA "Enable AA support" on \ @@ -32,7 +31,7 @@ USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= yes -USE_XORG= x11 +USE_XORG= x11 xaw CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ CFLAGS="-I${WRKSRC}/common" MAKE_ENV= verbose=yes @@ -95,10 +94,10 @@ CONFIGURE_ARGS+=--enable-quicktime=no PLIST_SUB+= QT="@comment " .endif -PLIST_SUB+= X11PREFIX=${X11BASE} +PLIST_SUB+= X11PREFIX=${LOCALBASE} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g; \ s|-lpthread|${PTHREAD_LIBS}|g; \ s|-lquicktime|-L${LOCALBASE}/lib &|g' \ diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index a0dda1b..2601e26 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -81,7 +81,6 @@ share/xawtv/secam-france.list share/xawtv/secam-russia.list share/xawtv/uhf.list @dirrm share/xawtv -@cwd %%X11BASE%% lib/X11/app-defaults/MoTV lib/X11/app-defaults/Xawtv lib/X11/app-defaults/mtt diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile index eba5f3f..72e5071 100644 --- a/multimedia/xdvshow/Makefile +++ b/multimedia/xdvshow/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdvshow PORTVERSION= 00.2003.09.03 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://www.sfc.wide.ad.jp/DVTS/software/xdvshow/ DISTNAME= ${PORTNAME} @@ -20,13 +20,12 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv PLIST_FILES= bin/xdvshow GNU_CONFIGURE= YES USE_AUTOTOOLS= autoconf:261 -USE_XLIB= yes post-patch: @${REINPLACE_CMD} \ -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g" \ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ - -e "s|/usr/X11R6|${X11BASE}|g" \ + -e "s|/usr/X11R6|${LOCALBASE}|g" \ ${WRKSRC}/configure.in ${REINPLACE_CMD} -e "s|-Werror||" ${WRKSRC}/src/Makefile.in diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile index 2b98268..d10bd83 100644 --- a/multimedia/xfce4-xmms-controller-plugin/Makefile +++ b/multimedia/xfce4-xmms-controller-plugin/Makefile @@ -23,7 +23,7 @@ DEPRECATED= Project is dead EXPIRATION_DATE=2008-03-31 IGNORE= Does not support xfce 4.4 USE_GNOME= gtk20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PORTNAME} diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile index c81d885..6b4d2ec 100644 --- a/multimedia/xmms-avi/Makefile +++ b/multimedia/xmms-avi/Makefile @@ -39,7 +39,7 @@ post-patch: s|-O2||g ; \ s|$$(CC_OPTS)|@CFLAGS@|g' -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/Input do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/libavixmms.so ${PREFIX}/lib/xmms/Input diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile index 0e1b8eb..bdea573 100644 --- a/multimedia/xmps-win32-plugin/Makefile +++ b/multimedia/xmps-win32-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmps-win32-plugin PORTVERSION= 0.0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/ @@ -21,7 +21,6 @@ USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 -USE_XLIB= yes USE_LDCONFIG= yes #CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 0cea535..10052e8 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -11,8 +11,7 @@ PORTVERSION= 1.0.0.p1 PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= Xtheater-${PORTVERSION:S/.p/-pre/} MAINTAINER= ports@FreeBSD.org @@ -30,8 +29,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gl -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile index 77acf09..ba361f0 100644 --- a/multimedia/xvid/Makefile +++ b/multimedia/xvid/Makefile @@ -18,7 +18,7 @@ COMMENT= An opensource MPEG-4 codec, based on OpenDivx BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GCC?= 3.4+ WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic diff --git a/net-im/aim/Makefile b/net-im/aim/Makefile index 6f30b94..f8241ae 100644 --- a/net-im/aim/Makefile +++ b/net-im/aim/Makefile @@ -20,11 +20,10 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_WRKSUBDIR= yes NO_BUILD= yes -#USE_LDCONFIG= yes (should replace INSTALLS_SHLIB after ports/102750 got committed) -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_PREFIX= yes PLIST_SUB= LINUXBASE=${LINUXBASE} diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 976889f..268470e 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -7,10 +7,9 @@ PORTNAME= ayttm PORTVERSION= 0.4.6.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org @@ -23,6 +22,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} +USE_XORG= xpm USE_BZIP2= yes USE_GCC= 3.4 WANT_GNOME= yes @@ -36,8 +36,8 @@ CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter MAN1= ayttm.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile index 02ce027..d61af5d 100644 --- a/net-im/cli-msn/Makefile +++ b/net-im/cli-msn/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile index 74d13af..3956271 100644 --- a/net-im/fugu/Makefile +++ b/net-im/fugu/Makefile @@ -7,7 +7,7 @@ PORTNAME= fugu PORTVERSION= 1.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im python MASTER_SITES= http://fugu.gale.org/dist/old/ @@ -18,8 +18,6 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw USE_OPENSSL= yes USE_PYTHON= yes -USE_XLIB= yes -USE_X_PREFIX= yes USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile index 863f65a..1330a69 100644 --- a/net-im/gajim-devel/Makefile +++ b/net-im/gajim-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gajim PORTVERSION= 20080309 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://ports.internal.vlink.ru/distfiles/ PKGNAMESUFFIX= -devel @@ -19,12 +19,13 @@ COMMENT= Gajim is a Jabber client based on a plugin system LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl +USE_XORG= x11 xext GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pygtk2 USE_PYTHON= 2.4+ -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \ LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile index fd6d795..076991d 100644 --- a/net-im/gajim/Makefile +++ b/net-im/gajim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gajim PORTVERSION= 0.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://www.gajim.org/downloads/ \ http://ports.internal.vlink.ru/distfiles/ @@ -23,8 +23,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pygtk2 USE_PYTHON= 2.4+ +USE_XORG= x11 xext -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \ LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile index cced48c..bef0a62 100644 --- a/net-im/gnome-jabber/Makefile +++ b/net-im/gnome-jabber/Makefile @@ -7,17 +7,15 @@ PORTNAME= gnome-jabber PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 Jabber Client LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui USE_GETTEXT= yes diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index dc8ba3d9..f58c045 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -7,9 +7,9 @@ PORTNAME= gnomeicu PORTVERSION= 0.99.14 +PORTREVISION= 1 CATEGORIES= net-im gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnomeicu +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 ICQ client @@ -17,7 +17,6 @@ COMMENT= GNOME 2 ICQ client LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2 \ intlhack diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index 5ddc5d3..62799b4 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -8,7 +8,7 @@ PORTNAME= gossip PORTVERSION= 0.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,8 +23,8 @@ LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \ aspell.16:${PORTSDIR}/textproc/aspell RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +USE_XORG= x11 xext ice USE_BZIP2= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile index 35c7e7d..5cc1ea7 100644 --- a/net-im/kf/Makefile +++ b/net-im/kf/Makefile @@ -7,7 +7,7 @@ PORTNAME= kf PORTVERSION= 0.5.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://files.jabberstudio.org/kf/ \ http://jabberstudio.rediris.es/kf/ \ @@ -18,6 +18,7 @@ COMMENT= A simple Jabber client using the GTK+ 2.0 toolkit LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth +USE_XORG= x11 xscrnsaver USE_GNOME= libglade2 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile index 1116c90..57671d7 100644 --- a/net-im/konverse/Makefile +++ b/net-im/konverse/Makefile @@ -9,8 +9,7 @@ PORTNAME= konverse PORTVERSION= 0.2 PORTREVISION= 6 CATEGORIES= net-im kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= KDE Jabber Client @@ -20,8 +19,6 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-qt-libraries=${QT_PREFIX}/lib pre-patch: diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile index d51a9d2..cbd0c12 100644 --- a/net-im/linpopup/Makefile +++ b/net-im/linpopup/Makefile @@ -7,7 +7,7 @@ PORTNAME= linpopup PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://www.chez.com/littleigloo/files/ DISTNAME= LinPopUp-${PORTVERSION}.src @@ -19,6 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba3 WRKSRC= ${WRKDIR}/LinPopUp-${PORTVERSION}/src +USE_XORG= x11 xmu USE_GNOME= gtk12 ALL_TARGET= LinPopUp diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index 48fa088..e163071 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -18,7 +18,7 @@ COMMENT= Open Source implementation of the Lotus Sametime protocol USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnomehack glib20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-doxygen=no \ --with-gmp-prefix=${LOCALBASE} diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index ece0e32..d75265a 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -17,7 +17,7 @@ COMMENT?= A Qt-based Jabber client BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= qca.1:${PORTSDIR}/devel/qca -RUN_DEPENDS= ${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls +RUN_DEPENDS= ${LOCALBASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls HAS_CONFIGURE= yes USE_BZIP2= yes @@ -27,9 +27,9 @@ CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LDFLAGS=${PTHREAD_LIBS} \ KDEDIR=${LOCALBASE} -CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \ - --with-qca-inc=${X11BASE}/include/plugins/qca \ - --with-qca-lib=${X11BASE}/lib \ +CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ + --with-qca-inc=${LOCALBASE}/include/plugins/qca \ + --with-qca-lib=${LOCALBASE}/lib \ --disable-growl --disable-dnotify --disable-ghbnr MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile index 23496cc..509a21b 100644 --- a/net-im/sim-im-devel/Makefile +++ b/net-im/sim-im-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= sim-im-devel PORTVERSION= 0.9.5.2099 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://sim-im.lehis.ru/dist/ \ http://www.sim-im.lehis.ru/dist/ @@ -22,6 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 +USE_XORG= x11 xext USE_OPENSSL= yes USE_PERL5_BUILD= yes USE_GETTEXT= yes @@ -31,8 +33,6 @@ INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib - OPTIONS= KDE "Enable KDE support" off \ DEBUG "Enable debug" on diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile index 667a680..329c57b 100644 --- a/net-im/sim-im/Makefile +++ b/net-im/sim-im/Makefile @@ -6,7 +6,7 @@ PORTNAME= sim-im PORTVERSION= 0.9.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://sim-im.lehis.ru/dist/ \ @@ -33,9 +33,9 @@ USE_OPENSSL= yes USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes +USE_XORG= x11 xext ice CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib .if !defined(WITH_KDE) CONFIGURE_ARGS+=--disable-kde --enable-mt diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile index 5c6e7b0..f23d11a 100644 --- a/net-im/vqcc-gtk/Makefile +++ b/net-im/vqcc-gtk/Makefile @@ -9,8 +9,7 @@ PORTNAME= vqcc-gtk PORTVERSION= 0.5 PORTREVISION= 3 CATEGORIES?= net-im -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER?= ports@FreeBSD.org COMMENT= LAN chat client compatible with quickChat and Vypress Chat (TM) @@ -22,7 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/net-mgmt/aguri/Makefile b/net-mgmt/aguri/Makefile index 9cb3914..0692356 100644 --- a/net-mgmt/aguri/Makefile +++ b/net-mgmt/aguri/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 MAN1= aguri.1 post-patch: - ${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE}," ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE}," ${WRKSRC}/Makefile do-install: @${INSTALL_PROGRAM} ${WRKSRC}/aguri ${PREFIX}/bin diff --git a/net-mgmt/bsnmpd/Makefile b/net-mgmt/bsnmpd/Makefile index a2dd874..62c9405 100644 --- a/net-mgmt/bsnmpd/Makefile +++ b/net-mgmt/bsnmpd/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libbegemot=${LOCALBASE} USE_AUTOTOOLS= autoconf:261 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GCC= 3.2+ USE_RC_SUBR= bsnmpd.sh diff --git a/net-mgmt/ciscoconf/Makefile b/net-mgmt/ciscoconf/Makefile index 7e69aa3..213e007 100644 --- a/net-mgmt/ciscoconf/Makefile +++ b/net-mgmt/ciscoconf/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.isc.org/isc/ciscoconf/ \ MAINTAINER= jabley@automagic.org COMMENT= Fetches configuration from Cisco routers and stores them under RCS -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend ALL_TARGET= depend all MAN8= ciscoconfd.8 ciscoconfr.8 diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile index 6b6efda..a0170b7 100644 --- a/net-mgmt/driftnet/Makefile +++ b/net-mgmt/driftnet/Makefile @@ -7,7 +7,7 @@ PORTNAME= driftnet PORTVERSION= 0.1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ \ http://www.vanheusden.com/mirrors/ @@ -17,10 +17,9 @@ COMMENT= A Tool to grab images out of (your) TCP connections LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ jpeg.9:${PORTSDIR}/graphics/jpeg -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_GNOME= gtk12 -USE_X_PREFIX= yes USE_GMAKE= yes ALL_TARGET= default diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile index 4fd0ac4..299210a 100644 --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -23,7 +23,6 @@ USE_BISON= build USE_GMAKE= yes USE_GCC= 3.4 GNU_CONFIGURE= Yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include MAN1= RtConfig.1 peval.1 rpslcheck.1 IRR-Errors.1 MAN3= librpsl.3 diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index b59911f..128127e 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -29,7 +29,7 @@ PATCH_DEPENDS= ${LIBTOOL_DEPENDS} USE_AUTOTOOLS= autoconf:261 libtool:15 USE_RC_SUBR= snmpd.sh snmptrapd.sh USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_LATEST_LINK= yes .if !defined(WITHOUT_PERL) USE_PERL5= yes diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile index 20e995e..e42706b 100644 --- a/net-mgmt/netwag/Makefile +++ b/net-mgmt/netwag/Makefile @@ -19,7 +19,7 @@ COMMENT= A graphical front end for netwox BUILD_DEPENDS= netwox:${PORTSDIR}/net-mgmt/netwox \ wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ - appres:${X_CLIENTS_PORT} + appres:${PORTSDIR}/x11/appres RUN_DEPENDS= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile index 2e69e23..0e1bb4f 100644 --- a/net-mgmt/vidalia/Makefile +++ b/net-mgmt/vidalia/Makefile @@ -65,6 +65,6 @@ post-configure: .if defined(TOR_CONTROL_ADDR) ${REINPLACE_CMD} -e 's@127\.0\.0\.1@${TOR_CONTROL_ADDR}@' ${WRKSRC}/src/config/torsettings.cpp .endif - ${REINPLACE_CMD} -E -e 's@(INCPATH +=)@\1 -I${X11BASE}/include@' -e 's@/share(/man/man1)@\1@' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's@(INCPATH +=)@\1 -I${LOCALBASE}/include@' -e 's@/share(/man/man1)@\1@' ${WRKSRC}/Makefile .include <bsd.port.post.mk> diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 2270015..7740170 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -7,10 +7,9 @@ PORTNAME= aMule PORTVERSION= 2.1.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= amule +MASTER_SITES= SF/amule PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/ PATCHFILES= aMule-wx.patch?rev=1.2 @@ -23,7 +22,6 @@ LATEST_LINK= aMule2 CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack gnomeprefix USE_GMAKE= yes USE_WX= 2.8 diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 2270015..7740170 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -7,10 +7,9 @@ PORTNAME= aMule PORTVERSION= 2.1.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= amule +MASTER_SITES= SF/amule PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/ PATCHFILES= aMule-wx.patch?rev=1.2 @@ -23,7 +22,6 @@ LATEST_LINK= aMule2 CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack gnomeprefix USE_GMAKE= yes USE_WX= 2.8 diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile index 2270015..7740170 100644 --- a/net-p2p/amule2/Makefile +++ b/net-p2p/amule2/Makefile @@ -7,10 +7,9 @@ PORTNAME= aMule PORTVERSION= 2.1.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= amule +MASTER_SITES= SF/amule PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/ PATCHFILES= aMule-wx.patch?rev=1.2 @@ -23,7 +22,6 @@ LATEST_LINK= aMule2 CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack gnomeprefix USE_GMAKE= yes USE_WX= 2.8 diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile index 806177e..1461e60 100644 --- a/net-p2p/dctc-gui-qt/Makefile +++ b/net-p2p/dctc-gui-qt/Makefile @@ -9,8 +9,7 @@ PORTNAME= dctc PORTVERSION= 0.1.2 PORTREVISION= 3 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= dc-qt +MASTER_SITES= SF/dc-qt PKGNAMESUFFIX= -gui-qt DISTNAME= dc-qt-${PORTVERSION} @@ -26,7 +25,7 @@ PLIST_FILES= bin/dc_qt OPTIONS= XINE "Enable support for video preview using libxine" off -XINE_CONFIG?= ${X11BASE}/bin/xine-config +XINE_CONFIG?= ${LOCALBASE}/bin/xine-config .ifndef(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile index f48107d..9133f04 100644 --- a/net-p2p/dctc-gui/Makefile +++ b/net-p2p/dctc-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= dctc PORTVERSION= 0.66 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-p2p gnome MASTER_SITES= http://unixpages.org/distfiles/ PKGNAMESUFFIX= -gui @@ -21,7 +21,6 @@ LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 USE_GETTEXT= yes USE_GNOME= gnomehack gnomelibs gnomeprefix -USE_XLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-gnome=${LOCALBASE} \ diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile index e0e7b9d..8c147c7 100644 --- a/net-p2p/edonkey-gui-gtk/Makefile +++ b/net-p2p/edonkey-gui-gtk/Makefile @@ -8,10 +8,9 @@ PORTNAME= edonkey PORTVERSION= 0.6.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ed2k-gtk-gui +MASTER_SITES= SF/ed2k-gtk-gui PKGNAMESUFFIX= -gui-gtk DISTNAME= ed2k-gtk-gui-${PORTVERSION} @@ -23,7 +22,6 @@ RUN_DEPENDS= donkey:${PORTSDIR}/net-p2p/linux-edonkey-core USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gnometarget gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile index 991dfc7..1780d90 100644 --- a/net-p2p/gift/Makefile +++ b/net-p2p/gift/Makefile @@ -27,7 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= yes MAN1= giftd.1 diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile index 9d7f398..4b571dc 100644 --- a/net-p2p/gkrellm-gift/Makefile +++ b/net-p2p/gkrellm-gift/Makefile @@ -19,7 +19,7 @@ COMMENT= GKrellM2 plugin that monitors active giFT transfers LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile index a483dc6..558c3a9 100644 --- a/net-p2p/gkremldk/Makefile +++ b/net-p2p/gkremldk/Makefile @@ -18,7 +18,7 @@ COMMENT= Shows current mldonkey donwload/upload rates and allows setting them BUILD_DEPENDS= \ pkg-config:${PORTSDIR}/devel/pkg-config \ - ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 + ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_BZIP2= yes @@ -27,9 +27,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} post-patch: @${REINPLACE_CMD} -E \ - -e 's|^(LFLAGS).*|\1 = ${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib|' \ + -e 's|^(LFLAGS).*|\1 = ${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib|' \ -e 's|-lpthread|${PTHREAD_LIBS}|' \ - -e 's|(-fPIC)|\1 ${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include|' \ + -e 's|(-fPIC)|\1 ${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile.in do-install: diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile index 5c90a8c..3f966ae 100644 --- a/net-p2p/kmldonkey/Makefile +++ b/net-p2p/kmldonkey/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --program-transform-name='' -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= kmldonkey.1 kmldonkey_submit.1 diff --git a/net-p2p/libpdtp/Makefile b/net-p2p/libpdtp/Makefile index 07fa9a0..51e7c3f 100644 --- a/net-p2p/libpdtp/Makefile +++ b/net-p2p/libpdtp/Makefile @@ -16,7 +16,7 @@ COMMENT= Client library for Peer Distributed Transfer Protocol (PDTP) WRKSRC= ${WRKDIR}/${PORTNAME} HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CFLAGS+= -fpic do-install: diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile index 910e228..e072331 100644 --- a/net-p2p/linux-agsatellite/Makefile +++ b/net-p2p/linux-agsatellite/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//} NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes RESTRICTED= no response from developer on licensing issues DOCS= german_readme.txt license.txt readme.txt diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile index cf26d34..b31afdd 100644 --- a/net-p2p/valknut/Makefile +++ b/net-p2p/valknut/Makefile @@ -8,6 +8,7 @@ PORTNAME= valknut PORTVERSION= 0.3.13 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF MASTER_SITE_SUBDIR= wxdcgui @@ -19,12 +20,12 @@ LIB_DEPENDS= dc.0:${PORTSDIR}/net-p2p/dclib \ xml2.5:${PORTSDIR}/textproc/libxml2 USE_QT_VER= 3 +USE_XORG= x11 ice xext USE_BZIP2= yes USE_GMAKE= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libdc=${LOCALBASE} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --with-libdc=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile index ce56002..9c0af42 100644 --- a/net/atmsupport/Makefile +++ b/net/atmsupport/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= unidecode.1 uniencode.1 diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 774dd59..41f78f2 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= boinc-client PORTVERSION= 5.10.32 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav @@ -43,10 +44,10 @@ OPTIONS= X11 "Build Boinc Manager GUI" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 USE_WX= 2.6+ WX_CONF_ARGS= absolute -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include USE_ICONV= yes LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile index 24abed7..009351d 100644 --- a/net/clusterit/Makefile +++ b/net/clusterit/Makefile @@ -29,7 +29,7 @@ USE_PERL5_BUILD=yes post-patch: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ - ${PERL} -pi -e 's#/usr/X11R6#${X11BASE}#g' + ${PERL} -pi -e 's#/usr/X11R6#${LOCALBASE}#g' .for file in command.c rvt.c screen.c @${PERL} -pi -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/rvt/${file} .endfor diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index e4d3ede..f2845201 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -7,7 +7,7 @@ PORTNAME= cvsup PORTVERSION= 16.1h -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net devel MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=development/CVSup/snapshots @@ -55,7 +55,7 @@ CONFLICTS= cvsup-[0-9]* NO_LATEST_LINK= yes .endif .else -USE_XLIB= yes +USE_XORG= x11 COMMENT+= (GUI version) BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3 CONFLICTS= cvsup-without-gui-[0-9]* diff --git a/net/dante/Makefile b/net/dante/Makefile index cfe10d0..7823d50 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= sockd.sh diff --git a/net/freenx/Makefile b/net/freenx/Makefile index e0fb6a7..fa4f75c 100644 --- a/net/freenx/Makefile +++ b/net/freenx/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${NXPREFIX}/bin/nxagent:${PORTSDIR}/net/nxserver \ bash:${PORTSDIR}/shells/bash \ expect:${PORTSDIR}/lang/expect \ gls:${PORTSDIR}/sysutils/coreutils \ - xauth:${X_CLIENTS_PORT} + xauth:${PORTSDIR}/x11/xauth USE_PERL5_RUN= yes BUILD_WRKSRC= ${WRKSRC}/nxserver-helper diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile index 240b3de..b8d150e 100644 --- a/net/gkrellm_snmp/Makefile +++ b/net/gkrellm_snmp/Makefile @@ -15,12 +15,12 @@ MAINTAINER= eike.bernhardt@gmx.de COMMENT= A gkrellm SNMP Monitor LIB_DEPENDS= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/gkrellm_snmp.so USE_GNOME= imlib -MAKE_ENV= GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \ - PLUGIN_DIR="${X11BASE}/libexec/gkrellm/plugins/" +MAKE_ENV= GKRELLM_INCLUDE="-I${LOCALBASE}/include/gkrellm/" \ + PLUGIN_DIR="${LOCALBASE}/libexec/gkrellm/plugins/" .include <bsd.port.mk> diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile index 6f2afa4..79711b6 100644 --- a/net/gkrellmmultiping2/Makefile +++ b/net/gkrellmmultiping2/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 multiping plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile index c6318c1..80ad5a2 100644 --- a/net/gkrellmqst/Makefile +++ b/net/gkrellmqst/Makefile @@ -17,7 +17,7 @@ DISTNAME= gkrellm_qst-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Plugin for Gkrellm that displays updated info on several game servers -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \ qstat:${PORTSDIR}/games/qstat diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile index 038a237..61dba19 100644 --- a/net/gkrellmwireless/Makefile +++ b/net/gkrellmwireless/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM wireless plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm NO_LATEST_LINK= yes diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile index c981d51..671e3c9 100644 --- a/net/gkrellmwireless2/Makefile +++ b/net/gkrellmwireless2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ktsin@acm.org COMMENT= GKrellM wireless plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/gkrellmwireless diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index e9819bf..b0fb182 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-netstatus PORTVERSION= 2.12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +17,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME applet that shows network status -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_BZIP2= yes diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile index 0ef48da..ac3eedc 100644 --- a/net/gspoof/Makefile +++ b/net/gspoof/Makefile @@ -31,7 +31,7 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-Wall -O2|@CFLAGS@|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g ; \ - s|/usr/share|${X11BASE}/share|g' ${WRKSRC}/gtk.c + s|/usr/share|${LOCALBASE}/share|g' ${WRKSRC}/gtk.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gspoof ${PREFIX}/bin diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index d68f285..d99d225 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -7,16 +7,15 @@ PORTNAME= gtk-vnc PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtk-vnc +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls -USE_XLIB= yes USE_GNOME= pygtk2 gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile index a7b63c4..beb2618 100644 --- a/net/hawknl-devel/Makefile +++ b/net/hawknl-devel/Makefile @@ -22,10 +22,10 @@ USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes MAKEFILE= makefile.linux -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" @@ -35,7 +35,7 @@ OPTIONS= OPTIMIZATION "Enable optimization" off .include <bsd.port.pre.mk> -.if ${ARCH} == amd64 || ${ARCH} == ia64 +.if ${ARCH} == amd64 || ${ARCH} == ia64 BROKEN= does not compile on ${ARCH} .endif diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile index dd94069..c61376e 100644 --- a/net/hawknl/Makefile +++ b/net/hawknl/Makefile @@ -18,10 +18,10 @@ COMMENT= Portable networking library USE_DOS2UNIX= yes USE_GMAKE= yes MAKEFILE= makefile.linux -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/net/howl/Makefile b/net/howl/Makefile index 86d934d..03cdefb 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -21,7 +21,7 @@ USE_RC_SUBR= yes CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= mDNSResponder.8 PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile index 0ca503e..66b044d 100644 --- a/net/ilbc/Makefile +++ b/net/ilbc/Makefile @@ -15,6 +15,6 @@ COMMENT= Internet Low Bit Rate codec (RFC3951) USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd index 948ca8f..379dae4 100644 --- a/net/imm/files/Makefile.freebsd +++ b/net/imm/files/Makefile.freebsd @@ -1,11 +1,11 @@ # Some versions of make, like SGI's, use the following variable to # determine which shell to use for executing commands: SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include +INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include # Libraries to use when linking: LIBS = -lm -TKLIBS= -L${X11BASE}/lib -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 +TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 TARGET = ../freebsd diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile index 8d0db3a..0a1a459 100644 --- a/net/libgnetwork/Makefile +++ b/net/libgnetwork/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnetwork PORTVERSION= 0.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.0 @@ -19,7 +19,6 @@ COMMENT= A GLib-based networking wrapper USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index 9c3b59b..ac8baa8 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -18,7 +18,7 @@ COMMENT= NSS module using a MySQL database for backend USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-mysql=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_MYSQL= yes diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 45db6b3..df08019 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -25,7 +25,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-shared --disable-trace -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= librsync.3 diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile index 476d547..ae06dd8 100644 --- a/net/libsocket++/Makefile +++ b/net/libsocket++/Makefile @@ -17,7 +17,7 @@ MAINTAINER= arved@FreeBSD.org COMMENT= A C++ wrapper library to the sockets GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= automake:19 autoconf:261 libtool:15 SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/" diff --git a/net/mcl/Makefile b/net/mcl/Makefile index 259be87..d087695 100644 --- a/net/mcl/Makefile +++ b/net/mcl/Makefile @@ -16,11 +16,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \ +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ gdome-config:${PORTSDIR}/textproc/gdome2 \ glib-gettextize:${PORTSDIR}/devel/glib20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 4b451c5..acfd75e 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpich DISTVERSION= 1.2.7p1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ DIST_SUBDIR= mpich @@ -43,7 +43,7 @@ PLIST_SUB+= X11="@comment " .else BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+=--enable-mpe_graphics PLIST_SUB+= X11="" .endif @@ -205,7 +205,7 @@ CONFIGURE_ENV+= RSHCOMMAND="${LOCALBASE}/bin/ssh" pre-configure: .for fic in mpe/configure mpe/src/Makefile.in - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${fic} + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${fic} .endfor .for fic in examples/basic/Makefile.in installtest/Makefile.in ${REINPLACE_CMD} -e 's|@F90_SUFFIX@|f90|' ${WRKSRC}/${fic} diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 56ed415d..601375d 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -32,7 +32,7 @@ USE_GNOME= gtk20 CONFIGURE_ARGS=--enable-gtk2 .endif USE_XORG= x11 -CONFIGURE_ARGS+=--with-gtk-prefix=${X11BASE} +CONFIGURE_ARGS+=--with-gtk-prefix=${LOCALBASE} .else PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS=--without-gtk --with-gtk-prefix=/nonexistant diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile index b5c58ca..35395f2 100644 --- a/net/mugshot/Makefile +++ b/net/mugshot/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${PKGCONFIG_LOCAL_BASE}/dbus-1.pc:${PORTSDIR}/devel/dbus:install ${LOCALBASE}/include/firefox/caps/nsIScriptSecurityManager.h:${PORTSDIR}/www/firefox:install \ ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre:install \ ${LOCALBASE}/lib/firefox/xpidl:${PORTSDIR}/www/firefox:install \ - ${X11BASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \ + ${LOCALBASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \ dbus>=1.0.2:${PORTSDIR}/devel/dbus:install USE_GNOME= gnomehack gconf2 glib20 gtk20 pango gnomevfs2 gnomedesktop @@ -38,7 +38,7 @@ USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mugshot/firefox/components PKGCONFIG_LOCAL_BASE= ${LOCALBASE}/libdata/pkgconfig -PKGCONFIG_X11_BASE= ${X11BASE}/libdata/pkgconfig +PKGCONFIG_X11_BASE= ${LOCALBASE}/libdata/pkgconfig mugshot_INSTALL_cmd= install @@ -48,8 +48,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= "--with-gecko-idl=${FIREFOX_IDL_PATH}" \ "--with-gecko-headers=${LOCALBASE}/include/firefox" \ "--with-xpidl=${LOCALBASE}/lib/firefox/xpidl" \ - "--x-includes=${X11BASE}/include" \ - "--x-libraries=${X11BASE}/lib" + "--x-includes=${LOCALBASE}/include" \ + "--x-libraries=${LOCALBASE}/lib" FIREFOX_IDL_PATH!=${SH} -c 'for i in ${LOCALBASE}/share/idl/firefox-*; do [ -f $$i/nsIURI.idl ] && ${ECHO} $$i && break; done; exit 0;' BUILD_DEPENDS+=${FIREFOX_IDL_PATH}/nsIURI.idl:${PORTSDIR}/www/firefox:install diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile index 6f0fa2e..42c612f 100644 --- a/net/netspeed_applet/Makefile +++ b/net/netspeed_applet/Makefile @@ -7,6 +7,7 @@ PORTNAME= netspeed_applet PORTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/ @@ -15,7 +16,6 @@ COMMENT= Applet that shows how much network traffic occurs on an interface LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop -USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile index e14a71d..bcc9e9d 100644 --- a/net/nxserver/Makefile +++ b/net/nxserver/Makefile @@ -32,7 +32,6 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -USE_GETOPT_LONG= yes USE_GETTEXT= yes WRKSRC= ${WRKDIR} GNU_CONFIGURE= yes diff --git a/net/openh323/Makefile b/net/openh323/Makefile index f37b801..ab00c70 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -23,7 +23,7 @@ USE_BISON= build USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ALL_TARGET= optshared CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 9c3db1e..5293698 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -18,7 +18,7 @@ COMMENT= Open-source implementation of the Service Location Protocol USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openslp \ --localstatedir=/var CONFIGURE_TARGET=--target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist index ed137d62..bf5b177 100644 --- a/net/penguintv/pkg-plist +++ b/net/penguintv/pkg-plist @@ -173,6 +173,5 @@ share/locale/sv/LC_MESSAGES/penguintv.mo @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ajax @dirrm %%PYTHON_SITELIBDIR%%/penguintv -@comment @cwd %%X11BASE%% @comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml @comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml diff --git a/net/pvm/Makefile b/net/pvm/Makefile index eea2724..220eaa2 100644 --- a/net/pvm/Makefile +++ b/net/pvm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pvm PORTVERSION= 3.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net parallel MASTER_SITES= http://www.netlib.org/pvm3/ \ ftp://ftp.chg.ru/pub/prog/parallel/pvm3/ @@ -22,7 +22,7 @@ PKGNAMESUFFIX= -nox11 MAKE_ENV+= WITHOUT_X11=yes PLIST_SUB+= X11='@comment ' .else -USE_XLIB= yes +USE_XORG= x11 xaw xt PLIST_SUB+= X11='' .endif diff --git a/net/pvm/files/patch-ab b/net/pvm/files/patch-ab index 1f4ca29..e27dfb5 100644 --- a/net/pvm/files/patch-ab +++ b/net/pvm/files/patch-ab @@ -6,8 +6,8 @@ XLIBS = -lXaw -lXmu -lXext -lXt -lX11 -XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \ - -L/usr/local/X11R5/lib -L/usr/local/X11/lib -+XCFLAGS = -I${X11BASE}/include \ -+ -L${X11BASE}/lib ++XCFLAGS = -I${LOCALBASE}/include \ ++ -L${LOCALBASE}/lib HEADERS = $(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \ $(PVMIDIR)/pvm3.h $(PVMDIR)/src/bfunc.h diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile index b83c6bf..b0746f4 100644 --- a/net/radiusclient/Makefile +++ b/net/radiusclient/Makefile @@ -18,6 +18,6 @@ COMMENT= Client library and basic utilities for RADIUS AAA USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net/rqm/Makefile b/net/rqm/Makefile index a78d7fc..b54862f 100644 --- a/net/rqm/Makefile +++ b/net/rqm/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase WRKSRC= ${WRKDIR}/rqm/ HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${X11BASE} +CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} ALL_TARGET= rqm diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa index ba0b3c0..3169756 100644 --- a/net/rqm/files/patch-aa +++ b/net/rqm/files/patch-aa @@ -18,7 +18,7 @@ FreeBSD ) CC="gcc" WFLAGS=$GCCWFLAGS - INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${PREFIX}/include -I${X11BASE}/include" ++ INCLUDE="-I${LOCALBASE}/include" LDLIBS="-lm" DEBUG="-g" CHAR="-fsigned-char" diff --git a/net/sdr/Makefile b/net/sdr/Makefile index f6bcc8f..7854475 100644 --- a/net/sdr/Makefile +++ b/net/sdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdr PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ @@ -21,7 +21,6 @@ PLIST_FILES= bin/sdr WRKSRC= ${WRKDIR}/sdr/freebsd HAS_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes post-extract: @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd index 3039501..34a7a8c 100644 --- a/net/sdr/files/Makefile.freebsd +++ b/net/sdr/files/Makefile.freebsd @@ -1,6 +1,6 @@ CC = gcc -g -O -fwritable-strings -INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm +INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase +LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD all:: sdr diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile index dc582b2..34423e2 100644 --- a/net/service-discovery-applet/Makefile +++ b/net/service-discovery-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= service-discovery-applet PORTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net dns gnome MASTER_SITES= http://0pointer.de/~sebest/ @@ -18,7 +18,6 @@ COMMENT= A GNOME applet that shows available network services using mDNS BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi -USE_XLIB= yes USE_GETTEXT= yes USE_PYTHON= yes USE_GNOME= gnomehack gnomeprefix intlhack pygnomedesktop diff --git a/net/silky/Makefile b/net/silky/Makefile index 58535c4..29ff496 100644 --- a/net/silky/Makefile +++ b/net/silky/Makefile @@ -9,7 +9,7 @@ PORTNAME= silky PORTVERSION= 0.5.4 PORTREVISION= 5 CATEGORIES= net security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ ftp://rusunix.org/pub/FreeBSD/distfiles/ MASTER_SITE_SUBDIR= silky @@ -25,8 +25,8 @@ CONFIGURE_ARGS= --with-silc-include=${LOCALBASE}/include/silc \ --with-silc-libs=${LOCALBASE}/lib \ --with-docdir=${DOCSDIR} \ --with-libintl-prefix=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" USE_GNOME= gtk20 libglade2 gnomelibs USE_GMAKE= yes @@ -35,7 +35,7 @@ USE_PERL5= yes post-patch: @${PERL} -pi -e 's/ include / /' ${WRKSRC}/Makefile.in @${PERL} -pi -e 's|share/pixmaps/\$${\w+}|share/pixmaps/|; \ - s|(PACKAGE_PIXMAPS_DIR \")\$${packageprefix}/|\1${X11BASE}/|' \ + s|(PACKAGE_PIXMAPS_DIR \")\$${packageprefix}/|\1${LOCALBASE}/|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk> diff --git a/net/skstream/Makefile b/net/skstream/Makefile index 9a0a721..7530be0 100644 --- a/net/skstream/Makefile +++ b/net/skstream/Makefile @@ -18,7 +18,7 @@ USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack USE_GCC= 3.4 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's| install-docdataDATA | |g' ${WRKSRC}/Makefile.in diff --git a/net/socketbind/Makefile b/net/socketbind/Makefile index ac1c99e..0b60687 100644 --- a/net/socketbind/Makefile +++ b/net/socketbind/Makefile @@ -14,7 +14,7 @@ DISTFILES= # none MAINTAINER= nm@web.am COMMENT= Library to bind applications on multihomed machines to specific IP address -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES NOMAN= YES INSTALL_TARGET= PLIST_SUB= "DOCSDIR=share/doc/${PORTNAME}" diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 22e6076..c80371a 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -30,7 +30,7 @@ CONFLICTS= dante-[0-9]* # --with-passwd WRKSRC= ${WRKDIR}/${DISTNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CFLAGS+= -DHAVE_VSNPRINTF CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index 50e4b85..e97b766 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -7,25 +7,25 @@ PORTNAME= ssvnc PORTVERSION= 1.0.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net security MASTER_SITES= http://www.karlrunge.com/x11vnc/etv/ MAINTAINER= alepulver@FreeBSD.org COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel -USE_XLIB= yes +USE_XORG= xi xmu xt xaw USE_TCL_RUN= 84 USE_TK_RUN= 84 WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/build.unix @${REINPLACE_CMD} -e \ 's|exec wish|exec ${WISH}|; \ diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile index aeea3ca..8b7bfea 100644 --- a/net/tapidbus/Makefile +++ b/net/tapidbus/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= pkgconfig glib20 gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index 210dfd4..9b9c7fb 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcpillust PORTVERSION= 1.0a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net tcl tk MASTER_SITES= ftp://ftp.csl.sony.co.jp/CSL/nishida/ @@ -16,7 +16,7 @@ COMMENT= A graphical TCP connection analysis tool USE_TCL= yes USE_TK= yes -USE_XLIB= yes +USE_XORG= xt USE_MOTIF= yes MAN1= tcpillust.1 @@ -32,7 +32,7 @@ PLIST_FILES= bin/tcpillust \ do-build: .for file in binread.c button.c draw.c parser.c tcpillust.c ${CC} ${CFLAGS} -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \ - -I${X11BASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/} + -I${LOCALBASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/} .endfor ${CC} ${CFLAGS} -L${TCL_LIBDIR} -L${TK_LIBDIR} -L${LOCALBASE}/lib \ -lm -lpcap -ltcl${TCL_VER:S/.//} -ltk${TK_VER:S/.//} ${WRKSRC}/*.o -o ${WRKSRC}/tcpillust diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile index 5facb70..0d339c6 100644 --- a/net/tcpview/Makefile +++ b/net/tcpview/Makefile @@ -26,6 +26,6 @@ post-patch: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${X11BASE}/lib/X11/app-defaults/ + ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${LOCALBASE}/lib/X11/app-defaults/ .include <bsd.port.mk> diff --git a/net/tcpview/files/patch-Makefile b/net/tcpview/files/patch-Makefile index d83a34d..403254e 100644 --- a/net/tcpview/files/patch-Makefile +++ b/net/tcpview/files/patch-Makefile @@ -10,7 +10,7 @@ -LIB = +DEFINES = -DCSLIP -DPPP +CCOPT = -O0 -+INCLUDES = -I.. -I$(X11BASE)/include ++INCLUDES = -I.. -I$(LOCALBASE)/include +LIB =-ll # These are for the Sun4 version @@ -68,7 +68,7 @@ tcpview: $(TCPVIEW_OBJ) - $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) $(XLIB) $(LIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) -L${X11BASE}/lib $(XLIB) $(LIB) ++ $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) -L${LOCALBASE}/lib $(XLIB) $(LIB) tcpslice: $(TCPSLICE_OBJ) $(CC) $(CFLAGS) -o $@ $(TCPSLICE_OBJ) diff --git a/net/tcpview/pkg-plist b/net/tcpview/pkg-plist index 5d32a20..b7ecafb 100644 --- a/net/tcpview/pkg-plist +++ b/net/tcpview/pkg-plist @@ -6,5 +6,4 @@ lib/tcpview/hosts lib/tcpview/manuf @dirrm lib/tcpview/filters @dirrm lib/tcpview -@cwd %%X11BASE%% lib/X11/app-defaults/Tcpview diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 06af4ec..bfd49ca 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc USE_BZIP2= yes USE_PERL5= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= World NO_INSTALL_MANPAGES= yes @@ -51,7 +51,7 @@ PLIST_SUB+= JVNC_VIEWER="@comment " #.include <bsd.port.pre.mk> -.if exists(${X11BASE}/share/vnc/classes/index.vnc) +.if exists(${LOCALBASE}/share/vnc/classes/index.vnc) IGNORE= vnc has already been installed, please uninstall it first .endif diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile index c1ecf00..26bd2d6 100644 --- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile +++ b/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile @@ -6,13 +6,13 @@ -#ifdef DefaultFontPath -DEFAULTFONTPATH = DefaultFontPath -+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc ++DEFAULTFONTPATH = ${LOCALBASE}/lib/X11/fonts/misc SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" -#endif -#ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase -+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb ++DEFAULTRGBDATABASE = ${LOCALBASE}/lib/X11/rgb SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" -#endif diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile index 4a05fb4..64fc790 100644 --- a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile +++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile @@ -5,13 +5,13 @@ #ifdef DefaultFontPath -DEFAULTFONTPATH = DefaultFontPath -+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc ++DEFAULTFONTPATH = ${LOCALBASE}/lib/X11/fonts/misc SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" #endif #ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase -+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb ++DEFAULTRGBDATABASE = ${LOCALBASE}/lib/X11/rgb SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" #endif diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 876b029..7872984 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -7,7 +7,7 @@ PORTNAME= tsclient PORTVERSION= 0.150 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= SF @@ -21,7 +21,6 @@ OPTIONS= GNOME "Build with gnome support" on \ XNEST "X via Xnest support (experimental)" off USE_AUTOTOOLS= libtool:15 automake:19 autoconf:261 -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index 8c8d44f..6829a9d 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -19,7 +19,7 @@ COMMENT= Allow non SOCKS aware applications to use SOCKS without modification GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//} diff --git a/net/ttt/Makefile b/net/ttt/Makefile index d1b57c0..d40d349 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -18,9 +18,7 @@ LIB_DEPENDS= BLT24.3:${PORTSDIR}/x11-toolkits/blt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \ - --with-tk=${LOCALBASE}/lib/tk8.4 \ - --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include + --with-tk=${LOCALBASE}/lib/tk8.4 INSTALL_TARGET= install install-man MAN1= ttt.1 tttprobe.1 tttview.1 diff --git a/net/vde/Makefile b/net/vde/Makefile index 386b6a4..4d739e2 100644 --- a/net/vde/Makefile +++ b/net/vde/Makefile @@ -18,7 +18,7 @@ COMMENT= User-mode virtual ethernet infrastructure CONFLICTS= vde2-[0-9]* USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index b125e31..830415a 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -8,6 +8,7 @@ PORTNAME= vinagre PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +24,6 @@ LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/vino/Makefile b/net/vino/Makefile index e57b21d..63fcdaf 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -8,6 +8,7 @@ PORTNAME= vino PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,7 +20,6 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 8134378..f7525e1 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes # The vnc supplied zlib seg. faults if compiled with -O CONFIGURE_ARGS= --with-installed-zlib USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm xext WANT_PERL= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix @@ -45,8 +45,8 @@ DISTFILES+= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x -RUN_DEPENDS+= xauth:${X_CLIENTS_PORT} \ - ${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} +RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \ + ${LOCALBASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} USE_PERL5= yes @@ -77,7 +77,7 @@ post-extract: post-patch: .if !defined(WITHOUT_SERVER) - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/xc/config/cf/vnc.def @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' -e 's|%%CXX%%|${CXX}|g' \ ${WRKSRC}/xc/config/cf/FreeBSD.cf @@ -94,7 +94,6 @@ pre-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} .if !defined(WITHOUT_SERVER) @if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \ - ${ECHO_CMD} @cwd ${X11BASE} ; \ ${ECHO_CMD} lib/modules/extensions/vnc.so ; \ ${ECHO_CMD} "@dirrmtry lib/modules/extensions" ; \ ${ECHO_CMD} "@dirrmtry lib/modules" ; \ @@ -114,10 +113,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin @if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \ - ${MKDIR} ${X11BASE}/lib/modules/extensions ; \ + ${MKDIR} ${LOCALBASE}/lib/modules/extensions ; \ ${INSTALL_PROGRAM} \ ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so \ - ${X11BASE}/lib/modules/extensions ; \ + ${LOCALBASE}/lib/modules/extensions ; \ fi ${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \ ${PREFIX}/man/man1/Xvnc.1 diff --git a/net/vnc/files/vnc.def-patch b/net/vnc/files/vnc.def-patch index 7916363..b1c3075 100644 --- a/net/vnc/files/vnc.def-patch +++ b/net/vnc/files/vnc.def-patch @@ -5,7 +5,7 @@ #endif +#ifdef FreeBSDArchitecture -+#define ProjectRoot %%X11BASE%% ++#define ProjectRoot %%LOCALBASE%% +#endif + #define HasFreetype2 NO diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 97efdca..e18c8dc 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -7,7 +7,7 @@ PORTNAME?= wireshark PORTVERSION= 1.0.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://wireshark.osmirror.nl/download/src/ \ @@ -26,7 +26,6 @@ USE_PERL5_BUILD=yes USE_PYTHON_BUILD=yes USE_ICONV= yes USE_BZIP2= yes -USE_GCC= 3.4+ USE_GMAKE= yes USE_GNOME= gnometarget WANT_GNOME= yes @@ -62,7 +61,7 @@ PLIST_SUB+= ${x:U}=bin/$x .endfor .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .endif .if !defined(LITE) diff --git a/net/wmnet/files/patch-aa b/net/wmnet/files/patch-aa index c1e40dc..2288aca 100644 --- a/net/wmnet/files/patch-aa +++ b/net/wmnet/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Dec 4 02:03:58 1998 -+++ Makefile Mon Apr 12 00:05:16 1999 +--- Makefile.orig 1998-12-03 16:33:58.000000000 +0100 ++++ Makefile 2008-04-11 14:58:15.000000000 +0200 @@ -2,22 +2,24 @@ # Makefile,v 1.8 1998/12/03 15:33:58 rneswold Exp # @@ -9,14 +9,15 @@ BINDIR=${PREFIX}/bin -LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib -+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -lkvm OBJS = main.o if.o wmgeneral.o - INCDIR = -I${X11BASE}/include - +-INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include ++ +CC ?= cc +CFLAGS ?= -O -+ + .c.o : - cc -c -g -O1 -Wall ${INCDIR} $< -o $*.o + $(CC) -c $(CFLAGS) -g -Wall ${INCDIR} $< -o $*.o diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile index 2f5524f..4ba3ca2 100644 --- a/net/wmpiki/Makefile +++ b/net/wmpiki/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XORG= xpm post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$$(X11BASE)|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$$(LOCALBASE)|g' \ -e 's|/include/X11|/include|g' \ -e 's|gcc|cc|g' \ ${WRKSRC}/Makefile diff --git a/net/wmq3/Makefile b/net/wmq3/Makefile index e1ba196..34cbd8f 100644 --- a/net/wmq3/Makefile +++ b/net/wmq3/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmq3 PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net windowmaker games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ http://mirror2.unixfreunde.de/ @@ -19,8 +19,7 @@ RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME} USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message diff --git a/net/wmq3/files/patch-Makefile b/net/wmq3/files/patch-Makefile index 35fb478..d0f727a 100644 --- a/net/wmq3/files/patch-Makefile +++ b/net/wmq3/files/patch-Makefile @@ -4,9 +4,9 @@ -LIBDIR = -L/usr/X11R6/lib -MANDIR = /usr/local/man/man1/ -INSTALL = install -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -+CFLAGS += -I${X11BASE}/include ++CFLAGS += -I${LOCALBASE}/include OBJS = wmq3.o \ ../wmgeneral/wmgeneral.o \ ../wmgeneral/misc.o \ diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile index 9af84fb..22cf1c4 100644 --- a/net/wmwifi/Makefile +++ b/net/wmwifi/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_XORG= x11 xpm USE_GMAKE= yes -CONFIGURE_ENV+= "CPPFLAGS=-I${X11BASE}/include" +CONFIGURE_ENV+= "CPPFLAGS=-I${LOCALBASE}/include" PLIST_FILES= bin/wmwifi diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile index 8f66605..2044416 100644 --- a/net/wmwlmon/Makefile +++ b/net/wmwlmon/Makefile @@ -31,7 +31,7 @@ BROKEN= Does not compile with GCC 4.2 post-patch: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.presed - ${SED} -e 's#/usr/X11R6#${X11BASE}#g' \ + ${SED} -e 's#/usr/X11R6#${LOCALBASE}#g' \ -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/Makefile.presed > ${WRKSRC}/Makefile diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 91f250a..403598a 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -7,7 +7,7 @@ PORTNAME= xipdump PORTVERSION= 1.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.lse.epita.fr/twiki/pub/Projects/XipDump/ EXTRACT_SUFX= .tgz @@ -17,7 +17,7 @@ COMMENT= Displays ip packets using X window BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 -USE_X_PREFIX= yes +USE_XORG= xt x11 ice xaw xmu GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="`${LIBNET_CONFIG} --libs`" CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \ diff --git a/net/xisp/files/patch-Makefile b/net/xisp/files/patch-Makefile index 62e2fa5..66e8289 100644 --- a/net/xisp/files/patch-Makefile +++ b/net/xisp/files/patch-Makefile @@ -9,7 +9,7 @@ -X11PREFIX = /usr/X11R6 +CC ?= gcc +PREFIX = %%PREFIX%% -+X11PREFIX = ${X11BASE} ++X11PREFIX = ${LOCALBASE} INCX11 = $(X11PREFIX)/include LIBX11 = $(X11PREFIX)/lib -INCFORMS = $(X11PREFIX)/include diff --git a/net/xpvm/files/patch-src:Makefile.aimk b/net/xpvm/files/patch-src:Makefile.aimk index 0e93e83..6d7886d 100644 --- a/net/xpvm/files/patch-src:Makefile.aimk +++ b/net/xpvm/files/patch-src:Makefile.aimk @@ -67,8 +67,8 @@ diff -ruN xpvm.orig/src/Makefile.aimk xpvm/src/Makefile.aimk # Linux Like Systems -#XINCL = -I/usr/X11R6/include -#XLIBDIR = -L/usr/X11R6/lib -+XINCL = -I$(X11BASE)/include -+XLIBDIR = -L$(X11BASE)/lib ++XINCL = -I$(LOCALBASE)/include ++XLIBDIR = -L$(LOCALBASE)/lib XLIB = -lX11 #XLIB = -lX11 -lXpm diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 5583000..d5546c5 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gdkpixbuf USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib \ +CONFIGURE_ARGS= --with-GL-prefix=${LOCALBASE}/lib \ --with-lib-GL \ --with-host=${LOCALBASE}/bin/host CONFIGURE_ENV+= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/net/yaz++/Makefile b/net/yaz++/Makefile index b180de3..0795c55 100644 --- a/net/yaz++/Makefile +++ b/net/yaz++/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= yaz.3:${PORTSDIR}/net/yaz GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shared --with-yaz=${LOCALBASE}/bin -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= yazpp-config.8 diff --git a/net/yazproxy/Makefile b/net/yazproxy/Makefile index bd9c5cf..ba6069d 100644 --- a/net/yazproxy/Makefile +++ b/net/yazproxy/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= yazpp:${PORTSDIR}/net/yaz++ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shared --with-yazpp=${LOCALBASE}/bin -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= yazproxy.8 diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile index 972d5327..a1f054e 100644 --- a/news/husky-fidoconf/Makefile +++ b/news/husky-fidoconf/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base CONFLICTS= husky-fidoconf-devel-[0-9]* -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= install install-man MAN1= dumpfcfg.1 fconf2.1 linkedto.1 tparser.1 diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile index 8948b88..f1352a3 100644 --- a/news/husky-smapi/Makefile +++ b/news/husky-smapi/Makefile @@ -16,7 +16,7 @@ COMMENT= MSGAPI for Husky Fidosoft Project CONFLICTS= husky-smapi-devel-[0-9]* -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> .include "${PORTSDIR}/news/husky-base/Makefile.inc" diff --git a/news/nntpswitch/Makefile b/news/nntpswitch/Makefile index 0f733a3..24d1b03 100644 --- a/news/nntpswitch/Makefile +++ b/news/nntpswitch/Makefile @@ -17,7 +17,7 @@ COMMENT= A NNTP content router WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= YES USE_PERL5= YES -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES MAKE_ENV+= PERL=${PERL} LIBS="${LDFLAGS}" CFLAGS+= -I${LOCALBASE}/include diff --git a/news/pan/Makefile b/news/pan/Makefile index 52d6810..8f30e61 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -8,6 +8,7 @@ PORTNAME= pan PORTVERSION= 0.132 +PORTREVISION= 1 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/ DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Threaded GTK+2 newsreader based on Agent for Windows LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 intlhack diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile index c0c4659..356e80e 100644 --- a/news/slrnface/Makefile +++ b/news/slrnface/Makefile @@ -7,7 +7,7 @@ PORTNAME= slrnface PORTVERSION= 2.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= news MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/s/${PORTNAME} @@ -21,10 +21,9 @@ LIB_DEPENDS= compface:${PORTSDIR}/mail/faces WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} ALL_TARGET= slrnface MAKE_ARGS= CC="${CC}" C_FLAGS="${CFLAGS}" \ - X_INCL=-I${X11BASE}/include \ - XF_LIB="-L${X11BASE}/lib -L${LOCALBASE}/lib -lcompface" - -USE_XLIB= yes + X_INCL=-I${LOCALBASE}/include \ + XF_LIB="-L${LOCALBASE}/lib -lcompface" +USE_XORG= xt MAN1= slrnface.1 PLIST_FILES= bin/slrnface share/examples/slrnface/slrnface.sl diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index 3db629c..7ab298f 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -7,9 +7,9 @@ PORTNAME= gnome-pilot-conduits PORTVERSION= 2.0.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= palm comms gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 DIST_SUBDIR= gnome2 @@ -20,7 +20,6 @@ LIB_DEPENDS= gpilotd.3:${PORTSDIR}/palm/gnome-pilot USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_BISON= build USE_GNOME= gnomeprefix gnomehack libgnome USE_GETTEXT= yes diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 9dec76f..872c429 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-pilot PORTVERSION= 2.0.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= palm comms gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -20,7 +20,6 @@ BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2 LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack USE_GETTEXT= yes diff --git a/palm/pose/Makefile b/palm/pose/Makefile index 12c2802..91b63f0 100644 --- a/palm/pose/Makefile +++ b/palm/pose/Makefile @@ -24,9 +24,7 @@ USE_PERL5_BUILD=yes WRKSRC= ${WRKDIR}/Emulator_Src_${PORTVERSION}/BuildUnix USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ - --with-x --with-fltk=${X11BASE} +CONFIGURE_ARGS= --with-x --with-fltk=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ CFLAGS=-DBROKEN_VIRTUAL_DEFAULT_ARGUMENTS=1 \ LIBS="${PTHREAD_LIBS}" diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile index 3edf324..5f14ba5 100644 --- a/palm/synce-gnomevfs/Makefile +++ b/palm/synce-gnomevfs/Makefile @@ -7,10 +7,9 @@ PORTNAME= synce-gnomevfs PORTVERSION= 0.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= palm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= synce +MASTER_SITES= SF/synce MAINTAINER= ports@FreeBSD.org COMMENT= Gnome VFS module for WinCE devices @@ -19,7 +18,6 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2 USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnometarget gnomevfs2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \ --with-libsynce=${LOCALBASE} diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile index 3edf324..5f14ba5 100644 --- a/palm/synce-gvfs/Makefile +++ b/palm/synce-gvfs/Makefile @@ -7,10 +7,9 @@ PORTNAME= synce-gnomevfs PORTVERSION= 0.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= palm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= synce +MASTER_SITES= SF/synce MAINTAINER= ports@FreeBSD.org COMMENT= Gnome VFS module for WinCE devices @@ -19,7 +18,6 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2 USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnometarget gnomevfs2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \ --with-libsynce=${LOCALBASE} diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index a125881..2a0405c 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnugadu2 PORTVERSION= 2.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= polish net-im -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ggadu +MASTER_SITES= SF/ggadu DISTNAME= gg2-${PORTVERSION} MAINTAINER= smyru@heron.pl @@ -48,8 +47,7 @@ CONFIGURE_ARGS= --disable-esdtest \ --without-remote CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= TLEN "Enable Tlen.pl network plugin" off \ JABBER "Enable Jabber loudmouth plugin" off \ diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index 747b038..4f66f43 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -36,8 +36,8 @@ USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-existing-libgadu="${LOCALBASE}" \ - --with-includes="${LOCALBASE}/include ${X11BASE}/include" \ - --with-libs="${LOCALBASE}/lib ${X11BASE}/lib" \ + --with-includes="${LOCALBASE}/include" \ + --with-libs="${LOCALBASE}/lib" \ --program-transform-name='' \ --disable-autodownload CONFIGURE_ENV= QTDIR="${QT_PREFIX}" diff --git a/polish/libtlen/Makefile b/polish/libtlen/Makefile index 64f8c28..b2f140c 100644 --- a/polish/libtlen/Makefile +++ b/polish/libtlen/Makefile @@ -16,7 +16,7 @@ MAINTAINER= smyru@heron.pl COMMENT= Backend for interoperability with Tlen.pl, Polish IM network GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if !defined(NOPORTDOCS) post-install: diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile index 2fc01d4..b4d5017 100644 --- a/polish/tleenx2/Makefile +++ b/polish/tleenx2/Makefile @@ -7,10 +7,9 @@ PORTNAME= tleenx2 PORTVERSION= 20040214 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= polish net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tleenx +MASTER_SITES= SF/leenx DISTNAME= TleenX2-${PORTVERSION} MAINTAINER= mkorzen@gmail.com @@ -20,6 +19,7 @@ LIB_DEPENDS= tlen.1:${PORTSDIR}/polish/libtlen USE_GNOME= gtk20 GNU_CONFIGURE= yes +USE_XORG= xscrnsaver CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/TleenX2-${PORTVERSION} @@ -27,7 +27,7 @@ MAN1= tleenx2.1 PORTDOCS= README gg.txt sms.txt post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/src/Makefile.in post-install: .if !defined(NOPORTDOCS) diff --git a/polish/tleenx2/files/patch-iksemel-Makefile b/polish/tleenx2/files/patch-iksemel-Makefile index 5d1cb304..ffb2d67 100644 --- a/polish/tleenx2/files/patch-iksemel-Makefile +++ b/polish/tleenx2/files/patch-iksemel-Makefile @@ -5,7 +5,7 @@ CC = gcc -CFLAGS = -g -Wall -L/usr/local/lib -I/usr/local/include -+CFLAGS = -Wall -L$(LOCALBASE)/lib -I$(LOCALBASE)/include -L$(X11BASE)/lib -I$(X11BASE)/include ++CFLAGS = -Wall -L$(LOCALBASE)/lib -I$(LOCALBASE)/include OBJS = convert.o iks.o ikspool.o jabber.o sha.o core.o iksid.o io.o parser.o \ utility.o all: $(OBJS) diff --git a/ports-mgmt/pib/files/patch-Makefile b/ports-mgmt/pib/files/patch-Makefile index e56a5d0..6388895 100644 --- a/ports-mgmt/pib/files/patch-Makefile +++ b/ports-mgmt/pib/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Oct 28 10:55:08 2000 -+++ Makefile Thu Mar 15 20:10:02 2007 +--- Makefile.orig 2000-10-28 10:55:08.000000000 +0200 ++++ Makefile 2008-04-12 14:19:18.000000000 +0200 @@ -8,13 +8,12 @@ X11BASE?= /usr/X11R6 @@ -15,12 +15,14 @@ .endif SRCS= tkXAccess.c -@@ -25,7 +24,7 @@ +@@ -25,8 +24,8 @@ PAXFILES= ${SRCS} ${TCL_SRCS} ${HDRS} ${OTHER} PAXNAME= pib-1.1 -CFLAGS+= -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 \ +- -I${X11BASE}/include \ +CFLAGS+= -I${PREFIX}/include/tcl8.4 -I${PREFIX}/include/tk8.4 \ - -I${X11BASE}/include \ ++ -I${LOCALBASE}/include \ -DUSE_XACCESS -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 \ -DSTDC_HEADERS=1 -DTK_FILE_COUNT=_r -DNEED_MATHERR=1 \ + -DTK_LIBRARY=\"${PREFIX}/lib/tk8.2\" diff --git a/ports-mgmt/qtpkg/files/patch-Makefile b/ports-mgmt/qtpkg/files/patch-Makefile index 1555853..5272cfe 100644 --- a/ports-mgmt/qtpkg/files/patch-Makefile +++ b/ports-mgmt/qtpkg/files/patch-Makefile @@ -12,14 +12,14 @@ $FreeBSD$ -INCPATH = -I/usr/local/include -I/usr/X11R6/include/qt2 +CFLAGS += -pipe -Wall -W -DNO_DEBUG +CXXFLAGS += ${CFLAGS} -+INCPATH = -I$(LOCALBASE)/include -I$(X11BASE)/include/ ++INCPATH = -I$(LOCALBASE)/include LINK = c++ -LIBS = $(SUBLIBS) -L/usr/local/lib -L/usr/X11R6/lib -lqt2 -lXext -lX11 -lm -MOC = /usr/X11R6/bin/moc2 -UIC = /usr/X11R6/bin/uic -+LIBS += $(SUBLIBS) -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lXext -lX11 -lm -+MOC = $(X11BASE)/bin/moc -+UIC = $(X11BASE)/bin/uic ++LIBS += $(SUBLIBS) -L$(LOCALBASE)/lib -lXext -lX11 -lm ++MOC = $(LOCALBASE)/bin/moc ++UIC = $(LOCALBASE)/bin/uic TAR = tar -cf GZIP = gzip -9f diff --git a/portuguese/staroffice52/Makefile b/portuguese/staroffice52/Makefile index 095cd2e..516cb86 100644 --- a/portuguese/staroffice52/Makefile +++ b/portuguese/staroffice52/Makefile @@ -32,7 +32,7 @@ FETCH_DEPENDS= ${LINUX_BASE_PORT} ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_CDROM= 'Deve ser obtido diretamente do site da Sun via interface www' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile index b868c07..ae8418e 100644 --- a/print/acroread7/Makefile +++ b/print/acroread7/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= acroread:${PORTSDIR}/print/acroreadwrapper \ RESTRICTED= Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html ONLY_FOR_ARCHS= amd64 i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes #USE_GNOME= desktopfileutils NO_BUILD= yes PLIST= ${PKGDIR}/pkg-plist.${PORTVERSION} diff --git a/print/advi/Makefile b/print/advi/Makefile index 7de1eb5..f90c312 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS= kpsewhich:${PORTSDIR}/print/teTeX-base USE_OCAML= yes NO_OCAML_RUNDEPENDS=yes USE_GHOSTSCRIPT=yes -USE_XPM= yes +USE_XORG= xpm USE_FREETYPE= yes GNU_CONFIGURE= yes USE_GMAKE= yes @@ -41,7 +41,7 @@ post-extract: @${REINPLACE_CMD} -E \ -e 's,^(COPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \ -e 's,^(COPTOPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \ - -e 's,^(X11_INCLUDES[[:space:]]*=).*,\1-I${X11BASE}/include,' \ + -e 's,^(X11_INCLUDES[[:space:]]*=).*,\1-I${LOCALBASE}/include,' \ -e 's,install -m 644,\$${BSD_INSTALL_DATA},' \ -e 's,install -m 755,\$${BSD_INSTALL_PROGRAM},' \ ${WRKSRC}/Makefile diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index c760152..2eecfc0 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -82,7 +82,7 @@ RUN_DEPENDS+= htmldoc:${PORTSDIR}/textproc/htmldoc RUN_DEPENDS+= psnup:${PORTSDIR}/print/psutils-${PAPERSIZE} .if !defined(WITHOUT_X11) # "xxx to ps" filter utilities that require X -RUN_DEPENDS+= ${X11BASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7 +RUN_DEPENDS+= ${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7 RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS+= dvips:${PORTSDIR}/print/teTeX RUN_DEPENDS+= wmf2eps:${PORTSDIR}/graphics/libwmf diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure index 9b968ac..037f293 100644 --- a/print/apsfilter/scripts/configure +++ b/print/apsfilter/scripts/configure @@ -113,7 +113,7 @@ while [ "$1" ]; do esac ;; \"ACROREAD7\") - echo RUN_DEPENDS+=${X11BASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7 + echo RUN_DEPENDS+=${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7 ;; \"CONVERT\") echo RUN_DEPENDS+=convert:${PORTSDIR}/graphics/ImageMagick diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa index 6852192..4f1ba5f 100644 --- a/print/asprint/files/patch-aa +++ b/print/asprint/files/patch-aa @@ -9,15 +9,15 @@ - +CFLAGS ?= -O2 +CC ?= gcc -+XLIB = -L$(X11BASE)/lib -lXaw -lXmu -lXt -+XLIB+= -Wl,-rpath,$(X11BASE)/lib ++XLIB = -L$(LOCALBASE)/lib -lXaw -lXmu -lXt ++XLIB+= -Wl,-rpath,$(LOCALBASE)/lib OBJS = asprint.o -INCS = - -default : asprint ./makefile -clean: - rm -f $(OBJS) *~ asprint core -+INCS = -I$(X11BASE)/include ++INCS = -I$(LOCALBASE)/include asprint: $(OBJS) $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB) diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 9bb2cdd..42c94db 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -28,7 +28,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost \ qt-mt:${PORTSDIR}/x11-toolkits/qt33 -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf OPTIONS= ASPELL "Utilize ASPELL library" on \ ISPELL "Depend on ISPELL as well" off diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile index cdf7be0..af63fb6 100644 --- a/print/ft2demos/Makefile +++ b/print/ft2demos/Makefile @@ -27,7 +27,7 @@ USE_XORG= xext USE_GMAKE= yes USE_AUTOTOOLS= libtool:15:env MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}" -MAKE_ARGS= X11_PATH="${X11BASE}" +MAKE_ARGS= X11_PATH="${LOCALBASE}" PLIST_FILES= ${FT_PROGRAMS:S,^,bin/,} diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile index 9375587..ffc2947 100644 --- a/print/gfontview/Makefile +++ b/print/gfontview/Makefile @@ -10,15 +10,13 @@ PORTNAME= gfontview PORTVERSION= 0.5.0 PORTREVISION= 6 CATEGORIES= print gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An outline font viewer LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix USE_FREETYPE= yes GNU_CONFIGURE= yes diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 424bef4..a976be3 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -8,7 +8,7 @@ PORTNAME= ggv PORTVERSION= 2.12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 @@ -18,14 +18,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 ghostscript viewer USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils USE_GETTEXT= yes USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= ggv.schemas diff --git a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak index e09585b..41f387c 100644 --- a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak +++ b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak @@ -111,7 +111,7 @@ # not in $(XINCLUDE). -XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${X11BASE}/include ++XINCLUDE=-I${LOCALBASE}/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH @@ -124,7 +124,7 @@ #XLIBDIRS=-L/usr/local/X/lib -XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${X11BASE}/lib ++XLIBDIRS=-L${LOCALBASE}/lib XLIBDIR= -XLIBS=Xt Xext X11 +#XLIBS=Xt Xext X11 diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak index 2a458b8..7e9753df 100644 --- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak +++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak @@ -148,7 +148,7 @@ # not in $(XINCLUDE). -XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${X11BASE}/include ++XINCLUDE=-I${LOCALBASE}/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH @@ -161,7 +161,7 @@ #XLIBDIRS=-L/usr/local/X/lib -XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${X11BASE}/lib ++XLIBDIRS=-L${LOCALBASE}/lib XLIBDIR= -XLIBS=Xt Xext X11 +#XLIBS=Xt Xext X11 diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak index e09585b..41f387c 100644 --- a/print/ghostscript7/files/patch-src:unix-gcc.mak +++ b/print/ghostscript7/files/patch-src:unix-gcc.mak @@ -111,7 +111,7 @@ # not in $(XINCLUDE). -XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${X11BASE}/include ++XINCLUDE=-I${LOCALBASE}/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH @@ -124,7 +124,7 @@ #XLIBDIRS=-L/usr/local/X/lib -XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${X11BASE}/lib ++XLIBDIRS=-L${LOCALBASE}/lib XLIBDIR= -XLIBS=Xt Xext X11 +#XLIBS=Xt Xext X11 diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak index 2a458b8..7e9753df 100644 --- a/print/ghostscript8/files/patch-src:unix-gcc.mak +++ b/print/ghostscript8/files/patch-src:unix-gcc.mak @@ -148,7 +148,7 @@ # not in $(XINCLUDE). -XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${X11BASE}/include ++XINCLUDE=-I${LOCALBASE}/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH @@ -161,7 +161,7 @@ #XLIBDIRS=-L/usr/local/X/lib -XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${X11BASE}/lib ++XLIBDIRS=-L${LOCALBASE}/lib XLIBDIR= -XLIBS=Xt Xext X11 +#XLIBS=Xt Xext X11 diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile index cd6e130..bf6a1fd 100644 --- a/print/gl2ps/Makefile +++ b/print/gl2ps/Makefile @@ -32,7 +32,7 @@ do-install: @${SED} -e 's|%%CC%%|${CC}|g; \ s|%%RM%%|${RM}|g; \ s|%%CFLAGS%%|${CFLAGS}|g; \ - s|%%X11BASE%%|${X11BASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ <${FILESDIR}/Makefile.ex >${EXAMPLESDIR}/Makefile .ifndef (NOPORTDOCS) diff --git a/print/gl2ps/files/Makefile.ex b/print/gl2ps/files/Makefile.ex index a3410bb..6ead282 100644 --- a/print/gl2ps/files/Makefile.ex +++ b/print/gl2ps/files/Makefile.ex @@ -3,8 +3,8 @@ CC=%%CC%% RM=%%RM%% -CFLAGS= %%CFLAGS%% -DHAVE_ZLIB -O3 -I%%X11BASE%%/include -LDFLAGS= -lgl2ps -lGL -lGLU -lglut -L%%X11BASE%%/lib -lX11 -lXi -lXmu -lm -lz +CFLAGS= %%CFLAGS%% -DHAVE_ZLIB -O3 -I%%LOCALBASE%%/include +LDFLAGS= -lgl2ps -lGL -lGLU -lglut -L%%LOCALBASE%%/lib -lX11 -lXi -lXmu -lm -lz gl2psTest: gl2psTest.o ${CC} ${LDFLAGS} $> -o $@ diff --git a/print/gl2ps/files/Makefile.lib b/print/gl2ps/files/Makefile.lib index 6d6b283..2d806cb 100644 --- a/print/gl2ps/files/Makefile.lib +++ b/print/gl2ps/files/Makefile.lib @@ -1,5 +1,5 @@ -CFLAGS+= -DHAVE_ZLIB -O3 -fPIC -I${X11BASE}/include -LDFLAGS= -shared -E -lGL -L${X11BASE}/lib -lX11 -lXi -lXmu -lm -lz +CFLAGS+= -DHAVE_ZLIB -O3 -fPIC -I${LOCALBASE}/include +LDFLAGS= -shared -E -lGL -L${LOCALBASE}/lib -lX11 -lXi -lXmu -lm -lz all: libgl2ps.so libgl2ps.a diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile index e64a36f..d419e0a 100644 --- a/print/gnome-cups-manager/Makefile +++ b/print/gnome-cups-manager/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-cups-manager PORTVERSION= 0.31 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -23,7 +23,6 @@ RUN_DEPENDS= gnomesu:${PORTSDIR}/security/libgnomesu USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \ desktopfileutils diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index b97db20..16531a0 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-print PORTVERSION= 0.37 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-print/0.37 @@ -27,7 +27,6 @@ PLIST_SUB= VERSION=${PORTVERSION} USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_PERL5= yes USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile index 3d4a505..b49ba6d 100644 --- a/print/gnomephotoprinter/Makefile +++ b/print/gnomephotoprinter/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomephotoprinter PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print gnome MASTER_SITES= http://www.fogman.de/gpp/ DISTNAME= gpp-${PORTVERSION} @@ -16,7 +16,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome Photo Printer is intended for printing photos in an easy way -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui libglade2 libgnomeprintui \ gnomevfs2 diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile index 089a5cc..616d35a 100644 --- a/print/gribouy/Makefile +++ b/print/gribouy/Makefile @@ -7,7 +7,7 @@ PORTNAME= gribouy PORTVERSION= 0.0.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= print gnome #MASTER_SITES= ${MASTER_SITE_SAVANNAH} #MASTER_SITE_SUBDIR= gribouy/unstable.pkg/${PORTVERSION:R} @@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Gribouy is a Type1 font editor USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libglade2 libgnomeui GNU_CONFIGURE= yes diff --git a/print/gv/Makefile b/print/gv/Makefile index 18a40d2..4018d57 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -8,7 +8,7 @@ PORTNAME= gv PORTVERSION= 3.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +18,7 @@ COMMENT= A PostScript and PDF previewer LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_XORG= xpm +USE_XORG= xpm ice sm xext xmu x11 USE_GHOSTSCRIPT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile index dff2eb9..d99a4fe 100644 --- a/print/hp2xx/Makefile +++ b/print/hp2xx/Makefile @@ -34,8 +34,8 @@ PKGNAMESUFFIX= -nox11 PREVIEWER= no_prev .else USE_XORG= x11 -CPPFLAGS+= -DHAS_UNIX_X11 -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib -lX11 +CPPFLAGS+= -DHAS_UNIX_X11 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lX11 PREVIEWER= to_x11 .endif diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 85fdd7f..5951700 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnomeprint PORTVERSION= 2.18.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -30,7 +30,6 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \ libartlgpl2 ltverhack USE_GETTEXT= yes -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile index 3472c63..88bca3e 100644 --- a/print/libgnomeprintmm/Makefile +++ b/print/libgnomeprintmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomeprintmm PORTVERSION= 2.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5 @@ -21,11 +21,9 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomeprefix gnomehack libgnomeprint -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static diff --git a/print/libppd/Makefile b/print/libppd/Makefile index ce13995..2e66ed2 100644 --- a/print/libppd/Makefile +++ b/print/libppd/Makefile @@ -17,7 +17,7 @@ COMMENT= A library providing routines for ppd files USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= Yes +USE_LDCONFIG= Yes USE_GNOME= glib12 MAN1= ppdfilt.1 diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 1a2c446..463c98e 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -31,7 +31,7 @@ INFO= lilypond lilypond-internals \ music-glossary BROKEN= does not build with guile-1.8; needs update to 2.10.33 -#INSTALLS_SHLIB not needed for phyton library midi.so +#USE_LDCONFIG not needed for phyton library midi.so GNU_CONFIGURE= yes USE_GETTEXT= yes diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index 38d9725..543f3eb 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -67,7 +67,7 @@ post-configure: .include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/makepsres) +.if exists(${LOCALBASE}/bin/makepsres) PLIST_SUB+= PSRES= .else PLIST_SUB+= PSRES='@comment ' @@ -84,7 +84,7 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 CONFIGURE_ARGS+= --with-frontend=qt CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf .else LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_ARGS+=--with-frontend=xforms @@ -106,7 +106,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--without-ispell .endif -.if exists(${X11BASE}/lib/libqt-mt.prl) +.if exists(${LOCALBASE}/lib/libqt-mt.prl) QT_PRESENT= on .else QT_PRESENT= off diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 38d9725..543f3eb 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -67,7 +67,7 @@ post-configure: .include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/makepsres) +.if exists(${LOCALBASE}/bin/makepsres) PLIST_SUB+= PSRES= .else PLIST_SUB+= PSRES='@comment ' @@ -84,7 +84,7 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 CONFIGURE_ARGS+= --with-frontend=qt CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf .else LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_ARGS+=--with-frontend=xforms @@ -106,7 +106,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--without-ispell .endif -.if exists(${X11BASE}/lib/libqt-mt.prl) +.if exists(${LOCALBASE}/lib/libqt-mt.prl) QT_PRESENT= on .else QT_PRESENT= off diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index 38d9725..543f3eb 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -67,7 +67,7 @@ post-configure: .include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/makepsres) +.if exists(${LOCALBASE}/bin/makepsres) PLIST_SUB+= PSRES= .else PLIST_SUB+= PSRES='@comment ' @@ -84,7 +84,7 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 CONFIGURE_ARGS+= --with-frontend=qt CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf .else LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_ARGS+=--with-frontend=xforms @@ -106,7 +106,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--without-ispell .endif -.if exists(${X11BASE}/lib/libqt-mt.prl) +.if exists(${LOCALBASE}/lib/libqt-mt.prl) QT_PRESENT= on .else QT_PRESENT= off diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index 2bab363..69247c7 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -23,7 +23,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) (stable) BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \ ${LOCALBASE}/share/texmf/tex/latex/prettyref/prettyref.sty:${PORTSDIR}/print/latex-prettyref \ - ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf + ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost LATEST_LINK= lyx15 @@ -93,7 +93,7 @@ post-install: .include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/makepsres) +.if exists(${LOCALBASE}/bin/makepsres) PLIST_SUB+= PSRES= .else PLIST_SUB+= PSRES='@comment ' diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index 38d9725..543f3eb 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -67,7 +67,7 @@ post-configure: .include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/makepsres) +.if exists(${LOCALBASE}/bin/makepsres) PLIST_SUB+= PSRES= .else PLIST_SUB+= PSRES='@comment ' @@ -84,7 +84,7 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 CONFIGURE_ARGS+= --with-frontend=qt CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf .else LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_ARGS+=--with-frontend=xforms @@ -106,7 +106,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--without-ispell .endif -.if exists(${X11BASE}/lib/libqt-mt.prl) +.if exists(${LOCALBASE}/lib/libqt-mt.prl) QT_PRESENT= on .else QT_PRESENT= off diff --git a/print/mgv/Makefile b/print/mgv/Makefile index 6f06164..d3da6b4 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -19,7 +19,6 @@ COMMENT= A PostScript and PDF previewer USE_XORG= xpm USE_MOTIF= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= X11BASE=${X11BASE} CONFIGURE_ARGS= --enable-optimize \ --disable-debug PLIST_SUB= MGV_VERSION=${PORTVERSION} diff --git a/print/mup/files/Makefile.disp b/print/mup/files/Makefile.disp index cfc4a0f..f9b8b00 100644 --- a/print/mup/files/Makefile.disp +++ b/print/mup/files/Makefile.disp @@ -8,8 +8,8 @@ SRCS= do_cmd.c \ mupdisp.c \ xterm.c -CFLAGS+=-I${X11BASE}/include -LDADD+= -L${X11BASE}/lib -lX11 +CFLAGS+=-I${LOCALBASE}/include +LDADD+= -L${LOCALBASE}/lib -lX11 .include <bsd.prog.mk> diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 9d2d04f..b62d0c2 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -31,7 +31,6 @@ USE_PYTHON= yes USE_GMAKE= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include USE_LDCONFIG= yes PLIST_SUB+= SCRIBUS_VERSION=${PORTVERSION} diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 9d2d04f..b62d0c2 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -31,7 +31,6 @@ USE_PYTHON= yes USE_GMAKE= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include USE_LDCONFIG= yes PLIST_SUB+= SCRIBUS_VERSION=${PORTVERSION} diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile index 0450708..c997732 100644 --- a/print/teTeX-base/Makefile +++ b/print/teTeX-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= teTeX-base PORTVERSION= 3.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \ ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1 @@ -110,7 +110,7 @@ PLIST_SUB?= .if !defined(WITHOUT_X11) PLIST_SUB+= X11BITS="" -USE_XLIB= yes +USE_XORG= x11 .else FLAVOR+= nox11 CONFIGURE_ARGS+=--without-x11 diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile index 463942f..0b5d81b 100644 --- a/print/tgif2tex/Makefile +++ b/print/tgif2tex/Makefile @@ -31,7 +31,6 @@ DOCSRC= how-to-use.aux how-to-use.dvi \ do-build: ${REINPLACE_CMD} \ -e "s,%%LOCALBASE%%,${LOCALBASE}," \ - -e "s,%%X11BASE%%,${X11BASE}," \ ${WRKSRC}/tgif2tex do-install: diff --git a/print/tgif2tex/files/patch-tgif2tex b/print/tgif2tex/files/patch-tgif2tex index b9aee14..3b24e1a 100644 --- a/print/tgif2tex/files/patch-tgif2tex +++ b/print/tgif2tex/files/patch-tgif2tex @@ -10,11 +10,11 @@ -$pnm_command='/usr/bin/gs -sDEVICE=pnmraw -sOutputFile=- -sNOPAUSE -dBATCH -q -r400'; -$convert_command='/usr/bin/pnmcrop | /usr/bin/pnmmargin -white 10 | /usr/bin/convert - '; +$LOCALBASE='%%LOCALBASE%%'; -+$X11BASE='%%X11BASE%%'; ++$LOCALBASE='%%LOCALBASE%%'; + +$latex_command="${LOCALBASE}/bin/platex"; # latex command in your site. +$dvips_command="${LOCALBASE}/bin/dvips"; -+$tgif_command="${X11BASE}/bin/tgif"; ++$tgif_command="${LOCALBASE}/bin/tgif"; +$pnm_command="${LOCALBASE}/bin/gs -sDEVICE=pnmraw -sOutputFile=- -sNOPAUSE -dBATCH -q -r400"; +$convert_command="${LOCALBASE}/bin/pnmcrop | ${LOCALBASE}/bin/pnmmargin -white 10 | ${LOCALBASE}/bin/convert - "; diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 0aa6892..cd310be 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_GHOSTSCRIPT_RUN= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 MAKE_ARGS+= INSTALLFLAGS="${COPY}" \ diff --git a/print/wmlpq/files/patch-Makefile b/print/wmlpq/files/patch-Makefile index d3d25d1..d7c64c4 100644 --- a/print/wmlpq/files/patch-Makefile +++ b/print/wmlpq/files/patch-Makefile @@ -3,11 +3,11 @@ @@ -1,13 +1,11 @@ -prefix= -CPPFLAGS = -I/usr/X11R6/include -I/usr/local/include -+CPPFLAGS = -I$(X11BASE)/include -I/usr/local/include ++CPPFLAGS = -I$(LOCALBASE)/include -I/usr/local/include LIBS = -lXpm -lX11 -ldockapp -LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -CFLAGS = -O2 -Wall -+LDFLAGS = -L$(X11BASE)/lib -L/usr/local/lib ++LDFLAGS = -L$(LOCALBASE)/lib -L/usr/local/lib +CFLAGS += -Wall DFLAGS = -ggdb3 -Wall diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile index 6cc8a85..a3d5ad5 100644 --- a/russian/artwiz-ru/Makefile +++ b/russian/artwiz-ru/Makefile @@ -25,10 +25,10 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/fonts PKGMESSAGE= ${WRKDIR}/pkg-message -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME} +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME} post-patch: - @${SED} -e 's,X11BASE,${X11BASE},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} + @${SED} -e 's,LOCALBASE,${LOCALBASE},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} do-install: ${MKDIR} ${FONTDIR} diff --git a/russian/artwiz-ru/files/pkg-message.in b/russian/artwiz-ru/files/pkg-message.in index 3e8fa97..04de251 100644 --- a/russian/artwiz-ru/files/pkg-message.in +++ b/russian/artwiz-ru/files/pkg-message.in @@ -1,8 +1,8 @@ ============================================================ -You'll have to add X11BASE/lib/X11/fonts/artwiz-ru +You'll have to add LOCALBASE/lib/X11/fonts/artwiz-ru to your X font path by either: -$ xset fp+ X11BASE/lib/X11/fonts/artwiz-ru +$ xset fp+ LOCALBASE/lib/X11/fonts/artwiz-ru $ xset fp rehash or by adding it to your X-server configuration file and diff --git a/russian/libcyrillic/Makefile b/russian/libcyrillic/Makefile index 9ec234e..ffcffec 100644 --- a/russian/libcyrillic/Makefile +++ b/russian/libcyrillic/Makefile @@ -17,7 +17,7 @@ COMMENT= Text manipulation and autodetection for 6 major cyrillic charsets MAKE_ENV= WRKSRC="${WRKSRC}" CFLAGS="${CFLAGS}" MAKEFILE= ${FILESDIR}/Makefile.bsd -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if !defined(WITHOUT_OPTIMIZE) CFLAGS+= -O2 diff --git a/russian/prawda/Makefile b/russian/prawda/Makefile index f3e0dc7..595367b 100644 --- a/russian/prawda/Makefile +++ b/russian/prawda/Makefile @@ -17,7 +17,7 @@ COMMENT= English-Russian translator USE_BZIP2= yes NO_WRKSUBDIR= yes USE_XORG= x11 xaw xmu xt sm -CXXFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e "s|ulong|unsigned long|g;;s|malloc.h|stdlib.h|g" ${WRKSRC}/src/face/video_x.cpp diff --git a/russian/wmcyrx/files/patch-aa b/russian/wmcyrx/files/patch-aa index 524d58f..27bb157 100644 --- a/russian/wmcyrx/files/patch-aa +++ b/russian/wmcyrx/files/patch-aa @@ -3,10 +3,10 @@ @@ -1,31 +1,34 @@ -I = -I/usr/openwin/include -I/usr/local/include -+I = -I${X11BASE}/include -I${LOCALBASE}/include ++I = -I${LOCALBASE}/include #L = -Bstatic -lXpm -Bdynamic -lX11 -lXext -L = -L/usr/local/lib -L/usr/openwin/lib -L/usr/X11/lib -lXpm -lX11 -lXext -+L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext ++L = -L${LOCALBASE}/lib -L/usr/lib -lXpm -lX11 -lXext #CC = gcc -O $I -DXLIB_ILLEGAL_ACCESS -CC=CC -O $I -DXLIB_ILLEGAL_ACCESS +CXX ?= c++ diff --git a/russian/xcyrBGR/files/patch-ab b/russian/xcyrBGR/files/patch-ab index dfe07a7..bab25af 100644 --- a/russian/xcyrBGR/files/patch-ab +++ b/russian/xcyrBGR/files/patch-ab @@ -1,8 +1,8 @@ --- Makefile.orig Sun Sep 8 17:09:50 2002 +++ Makefile Sun Sep 8 17:10:42 2002 @@ -1,18 +1,19 @@ - I = -I${X11BASE}/include -I${LOCALBASE}/include - L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext + I = -I${LOCALBASE}/include + L = -L${LOCALBASE}/lib -L/usr/lib -lXpm -lX11 -lXext -CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS +CXX?= c++ diff --git a/science/afni/Makefile b/science/afni/Makefile index d1fef22..435110c 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 fbd29dd..55f96ce 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) diff --git a/science/buddy/Makefile b/science/buddy/Makefile index f909f61..2f2d235 100644 --- a/science/buddy/Makefile +++ b/science/buddy/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DOCS= doc/bddnotes.ps doc/buddy.ps doc/tech.txt README AUTHORS diff --git a/science/dtiquery/files/patch-Makefile.definitions b/science/dtiquery/files/patch-Makefile.definitions index 593cefc..80334a3 100644 --- a/science/dtiquery/files/patch-Makefile.definitions +++ b/science/dtiquery/files/patch-Makefile.definitions @@ -14,7 +14,7 @@ ifdef FreeBSD -WX_CONFIG_BIN ?= /usr/X11R6/bin/wxgtk2-2.8-config -+WX_CONFIG_BIN ?= ${X11BASE}/bin/wxgtk2-2.8-config ++WX_CONFIG_BIN ?= ${LOCALBASE}/bin/wxgtk2-2.8-config VTK_INCLUDE_PATHS ?= -I/usr/local/include/vtk-5.0/ VTK_LIB_PATHS ?= -L/usr/local/lib/vtk-5.0/ WX_INCLUDE_PATHS ?= `$(WX_CONFIG_BIN) --cxxflags` @@ -27,7 +27,7 @@ JAMA_INCLUDE_PATH ?= -I/usr/local/include/ ZLIB_INCLUDE_PATH ?= -I/usr/include -SYS_INCLUDE_PATHS ?= -I/usr/include -I/usr/X11R6/include -I/usr/local/include/gtk-2.0 -I/usr/X11R6/include/gtk-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/atk-1.0 -+SYS_INCLUDE_PATHS ?= -I/usr/include -I${X11BASE}/include -I/usr/local/include/gtk-2.0 -I${X11BASE}/include/gtk-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I${X11BASE}/include/pango-1.0 -I/usr/local/include/atk-1.0 ++SYS_INCLUDE_PATHS ?= -I/usr/include -I${LOCALBASE}/include -I/usr/local/include/gtk-2.0 -I${LOCALBASE}/include/gtk-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I${LOCALBASE}/include/pango-1.0 -I/usr/local/include/atk-1.0 +SYS_CXXFLAGS ?= -g SYS_LIBS ?= -L/usr/local/lib -lXt -lGL -lpng diff --git a/science/felt/Makefile b/science/felt/Makefile index 6c0fd07..3052f37 100644 --- a/science/felt/Makefile +++ b/science/felt/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/FElt-${PORTVERSION} USE_MOTIF= yes USE_GL= glu GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-defaults=${X11BASE}/lib/X11/app-defaults +CONFIGURE_ARGS= --x-defaults=${LOCALBASE}/lib/X11/app-defaults CFLAGS+= -D__GLX_MOTIF MAN1= burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1 diff --git a/science/flounder/Makefile b/science/flounder/Makefile index 4c7d453..078f5a9 100644 --- a/science/flounder/Makefile +++ b/science/flounder/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \ glut.4:${PORTSDIR}/graphics/libglut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lstdc++" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++" USE_GMAKE= yes .if !defined(WITHOUT_AVIFILE) diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index b01dda6..df7af8c 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -37,8 +37,8 @@ LIB_DEPENDS+= plplotd.11:${PORTSDIR}/math/plplot \ USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" SLAVEDIRS= science/py-gnudatalanguage diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index d82139c..ad48939 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/mpich/bin/mpicc:${PORTSDIR}/net/mpich USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --exec-prefix=${PREFIX} diff --git a/science/gsystem/Makefile b/science/gsystem/Makefile index 0a303e7..0be1ed3 100644 --- a/science/gsystem/Makefile +++ b/science/gsystem/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_KDELIBS_VER= 3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes QTDIR= ${QT_PREFIX} QMAKESPEC= freebsd-g++ diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile index 61a0310..b733377 100644 --- a/science/kmovisto/Makefile +++ b/science/kmovisto/Makefile @@ -8,19 +8,19 @@ PORTNAME= kmovisto PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= http://mitglied.lycos.de/pageofmh/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A real 3-D molecule viewer +USE_XORG= x11 ice xext USE_QT_VER= 3 USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/science/medit/files/patch-makefile b/science/medit/files/patch-makefile index 1feffe0..0612fe6 100644 --- a/science/medit/files/patch-makefile +++ b/science/medit/files/patch-makefile @@ -16,8 +16,8 @@ +FreeBSD: + $(MAKE) $(MFLAGS) -f Makefile.arch \ + "prog = medit" \ -+ "INCDIR = -I. -I$(WRKSRC)/sources -I$(X11BASE)/include" \ -+ "XLIBS = -L$(X11BASE)/lib -lXmu -lXext -lX11" \ ++ "INCDIR = -I. -I$(WRKSRC)/sources -I$(LOCALBASE)/include" \ ++ "XLIBS = -L$(LOCALBASE)/lib -lXmu -lXext -lX11" \ + "GL_LIB = -lGL" \ + "GLU_LIB = -lGLU" \ + "GLUT_LIB = -lglut" \ diff --git a/science/minc/Makefile b/science/minc/Makefile index 52a7497..770bc18 100644 --- a/science/minc/Makefile +++ b/science/minc/Makefile @@ -28,7 +28,7 @@ COMMENT= Medical Imaging NetCDF LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GCC= 3.2+ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/science/ncs/Makefile b/science/ncs/Makefile index 992ae9c..cdee469 100644 --- a/science/ncs/Makefile +++ b/science/ncs/Makefile @@ -90,7 +90,7 @@ LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS_LIB= -lblas .endif -.if exists(${X11BASE}/bin/acroread) +.if exists(${LOCALBASE}/bin/acroread) RUN_DEPENDS+= acroread:${PORTSDIR}/print/acroreadwrapper .else RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf diff --git a/science/oases/Makefile b/science/oases/Makefile index 921c3f6..9b5d222 100644 --- a/science/oases/Makefile +++ b/science/oases/Makefile @@ -34,7 +34,7 @@ post-patch: s|%%FFLAGS%%|${FFLAGS}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%LDFLAGS%%|${LDFLAGS}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/Makefile + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD-FreeBSD/* ${PREFIX}/bin diff --git a/science/oases/files/patch-aa b/science/oases/files/patch-aa index 95db141..2c1f3cc 100644 --- a/science/oases/files/patch-aa +++ b/science/oases/files/patch-aa @@ -30,8 +30,8 @@ +FC.FreeBSD-FreeBSD = %%FC%% +CC.FreeBSD-FreeBSD = %%CC%% +FFLAGS.FreeBSD-FreeBSD = %%FFLAGS%% -+CFLAGS.FreeBSD-FreeBSD = %%CFLAGS%% -I%%X11BASE%%/include -+LFLAGS.FreeBSD-FreeBSD = %%LDFLAGS%% -L%%X11BASE%%/lib ++CFLAGS.FreeBSD-FreeBSD = %%CFLAGS%% -I%%LOCALBASE%%/include ++LFLAGS.FreeBSD-FreeBSD = %%LDFLAGS%% -L%%LOCALBASE%%/lib +RANLIB.FreeBSD-FreeBSD = ranlib +LIB_MISC.FreeBSD-FreeBSD = +MISC.FreeBSD-FreeBSD = diff --git a/science/omnetpp/Makefile b/science/omnetpp/Makefile index 97c8258..f4d7b1b 100644 --- a/science/omnetpp/Makefile +++ b/science/omnetpp/Makefile @@ -32,7 +32,7 @@ LIB_DEPENDS= ${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT} \ COMPONENTS= libs progs -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes HAS_CONFIGURE= yes LIB_FILES= cmdenv envir nedxml sim_std tkenv @@ -55,8 +55,8 @@ pre-configure: @${ECHO} "OMNETPP_PLOVE_DIR=${DATADIR}/plove" >> ${CONFIGUREUSER} @${ECHO} "OMNETPP_TKENV_DIR=${DATADIR}/tkenv" >> ${CONFIGUREUSER} @${ECHO} "OMNETPP_BITMAP_PATH=${DATADIR}/bitmaps" >> ${CONFIGUREUSER} - @${ECHO} "TK_CFLAGS=\"-I${X11BASE}/include -I${LOCALBASE}/include/${TCL_VERSION} -I${LOCALBASE}/include/${TK_VERSION}\"" >> ${CONFIGUREUSER} - @${ECHO} "TK_LIBS=\"-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11 -l${TCL_NODOT} -l${TK_NODOT}\"" >> ${CONFIGUREUSER} + @${ECHO} "TK_CFLAGS=\"-I${LOCALBASE}/include -I${LOCALBASE}/include/${TCL_VERSION} -I${LOCALBASE}/include/${TK_VERSION}\"" >> ${CONFIGUREUSER} + @${ECHO} "TK_LIBS=\"-L${LOCALBASE}/lib -L${LOCALBASE}/lib -lX11 -l${TCL_NODOT} -l${TK_NODOT}\"" >> ${CONFIGUREUSER} @${ECHO} "EXPAT_CFLAGS=\"-I${LOCALBASE}/include\"" >> ${CONFIGUREUSER} @${ECHO} "EXPAT_LIBS=\"-L${LOCALBASE}/lib -lexpat\"" >> ${CONFIGUREUSER} @${ECHO} "WISH=wish${TK_VERSION}" | ${SED} 's,tk,,' >> ${CONFIGUREUSER} diff --git a/science/oof/Makefile b/science/oof/Makefile index db5d471..6a46a39 100644 --- a/science/oof/Makefile +++ b/science/oof/Makefile @@ -7,7 +7,7 @@ PORTNAME= oof PORTVERSION= 1.037 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= http://www.ctcms.nist.gov/~langer/OOFdownload/SRC/ DISTNAME= ${PORTNAME}-dist${PORTVERSION} @@ -40,10 +40,8 @@ CXXFLAGS+= -Wno-deprecated GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cxxflags='${CXXFLAGS}' \ --with-libdirs=-L${LOCALBASE}/lib \ - --with-blas="-L${LOCALBASE}/lib ${BLAS_LIBS} -L/usr/local/lib -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} ${FORTRANLIBS}" \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib -USE_GCC= 3.2+ + --with-blas="-L${LOCALBASE}/lib ${BLAS_LIBS} -L/usr/local/lib -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} ${FORTRANLIBS}" + ALL_TARGET= all PLIST_FILES= bin/oof bin/ppm2oof diff --git a/science/openfoam/Makefile b/science/openfoam/Makefile index b4cf05a..776dfbc 100644 --- a/science/openfoam/Makefile +++ b/science/openfoam/Makefile @@ -19,12 +19,12 @@ COMMENT= Open Field Operation and Manipulation - CFD Simulation Toolbox BUILD_DEPENDS= micod:${PORTSDIR}/devel/mico \ bash:${PORTSDIR}/shells/bash \ cmake:${PORTSDIR}/devel/cmake \ - ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode \ + ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \ ${PARAVIEW_LIB}/ParaViewConfig.cmake:${PORTSDIR}/science/paraview \ ${LOCALBASE}/share/java/java3d/jar/j3dutils.jar:${PORTSDIR}/java/java3d \ ${LOCALBASE}/include/libiberty/demangle.h:${PORTSDIR}/devel/gnulibiberty\ ${LOCALBASE}/include/vtk/vtkDataSetSource.h:${PORTSDIR}/math/vtk-headers\ - ${X11BASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf + ${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf # ${LOCALBASE}/lib/parmetis/libmetis.a:${PORTSDIR}/math/parmetis LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ readline.5:${PORTSDIR}/devel/readline @@ -201,7 +201,7 @@ pre-configure: -e "s|\$$LAMHOME/platforms/\$$WM_OPTIONS|${LOCALBASE}|" \ -e "s|^SOURCE |source |" \ ${BATCHRC:S|^|${WRKSRC}/|} - ${REINPLACE_CMD} -e "s|-lGL|-L${X11BASE}/lib -lGL|" \ + ${REINPLACE_CMD} -e "s|-lGL|-L${LOCALBASE}/lib -lGL|" \ ${GL2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e "s|GCC_VERSION=4.1.1|GCC_VERSION=${GCC_VER:S/_//}|" \ -e "s|JAVA_VERSION=1.4.2+|JAVA_VERSION=${JAVA_PORT_VERSION}|" \ @@ -218,7 +218,7 @@ pre-configure: -e "s|-lpthread|${PTHREAD_LIBS}|" \ ${WRKSRC}/wmake/rules/${OPSYS}/${f} .endfor - ${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|" \ + ${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|" \ ${WRKSRC}/wmake/rules/${OPSYS}/X .for f in ${VER2FIX} ${REINPLACE_CMD} -e "s|%%ARCH%%|${ARCH}|" \ diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 8926a7a..e91faf1 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -40,7 +40,7 @@ pre-patch: ${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKDIR}/paraview-${PORTVERSION}/Utilities/TclTk/tk*/unix/configure do-configure: @@ -48,8 +48,8 @@ do-configure: cd ${WRKSRC} && \ ${LOCALBASE}/bin/cmake ../${DISTNAME} \ -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ - -DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ + -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ -DPARAVIEW_USE_SYSTEM_HDF5=1 \ -DBUILD_SHARED_LIBS="ON" \ -DVTK_USE_SYSTEM_PNG="ON" \ diff --git a/science/ruby-dcl/Makefile b/science/ruby-dcl/Makefile index b6c1fe8..614419d 100644 --- a/science/ruby-dcl/Makefile +++ b/science/ruby-dcl/Makefile @@ -16,7 +16,7 @@ MAINTAINER= murakami@ahs.scitec.kobe-u.ac.jp COMMENT= A Ruby interface to the scientific graphic library DCL BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray \ - ${X11BASE}/lib/libcdcl.a:${PORTSDIR}/science/cdcl + ${LOCALBASE}/lib/libcdcl.a:${PORTSDIR}/science/cdcl RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray .if defined(WITHOUT_GTK) diff --git a/science/szip/Makefile b/science/szip/Makefile index cec7968..b6e959d 100644 --- a/science/szip/Makefile +++ b/science/szip/Makefile @@ -20,7 +20,7 @@ COMMENT= Lossless compression library for scientific data USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DOCFILE= Release_notes_2_0.pdf post-install: diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile index 854adcd..e0c9f6f 100644 --- a/science/v_sim/Makefile +++ b/science/v_sim/Makefile @@ -18,7 +18,7 @@ USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAN1= v_sim.1 diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile index f0ce912..a156076 100644 --- a/science/vis5d+/Makefile +++ b/science/vis5d+/Makefile @@ -33,8 +33,8 @@ CONFIGURE_ARGS= --enable-gtk --enable-threads --with-netcdf \ --with-mixkit=${LOCALBASE}/lib/libmix.a --with-x USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive diff --git a/science/vmd/Makefile b/science/vmd/Makefile index 2ebc6e3..aadc898 100644 --- a/science/vmd/Makefile +++ b/science/vmd/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmd PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science graphics python tcl tk MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/:tachyon \ ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/:stride @@ -18,7 +18,7 @@ DISTFILES= ${VMD_DIST} \ MAINTAINER= sangwoos@gmail.com COMMENT= A molecular visualization program -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \ +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ ${PYNUMERIC} LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 \ tk84:${PORTSDIR}/x11-toolkits/tk84 \ @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYNUMERIC} USE_PERL5_BUILD= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= glu USE_PYTHON= yes RESTRICTED= "License has restrictions" diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile index 7eaac2e..4509f60 100644 --- a/security/borzoi/Makefile +++ b/security/borzoi/Makefile @@ -20,6 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile index a1aea58..e87e3a5 100644 --- a/security/bsp_upektfmess/Makefile +++ b/security/bsp_upektfmess/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi \ PLIST_FILES= lib/libtfmessbsp.so USE_ZIP= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GETTEXT= yes USE_ICONV= yes # Maintainer note diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index ea11340..d7d5132 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -40,7 +40,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PERL5= yes USE_SUBMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME} MAILOWN= courier diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile index cc034c2..4940cec 100644 --- a/security/cryptplug/Makefile +++ b/security/cryptplug/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} 's/gpgme-config/gpgme03-config/g' \ diff --git a/security/cutlass/Makefile b/security/cutlass/Makefile index b8e103f..be390a9 100644 --- a/security/cutlass/Makefile +++ b/security/cutlass/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= botan-config:${PORTSDIR}/security/botan \ MAN3= cutlass.3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= libglade2 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index fd7fbc1..e4ef958 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -26,7 +26,7 @@ MD5_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile index 3f40d18..628551a 100644 --- a/security/distcache-devel/Makefile +++ b/security/distcache-devel/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} LIBTOOLFILES= configure ssl/configure -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_LIST+= NAME=dc_server diff --git a/security/distcache/Makefile b/security/distcache/Makefile index 60631df..4b933f7 100644 --- a/security/distcache/Makefile +++ b/security/distcache/Makefile @@ -23,7 +23,7 @@ USE_RC_SUBR= dc_server.sh USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_LIST+= NAME=dc_server diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index a5085d4..a8a6d3a 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= LDFLAGS=-static post-patch: @${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \ - s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h + s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/options.h @${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch] @${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \ ${WRKSRC}/libtomcrypt/Makefile.in diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile index ba9e1f0..43d9bb2 100644 --- a/security/fwtk/Makefile +++ b/security/fwtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= fwtk PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security DISTNAME= ${PORTNAME}${PORTVERSION} EXTRACT_SUFX= .tar.Z @@ -47,7 +47,7 @@ IGNORE= does not build on 5.x and above with WITH_SKEY set because it requires .if !defined(WITHOUT_X11) MAN8+= x-gw.8 LIBEXEC_BINS+= x-gw -USE_XLIB= yes +USE_XORG= x11 PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " diff --git a/security/fwtk/files/patch-aa b/security/fwtk/files/patch-aa index a4d0424..3662700 100644 --- a/security/fwtk/files/patch-aa +++ b/security/fwtk/files/patch-aa @@ -60,7 +60,7 @@ # Location of X libraries for X-gw -XLIBDIR=/usr/X11/lib -+XLIBDIR=$(X11BASE)/lib ++XLIBDIR=$(LOCALBASE)/lib #XLIBDIR=/usr/local/X11R5/lib # X Libraries @@ -75,7 +75,7 @@ # Location of X include files -XINCLUDE=/usr/X11/include -+XINCLUDE=$(X11BASE)/include ++XINCLUDE=$(LOCALBASE)/include #XINCLUDE=/usr/local/X11R5/include # Objects to include in libfwall for SYSV diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile index ef1681c..cb1a105 100644 --- a/security/gcipher/Makefile +++ b/security/gcipher/Makefile @@ -7,10 +7,9 @@ PORTNAME= gcipher PORTVERSION= 1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= jjinux@yahoo.com COMMENT= A simple encryption tool @@ -18,7 +17,6 @@ COMMENT= A simple encryption tool RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 USE_PYTHON= yes -USE_XLIB= yes USE_GNOME= libgnomeui GCIPHER_PREFIX= ${PREFIX}/share/gcipher diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index bdf0c22..cd6d91e 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile index d043c6b..cdbf411 100644 --- a/security/gpgme03/Makefile +++ b/security/gpgme03/Makefile @@ -22,7 +22,7 @@ LATEST_LINK= gpgme03 USE_AUTOTOOLS= autoconf:261 libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INFO= gpgme03 diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile index 5fb145b..239a04c 100644 --- a/security/gtkpasman/Makefile +++ b/security/gtkpasman/Makefile @@ -7,17 +7,15 @@ PORTNAME= gtkpasman PORTVERSION= 0.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= phil@teaser.fr COMMENT= A GTK+ passwords manager for system and network administrators RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 24c7803..c2a2639 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -61,7 +61,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib .endif .if defined(WITH_X11) -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+= --with-x .else CONFIGURE_ARGS+= --without-x diff --git a/security/ifd-gempc410/Makefile b/security/ifd-gempc410/Makefile index 76cbb77..6387db0 100644 --- a/security/ifd-gempc410/Makefile +++ b/security/ifd-gempc410/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes MAKE_ARGS+= -CGemPC410 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NOMAN= diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile index 9f511c5..ad898d6 100644 --- a/security/keepassx/Makefile +++ b/security/keepassx/Makefile @@ -20,11 +20,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build qt3support_build corelib gui xml HAS_CONFIGURE= yes +USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\ + xext x11 sm ice xi do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} -unix PREFIX=${PREFIX} \ - INCLUDEPATH+=${X11BASE}/include LIBS+=-L${X11BASE}/lib \ + INCLUDEPATH+=${LOCALBASE}/include LIBS+=-L${LOCALBASE}/lib \ keepass.pro .include <bsd.port.mk> diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile index 5412486..92802aa 100644 --- a/security/libgringotts/Makefile +++ b/security/libgringotts/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} -e "s|md5sum|md5|g" ${WRKSRC}/Makefile.in diff --git a/security/libp11/Makefile b/security/libp11/Makefile index 3719677..01d0a7d 100644 --- a/security/libp11/Makefile +++ b/security/libp11/Makefile @@ -17,7 +17,7 @@ USE_AUTOTOOLS= libltdl:15 USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/security/linux-f10-openssl/Makefile b/security/linux-f10-openssl/Makefile index 22cd2d9..a5be6ed 100644 --- a/security/linux-f10-openssl/Makefile +++ b/security/linux-f10-openssl/Makefile @@ -15,7 +15,7 @@ COMMENT= SSL and crypto library (Linux Version) USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include <bsd.port.mk> diff --git a/security/linux-f8-openssl/Makefile b/security/linux-f8-openssl/Makefile index 22cd2d9..a5be6ed 100644 --- a/security/linux-f8-openssl/Makefile +++ b/security/linux-f8-openssl/Makefile @@ -15,7 +15,7 @@ COMMENT= SSL and crypto library (Linux Version) USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include <bsd.port.mk> diff --git a/security/linux-openssl/Makefile b/security/linux-openssl/Makefile index 22cd2d9..a5be6ed 100644 --- a/security/linux-openssl/Makefile +++ b/security/linux-openssl/Makefile @@ -15,7 +15,7 @@ COMMENT= SSL and crypto library (Linux Version) USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include <bsd.port.mk> diff --git a/security/matrixssl/Makefile b/security/matrixssl/Makefile index 32cc34d..c9aafd2 100644 --- a/security/matrixssl/Makefile +++ b/security/matrixssl/Makefile @@ -16,7 +16,7 @@ COMMENT= Small alternative SSL implementation USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes do-install: ${INSTALL_DATA} ${WRKSRC}/libmatrixssl* ${PREFIX}/lib diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile index 401abea..32a6578 100644 --- a/security/nessus-libnasl/Makefile +++ b/security/nessus-libnasl/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/libnasl USE_AUTOTOOLS= libtool:15 USE_BISON= build GNU_CONFIGURE= yes -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES MAN1= nasl.1 nasl-config.1 diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index 8cd6c45..53004b8 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-cipher CONFIGURE_ARGS+= --enable-bpf-sharing .endif -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES MAN1= nessus-config.1 diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in index 21ce211..9144e16 100644 --- a/security/nmap/files/patch-Makefile.in +++ b/security/nmap/files/patch-Makefile.in @@ -5,7 +5,7 @@ nmaplibexecdir = @libexecdir@/nmap nmapdatadir = @datadir@/nmap -deskdir = $(prefix)/share/applications -+deskdir = $(X11BASE)/share/applications ++deskdir = $(LOCALBASE)/share/applications NMAPDEVDIR=~/nmap-dev export NBASEDIR=@NBASEDIR@ diff --git a/security/openbsm/Makefile b/security/openbsm/Makefile index 90eecbf..ba24366 100644 --- a/security/openbsm/Makefile +++ b/security/openbsm/Makefile @@ -15,7 +15,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Open Source Basic Security Module (BSM) Audit Implementation WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= auditreduce.1 \ praudit.1 diff --git a/security/openct/Makefile b/security/openct/Makefile index 718bce7b..31d7b2a 100644 --- a/security/openct/Makefile +++ b/security/openct/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libltdl:15 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= openct SUB_FILES= etoken.conf diff --git a/security/openfwtk/files/patch-configs-FreeBSD b/security/openfwtk/files/patch-configs-FreeBSD index f8460b8..481a8ae 100644 --- a/security/openfwtk/files/patch-configs-FreeBSD +++ b/security/openfwtk/files/patch-configs-FreeBSD @@ -47,14 +47,14 @@ # Location of X libraries for X-gw -XLIBDIR=/usr/X11R6/lib -+XLIBDIR=${X11BASE}lib/X11 ++XLIBDIR=${LOCALBASE}lib/X11 # X Libraries XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lSM -lICE -lXext # Location of X include files -XINCLUDE=/usr/X11R6/include -+XINCLUDE=${X11BASE}/include/X11 ++XINCLUDE=${LOCALBASE}/include/X11 # IPFilter location #IPFILTER=$(PREFIX)/development/src/ipfilter/ip_fil3.2.9 diff --git a/security/opensc/Makefile b/security/opensc/Makefile index bdc55f6..00e462f 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -24,10 +24,10 @@ USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -I${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile index 0c9eef3..6a100dd 100644 --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -7,10 +7,9 @@ PORTNAME= pidgin PORTVERSION= 3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pidgin-encrypt +MASTER_SITES= SF/pidgin-encrypt PKGNAMESUFFIX= -encryption DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -21,7 +20,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin LIB_DEPENDS= purple.4:${PORTSDIR}/net-im/libpurple \ nss3:${PORTSDIR}/security/nss -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile index 7c72eba..cc60df9 100644 --- a/security/pidgin-otr/Makefile +++ b/security/pidgin-otr/Makefile @@ -8,7 +8,7 @@ PORTNAME= otr PORTVERSION= 3.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security net MASTER_SITES= http://www.cypherpunks.ca/otr/ PKGNAMEPREFIX= pidgin- @@ -24,7 +24,6 @@ LIB_DEPENDS= otr:${PORTSDIR}/security/libotr \ gcrypt:${PORTSDIR}/security/libgcrypt \ purple.4:${PORTSDIR}/net-im/libpurple -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= intltool USE_GETTEXT= yes diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 4f01886..f347df9 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -24,7 +24,7 @@ USE_ICONV= yes WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INFO= pinentry CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile index f983f3a..42601d8 100644 --- a/security/qca-tls/Makefile +++ b/security/qca-tls/Makefile @@ -23,7 +23,7 @@ USE_OPENSSL= yes USE_QT_VER= 3 QT_NONSTANDARD= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --qtdir=${X11BASE} \ +CONFIGURE_ARGS= --qtdir=${LOCALBASE} \ --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/security/qtfw/files/patch-Makefile b/security/qtfw/files/patch-Makefile index efe4966..4a7e877 100644 --- a/security/qtfw/files/patch-Makefile +++ b/security/qtfw/files/patch-Makefile @@ -15,8 +15,8 @@ -QT_LIBS:=-L/usr/X11R6/lib -LIBS:=-lqt-mt -pthread +CXXFLAGS+=-I. -I.. -Wall ${PTHREAD_CFLAGS} -+QT_INCLUDES:=-I${X11BASE}/include -+QT_LIBS:=-L${X11BASE}/lib ++QT_INCLUDES:=-I${LOCALBASE}/include ++QT_LIBS:=-L${LOCALBASE}/lib +LIBS:=-lqt-mt ${PTHREAD_LIBS} UI_TEMPLATES_DIR:=../qtdesigner-ui diff --git a/security/revelation/Makefile b/security/revelation/Makefile index ded0f90..6ad2bba 100644 --- a/security/revelation/Makefile +++ b/security/revelation/Makefile @@ -7,7 +7,7 @@ PORTNAME= revelation PORTVERSION= 0.4.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security gnome MASTER_SITES= ftp://oss.codepoet.no/revelation/ @@ -21,7 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/test.py:${PORTSDIR}/security/py-pycrypt CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pygnome2 pygnomeextras gnomeprefix gnomehack desktopfileutils \ @@ -33,7 +32,7 @@ USE_GETTEXT= yes .if defined(PACKAGE_BUILDING) 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} .endif post-patch: diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile index 2850d77..daacb30 100644 --- a/security/saferpay/Makefile +++ b/security/saferpay/Makefile @@ -19,7 +19,7 @@ MAKEFILE= ${WRKSRC}/saferpay/Makefile USE_GMAKE= yes USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR} post-patch: diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 2b7837c..f993c9a 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -8,7 +8,7 @@ PORTNAME= seahorse PORTVERSION= 2.22.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -25,7 +25,6 @@ LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ USE_LDCONFIG= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_GECKO= firefox xulrunner firefox-devel<->firefox USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui diff --git a/security/ssh/Makefile b/security/ssh/Makefile index e9d245d..5557bb4 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -120,7 +120,7 @@ CONFIGURE_ARGS+= --with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5 .endif # Include extra files if X11 is installed -.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \ +.if defined(WITH_X11) || (exists(${LOCALBASE}/lib/libX11.a) \ && !defined(WITHOUT_X11)) USE_XORG= x11 PLIST:= ${WRKDIR}/PLIST diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 0e01901..ab2e05d 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -7,7 +7,7 @@ PORTNAME= ssh2 PORTVERSION= 3.2.9.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security ipv6 # The list of official mirror sites is at: # http://www.ssh.com/support/downloads/secureshellserver/non-commercial.html @@ -86,9 +86,9 @@ EXTRA_PATCHES+= ${FILESDIR}/kerberos-patch-apps::ssh::ssh2_config \ .endif .if !defined(WITHOUT_X11) -BUILD_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} -RUN_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} -USE_XLIB= yes +BUILD_DEPENDS+= xauth:${PORTSDIR}/x11/xauth +RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth +USE_XORG= x11 PLIST_SUB+= WITH_X11:="" .else CONFIGURE_ARGS+= --without-x @@ -138,7 +138,7 @@ post-patch: @${REINPLACE_CMD} -e 's|\/etc\/ssh2|${PREFIX}&|g' \ ${WRKSRC}/HOWTO.anonymous.sftp @${REINPLACE_CMD} -e \ - 's|$$PATH:\/usr\/X11R6\/bin:\/usr\/X11\/bin|${X11BASE}\/bin|' \ + 's|$$PATH:\/usr\/X11R6\/bin:\/usr\/X11\/bin|${LOCALBASE}\/bin|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -E -e 's|\$$\(ETCDIR\)|${PREFIX}\/etc|g' \ ${WRKSRC}/apps/ssh/ssh_dummy_shell.out diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 7b49a38..4e47657e 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -25,7 +25,7 @@ USE_OPENSSL= yes USE_GNOME= gnomehack libxslt GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= xmlsec.1 xmlsec-config.1 diff --git a/security/xspy/Makefile b/security/xspy/Makefile index 8bcc5d6..896f926 100644 --- a/security/xspy/Makefile +++ b/security/xspy/Makefile @@ -7,7 +7,7 @@ PORTNAME= xspy PORTVERSION= 1.0c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.acm.vt.edu/~jmaxwell/programs/xspy/ @@ -15,7 +15,6 @@ MAINTAINER= onatan@gmail.com COMMENT= A utility for monitoring keystrokes on remote X servers WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes USE_IMAKE= yes XMKMF= xmkmf diff --git a/shells/bash-completion-classic/Makefile b/shells/bash-completion-classic/Makefile index 1d9f6b4..c47d401 100644 --- a/shells/bash-completion-classic/Makefile +++ b/shells/bash-completion-classic/Makefile @@ -38,7 +38,7 @@ post-patch: s|/usr/share\(/ssl/openssl.cnf\)|/etc\1|g; \ s|/usr/ports|${PORTSDIR}|g; \ s|/usr/lib\(/aspell\)|${LOCALBASE}/share\1|g; \ - s|/usr/share/info|&:${LOCALBASE}/info:${X11BASE}/info|g; \ + s|/usr/share/info|&:${LOCALBASE}/info|g; \ s|\(FLAC\)|\1\|flv\|FLV|' \ ${WRKSRC}/bash_completion diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 1d9f6b4..c47d401 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -38,7 +38,7 @@ post-patch: s|/usr/share\(/ssl/openssl.cnf\)|/etc\1|g; \ s|/usr/ports|${PORTSDIR}|g; \ s|/usr/lib\(/aspell\)|${LOCALBASE}/share\1|g; \ - s|/usr/share/info|&:${LOCALBASE}/info:${X11BASE}/info|g; \ + s|/usr/share/info|&:${LOCALBASE}/info|g; \ s|\(FLAC\)|\1\|flv\|FLV|' \ ${WRKSRC}/bash_completion diff --git a/shells/bash/files/patch-config-top.h b/shells/bash/files/patch-config-top.h index 415b137..d315346 100644 --- a/shells/bash/files/patch-config-top.h +++ b/shells/bash/files/patch-config-top.h @@ -5,7 +5,7 @@ #ifndef DEFAULT_PATH_VALUE #define DEFAULT_PATH_VALUE \ - "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:." -+ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:%%X11BASE%%/bin" ++ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin" #endif /* The value for PATH when invoking `command -p'. This is only used when diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile index 02f4a92..1d6b389 100644 --- a/shells/viewglob/Makefile +++ b/shells/viewglob/Makefile @@ -7,10 +7,9 @@ PORTNAME= viewglob PORTVERSION= 2.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A GTK+ add-on to bash and zsh @@ -18,7 +17,7 @@ COMMENT= A GTK+ add-on to bash and zsh BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_X_PREFIX= yes +USE_XORG= x11 USE_GNOME= gtk20 GNU_CONFIGURE= yes diff --git a/sysutils/asapm/files/patch-Makefile.UNIX b/sysutils/asapm/files/patch-Makefile.UNIX index f7c6d5e..f7c8e73 100644 --- a/sysutils/asapm/files/patch-Makefile.UNIX +++ b/sysutils/asapm/files/patch-Makefile.UNIX @@ -10,12 +10,12 @@ # The location and names of the X11 libraries -LDIR = -L/usr/X11R6/lib -+LDIR = -L${X11BASE}/lib ++LDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lX11 # The include path to the X11 files -C_INCLUDE = -I. -I/usr/X11R6/include -+C_INCLUDE = -I. -I${X11BASE}/include ++C_INCLUDE = -I. -I${LOCALBASE}/include #----------------------------------------------------- CC = gcc diff --git a/sysutils/asapm/files/patch-configure b/sysutils/asapm/files/patch-configure index a8c0726..249601e 100644 --- a/sysutils/asapm/files/patch-configure +++ b/sysutils/asapm/files/patch-configure @@ -4,7 +4,7 @@ # Look for the header file in a standard set of common directories. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in \ -+ ${X11BASE}/include \ ++ ${LOCALBASE}/include \ /usr/X11/include \ /usr/X11R6/include \ /usr/X11R5/include \ @@ -12,7 +12,7 @@ # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ ${X11BASE}/lib \ ++ ${LOCALBASE}/lib \ /usr/X11/lib \ /usr/X11R6/lib \ /usr/X11R5/lib \ @@ -20,7 +20,7 @@ rm -rf conftest* # Look for the header file in a standard set of common directories. for ac_dir in \ -+ ${X11BASE}/include \ ++ ${LOCALBASE}/include \ /usr/X11/include \ /usr/X11R6/include \ /usr/X11R5/include \ @@ -28,7 +28,7 @@ # First see if replacing the include by lib works. for ac_dir in \ `echo "$vt_xpm_includes" | sed 's,include/X11,lib,;s,include,lib,'` \ -+ ${X11BASE}/lib \ ++ ${LOCALBASE}/lib \ /usr/X11/lib \ /usr/X11R6/lib \ /usr/X11R5/lib \ diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index 915ee9f..f74d5ac 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_XORG= xpm GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include --with-xpm-library=${X11BASE}/lib +CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib" diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile index e21a255..74fde14 100644 --- a/sysutils/asmem/Makefile +++ b/sysutils/asmem/Makefile @@ -17,8 +17,8 @@ COMMENT= An AfterStep look-n-feel memory utilization monitor USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm \ - --with-xpm-includes=${X11BASE}/include \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=${LOCALBASE}/include \ + --with-xpm-library=${LOCALBASE}/lib MAN1= asmem.1 PLIST_FILES= bin/asmem diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile index b70d644..188e277 100644 --- a/sysutils/asmon/Makefile +++ b/sysutils/asmon/Makefile @@ -18,10 +18,10 @@ COMMENT= A swallowable applet monitors the CPU usage, memory and swap, etc USE_XORG= xpm x11 BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include USE_GMAKE= yes ALL_TARGET= clean asmon -MAKE_ARGS+= LIBDIR="-L${X11BASE}/lib" \ +MAKE_ARGS+= LIBDIR="-L${LOCALBASE}/lib" \ SOLARIS_LIBS=-lkvm PLIST_FILES= bin/asmon diff --git a/sysutils/asr-utils/Makefile b/sysutils/asr-utils/Makefile index 59d122a..0e329a3 100644 --- a/sysutils/asr-utils/Makefile +++ b/sysutils/asr-utils/Makefile @@ -30,7 +30,7 @@ BINS+= dptscom dptmgr .endif MAN8= raidutil.8 -.if !defined(WITHOUT_X11) && !exists(${X11BASE}/lib/libXm.so.1) +.if !defined(WITHOUT_X11) && !exists(${LOCALBASE}/lib/libXm.so.1) # we shall install our own libXm.so.1, enable it in pkg-plist PLIST_SUB+= LIBXM="" .else @@ -53,8 +53,8 @@ do-install: cd ${WRKSRC} ; ${INSTALL_DATA} \ dptcom.chk dptmgr.hlp dptmgr.ini dptmgr.rsc read.me \ ${PREFIX}/dpt -.if !exists(${X11BASE}/lib/libXm.so.1) - ${INSTALL_SCRIPT} ${WRKSRC}/libXm.so.1 ${X11BASE}/lib +.if !exists(${LOCALBASE}/lib/libXm.so.1) + ${INSTALL_SCRIPT} ${WRKSRC}/libXm.so.1 ${LOCALBASE}/lib .endif .else NO_BUILD= yes diff --git a/sysutils/asr-utils/pkg-plist b/sysutils/asr-utils/pkg-plist index e887de2..49c1701 100644 --- a/sysutils/asr-utils/pkg-plist +++ b/sysutils/asr-utils/pkg-plist @@ -17,5 +17,4 @@ dpt/dptcom dpt/dptcom.chk dpt/dptsig @dirrm dpt -%%LIBXM%%@cwd %%X11BASE%% %%LIBXM%%lib/libXm.so.1 diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile index e224a25..2ead910 100644 --- a/sysutils/battfink/Makefile +++ b/sysutils/battfink/Makefile @@ -7,7 +7,7 @@ PORTNAME= battfink PORTVERSION= 0.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= An energy saving preferences app for GNOME USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 INSTALLS_OMF= yes USE_GNOME= gnomehack gnomeprefix libgnomeui USE_GMAKE= yes diff --git a/sysutils/bbsmount/Makefile b/sysutils/bbsmount/Makefile index 6b0c935..7ece244 100644 --- a/sysutils/bbsmount/Makefile +++ b/sysutils/bbsmount/Makefile @@ -7,15 +7,14 @@ PORTNAME= bbsmount PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://phoenix.inf.upol.cz/~jezberam/bbsmount/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Graphical disk mounter for the Blackbox slit -USE_X_PREFIX= yes -USE_XLIB= yes +USE_XORG= x11 ice xpm xi GNU_CONFIGURE= yes USE_GCC= 2.95 PORTDOCS= README BUGS NEWS AUTHORS ChangeLog diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 7ed957c..2cb43f6 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -7,7 +7,7 @@ PORTNAME= brasero PORTVERSION= 0.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ USE_GETTEXT= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomehier nautiluscdburner USE_GSTREAMER= gconf core INSTALLS_ICONS= yes diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile index 8aaa133..e8c49c5 100644 --- a/sysutils/cog/Makefile +++ b/sysutils/cog/Makefile @@ -7,14 +7,14 @@ PORTNAME= cog PORTVERSION= 0.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= http://www.krakoa.dk/progs/cog/ MAINTAINER= gnome@FreeBSD.org COMMENT= A program for editing advanced GNOME settings in an easy way -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GETTEXT= yes diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index 57355bb..8c6eb34 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -23,8 +23,8 @@ USE_ICONV= yes CONFIGURE_ARGS+= --disable-portmon \ --disable-proc-uptime \ --disable-hddtemp -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAN1= conky.1 diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 57355bb..8c6eb34 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -23,8 +23,8 @@ USE_ICONV= yes CONFIGURE_ARGS+= --disable-portmon \ --disable-proc-uptime \ --disable-hddtemp -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" MAN1= conky.1 diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile index 32908b1..98ff071 100644 --- a/sysutils/dtc/Makefile +++ b/sysutils/dtc/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Cry ${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \ ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - ${X11BASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \ + ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ + ${LOCALBASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \ ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server NO_BUILD= yes diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 751d711..5ab1915 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -8,6 +8,7 @@ PORTNAME= gconf-editor PORTVERSION= 2.22.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME @@ -18,7 +19,6 @@ COMMENT= A gconf database editor for the GNOME 2 environment USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile index 74adec6..e307cde 100644 --- a/sysutils/gfslicer/Makefile +++ b/sysutils/gfslicer/Makefile @@ -8,7 +8,7 @@ PORTNAME= gfslicer PORTVERSION= 1.5.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -19,7 +19,6 @@ COMMENT= A utility to split and join files WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_AUTOTOOLS= automake:14:env -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile index 08dea43..242c4e1 100644 --- a/sysutils/gkfreq/Makefile +++ b/sysutils/gkfreq/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.peakunix.net/downloads/ MAINTAINER= ume@FreeBSD.org COMMENT= A plugin for gkrellm2 which displays the current CPU speed -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/gkfreq.so diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile index 6ed03b9..a62667a 100644 --- a/sysutils/gkleds2/Makefile +++ b/sysutils/gkleds2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gkleds2 PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://heim.ifi.uio.no/~oyvinha/files/files/ DISTNAME= gkleds-${PORTVERSION} @@ -15,14 +15,15 @@ DISTNAME= gkleds-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM Leds for CapsLock, NumLock and ScrollLock -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 +USE_XORG= x11 xtst USE_GNOME= gnometarget gtk20 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= libexec/gkrellm2/plugins/gkleds.so diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile index ccf6990..e142178 100644 --- a/sysutils/gkrellfire/Makefile +++ b/sysutils/gkrellfire/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= novel@FreeBSD.org COMMENT= Gkrellm2 plugin which shows the system load as a flame -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/${PORTNAME}.so diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile index a2decad..fedfd4c 100644 --- a/sysutils/gkrellflynn/Makefile +++ b/sysutils/gkrellflynn/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.amdmi3.ru/distfiles/ \ MAINTAINER= amdmi3@amdmi3.ru COMMENT= A tiny system load meter for gkrellm -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/gkrellflynn.so @@ -24,7 +24,7 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -c -fPIC" ALL_TARGET= ${PORTNAME}.so CFLAGS+= `pkg-config --cflags gtk+-2.0 gthread-2.0` \ - -I${LOCALBASE}/include -I${X11BASE}/include -DGKRELLM2 + -I${LOCALBASE}/include -DGKRELLM2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gkrellflynn.so \ diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile index 1250d37..5b68e9a3 100644 --- a/sysutils/gkrellm-trayicons/Makefile +++ b/sysutils/gkrellm-trayicons/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin to display definable icons as notifiers or launchers -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 PLIST_FILES= libexec/gkrellm2/plugins/trayicons.so diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index e8e60c0..fd0084c 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gkrellm PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils ipv6 MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \ ${MASTER_SITE_LOCAL} @@ -43,7 +43,7 @@ MAKE_ENV+= enable_nls=0 .else USE_GETTEXT= yes .endif -USE_XLIB= yes +USE_XORG= x11 sm .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls-openssl.26:${PORTSDIR}/security/gnutls MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \ @@ -77,8 +77,6 @@ MAN8= gkrellmd.8 PORTDOCS= COPYRIGHT CREDITS README Themes.html .endif -MAN1PREFIX= ${X11BASE} - .include <bsd.port.pre.mk> ALL_TARGET= freebsd @@ -86,15 +84,15 @@ ALL_TARGET= freebsd INSTALL_TARGET= install_freebsd .endif -MAKE_ENV+= CC="${CC}" INSTALLROOT=${X11BASE} INSTALLDIR=${X11BASE}/bin \ - PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \ +MAKE_ENV+= CC="${CC}" INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \ + PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \ SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \ SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \ VERSION=${PORTVERSION} -CFLAGS+= -DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \ - -DSYSTEM_PLUGINS_DIR='\"${X11BASE}/libexec/gkrellm2/plugins\"' \ +CFLAGS+= -DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \ + -DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \ -DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \ -DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"' @@ -113,11 +111,11 @@ post-patch: post-install: .if !defined(GKRELLM_SERVER_ONLY) - @${MKDIR} ${X11BASE}/libexec/gkrellm2/plugins - @${MKDIR} ${X11BASE}/share/gkrellm2/themes + @${MKDIR} ${LOCALBASE}/libexec/gkrellm2/plugins + @${MKDIR} ${LOCALBASE}/share/gkrellm2/themes @${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1 .if ${OSVERSION} < 500000 - @${CHMOD} 2511 ${X11BASE}/bin/gkrellm + @${CHMOD} 2511 ${LOCALBASE}/bin/gkrellm .endif .endif .if ${OSVERSION} < 500000 diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index 430ca8c..a00beb4 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -9,7 +9,6 @@ sbin/gkrellmd %%EXAMPLESDIR%%/gkrellmd.conf @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf @dirrm %%EXAMPLESDIR%% -@cwd %%X11BASE%% %%CLIENT%%include/gkrellm2/gkrellm.h %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h %%CLIENT%%@dirrm include/gkrellm2 @@ -37,4 +36,3 @@ sbin/gkrellmd %%CLIENT%%@dirrmtry libexec/gkrellm2 %%CLIENT%%@dirrmtry share/gkrellm2/themes %%CLIENT%%@dirrmtry share/gkrellm2 -@cwd %%PREFIX%% diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile index 15057aa..75aa452 100644 --- a/sysutils/gkrellmouse/Makefile +++ b/sysutils/gkrellmouse/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Mouse odometer plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/gkmouse.so diff --git a/sysutils/gkrellmouse/files/patch-Makefile b/sysutils/gkrellmouse/files/patch-Makefile index b4a6a90..c6dfe49 100644 --- a/sysutils/gkrellmouse/files/patch-Makefile +++ b/sysutils/gkrellmouse/files/patch-Makefile @@ -5,7 +5,7 @@ # This should point to your gkrellm headers -GKRELLM_HDRS := /usr/include/gkrellm -+GKRELLM_HDRS := ${X11BASE}/include/gkrellm ++GKRELLM_HDRS := ${LOCALBASE}/include/gkrellm -CC := gcc -GTKFLAGS := $(shell gtk-config --cflags) diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile index a360bf1..ef95075 100644 --- a/sysutils/gkrellmwho/Makefile +++ b/sysutils/gkrellmwho/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://mirror2.unixfreunde.de/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin that scrolls in a panel a list of currently logged on users -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} diff --git a/sysutils/gkrellmwho/files/patch-Makefile b/sysutils/gkrellmwho/files/patch-Makefile index 3217123..b3415c3 100644 --- a/sysutils/gkrellmwho/files/patch-Makefile +++ b/sysutils/gkrellmwho/files/patch-Makefile @@ -6,7 +6,7 @@ $FreeBSD$ @@ -1,9 +1,9 @@ # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include) -INCLUDE = /usr/local/include -+INCLUDE = ${X11BASE}/include/gkrellm ++INCLUDE = ${LOCALBASE}/include/gkrellm -CC = gcc -CFLAGS = -Wall -O2 -fPIC -I$(INCLUDE) \ diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile index 5008dc6..473ff8f 100644 --- a/sysutils/gkrelltop/Makefile +++ b/sysutils/gkrelltop/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2 BUILD_DEPENDS= ${RUN_DEPENDS} USE_GMAKE= yes -MAKE_ARGS= INSTALLDIR=${X11BASE}/libexec/gkrellm2/plugins \ +MAKE_ARGS= INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \ INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd .if defined(GKRELLM_SERVER_ONLY) diff --git a/sysutils/gkrelltop/pkg-plist b/sysutils/gkrelltop/pkg-plist index 29b1524..41d528c 100644 --- a/sysutils/gkrelltop/pkg-plist +++ b/sysutils/gkrelltop/pkg-plist @@ -1,3 +1,2 @@ libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so -%%CLIENT%%@cwd %%X11BASE%% %%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile index c8363ba..19308c7 100644 --- a/sysutils/glload/Makefile +++ b/sysutils/glload/Makefile @@ -14,15 +14,13 @@ MASTER_SITES= http://reality.exsgi.org/eile/misc/ MAINTAINER= ports@FreeBSD.org COMMENT= Gl base load monitor -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GL= yes +USE_GL= glut MAKEFILE= Makefile.FreeBSD MAKE_ARGS= CC="${CC}" \ - CFLAGS="${CFLAGS} -I${X11BASE}/include -DFreeBSD ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DFreeBSD ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ OBJS="get_load.o trackball.o glload.o texture.o screenShot.o" ALL_TARGET= glload diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index c601ba9..925482f9 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-control-center PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,6 @@ RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= good diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 00ef992..9f86400 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-control-center PORTVERSION= 1.4.0.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/control-center/1.4 @@ -19,7 +19,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME project USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomecanvas gnomevfs libcapplet USE_GETTEXT= yes diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile index ffeac35..aab138f 100644 --- a/sysutils/gnome-mount/Makefile +++ b/sysutils/gnome-mount/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-mount PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -19,7 +20,6 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ gnome-keyring:${PORTSDIR}/security/gnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index cb44b89..c0562da 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-pkgview PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/ @@ -17,7 +17,7 @@ COMMENT= Displays the version of GNOME components installed USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui intlhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 1ecbaa4..3250e8b 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-power-manager PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +24,6 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile index 075bf0e..ed3833b 100644 --- a/sysutils/gnome-schedule/Makefile +++ b/sysutils/gnome-schedule/Makefile @@ -10,8 +10,7 @@ PORTNAME= gnome-schedule PORTVERSION= 0.9.0 PORTREVISION= 5 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME GUI for configuring a users crontab @@ -22,7 +21,6 @@ RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp USE_BZIP2= yes USE_PYTHON= yes USE_GNOME= gnomeprefix pygnome2 -USE_XLIB= yes GNU_CONFIGURE= yes DATADIR= ${PREFIX}/share diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index ae1491c..cd9e8ca 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-system-monitor PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DISTNAME= gnome-system-monitor-${PORTVERSION} @@ -23,7 +24,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 2182de4..c74be03 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-system-tools PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,6 @@ USE_GMAKE= yes INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_XLIB= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 USE_AUTOTOOLS= libtool:15 diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index 4f2b92b..ab115c9 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-volume-manager PORTVERSION= 2.22.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -19,7 +19,6 @@ COMMENT= Automatically mount removable media, and more LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ notify.1:${PORTSDIR}/devel/libnotify -USE_XLIB= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 USE_GMAKE= yes diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile index 1f76923..b1356db 100644 --- a/sysutils/graphicboot/Makefile +++ b/sysutils/graphicboot/Makefile @@ -7,7 +7,7 @@ PORTNAME= graphicboot PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://matt.sixxgate.com/files/ @@ -15,12 +15,13 @@ MAINTAINER= sixxgate@hotmail.com COMMENT= Provides graphical X Window startup to FreeBSD during 'rc' BUILD_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ - xrdb:${X_CLIENTS_PORT} + xrdb:${PORTSDIR}/x11/xrdb \ + xsetroot:${PORTSDIR}/x11/xsetroot RUN_DEPENDS= ${BUILD_DEPENDS} -USE_X_PREFIX= yes USE_MOTIF= yes USE_BZIP2= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile index 4ce1098..3ee2a24 100644 --- a/sysutils/kcube/Makefile +++ b/sysutils/kcube/Makefile @@ -17,7 +17,7 @@ COMMENT= Another cpu load kicker applet for KDE USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile index e4b332d..903a6e0 100644 --- a/sysutils/kgtk/Makefile +++ b/sysutils/kgtk/Makefile @@ -45,7 +45,7 @@ do-configure: ${CMAKE_PREFIX}/bin/cmake .. \ -DCMAKE_INSTALL_DIR=${PREFIX} \ -DQT_INCLUDE_DIR=${QT_PREFIX}/include \ - -DCMAKE_CXX_FLAGS=-I${X11BASE}/include \ + -DCMAKE_CXX_FLAGS=-I${LOCALBASE}/include \ -DCMAKE_EXE_LINKER_FLAGS=${PTHREAD_LIBS} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile index 16ebcab..812d9e0 100644 --- a/sysutils/kkbswitch/Makefile +++ b/sysutils/kkbswitch/Makefile @@ -9,8 +9,7 @@ PORTNAME= kkbswitch PORTVERSION= 1.4.3 PORTREVISION= 3 CATEGORIES= sysutils kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= kkbswitch +MASTER_SITES= SF/kkbswitch MAINTAINER= achilov-rn@askd.ru COMMENT= Keyboard layout switcher and indicator for KDE 3.x @@ -32,7 +31,7 @@ MAN1= kkbswitch.1 OPTIONS= RU_UA_LAYOUT "With additional RU_UA keyboard layout" off PLIST_SUB= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ + LOCALBASE=${LOCALBASE} \ DOCSDIR=${DOCSDIR} .include <bsd.port.pre.mk> diff --git a/sysutils/kkbswitch/pkg-plist b/sysutils/kkbswitch/pkg-plist index 1c9bca5..c8abaee 100644 --- a/sysutils/kkbswitch/pkg-plist +++ b/sysutils/kkbswitch/pkg-plist @@ -17,9 +17,7 @@ share/locale/bg/LC_MESSAGES/kkbswitch.mo %%DOCSDIR%%/flag_style.png %%DOCSDIR%%/index.docbook %%DOCSDIR%%/index.cache.bz2 -@cwd %%X11BASE%% %%LAYOUT%%lib/X11/xkb/symbols/ru_ua -@cwd %%PREFIX%% @dirrm share/apps/kkbswitch @dirrm %%DOCSDIR%%/common @dirrm %%DOCSDIR%% diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile index 161347a..1b1db21 100644 --- a/sysutils/ksynaptics/Makefile +++ b/sysutils/ksynaptics/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e \ - 's|/usr/include/synaptics|${X11BASE}/include/synaptics|g' \ + 's|/usr/include/synaptics|${LOCALBASE}/include/synaptics|g' \ ${WRKSRC}/ksynaptics/src/Makefile.in .include <bsd.port.mk> diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 6d004cf..32d9433 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -29,9 +29,6 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> -CONFIGURE_ARGS+= -x-includes="${X11BASE}/include" \ - -x-libraries="${X11BASE}/lib" - .if defined(WITH_GTK) PKGNAMESUFFIX= -gtk2 USE_GNOME+= gtk20 libgnomeui diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile index d3f01c8..db010d9 100644 --- a/sysutils/libgksu/Makefile +++ b/sysutils/libgksu/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgksu PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://people.debian.org/~kov/gksu/old_stuff/libgksu1.2/ DISTNAME= ${PORTNAME}1.2-${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}1.2-${PORTVERSION} MAINTAINER= bsam@FreeBSD.org COMMENT= Library providing su and sudo functionality -RUN_DEPENDS= xauth:${X_CLIENTS_PORT} \ +RUN_DEPENDS= xauth:${PORTSDIR}/x11/xauth \ sudo:${PORTSDIR}/security/sudo USE_GNOME= pkgconfig glib20 diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile index bb46934..1bf5627 100644 --- a/sysutils/libieee1284/Makefile +++ b/sysutils/libieee1284/Makefile @@ -16,7 +16,7 @@ COMMENT= IEEE1284 communications library USE_BZIP2= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 .if defined(WITH_PYTHON) diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile index 795c914..07b7463 100644 --- a/sysutils/lineakd/Makefile +++ b/sysutils/lineakd/Makefile @@ -19,8 +19,8 @@ COMMENT= Lineakd is a daemon which enables special keys on internet keyboards USE_GMAKE= yes USE_XORG= x11 xext xt USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes CONFIGURE_ARGS+=--program-prefix='' diff --git a/sysutils/linux-acu/Makefile b/sysutils/linux-acu/Makefile index 145114b..54cd15c 100644 --- a/sysutils/linux-acu/Makefile +++ b/sysutils/linux-acu/Makefile @@ -31,7 +31,7 @@ IGNORE= may not be automatically fetched due to licensing\ ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_WRKSUBDIR= yes RESTRICTED= "Redistribution not allowed" diff --git a/sysutils/linux-procps/Makefile b/sysutils/linux-procps/Makefile index dbcbc71..3fd2c64 100644 --- a/sysutils/linux-procps/Makefile +++ b/sysutils/linux-procps/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux psproc binaries USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= bin sbin usr/bin PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/sysutils/memgrep/Makefile b/sysutils/memgrep/Makefile index 2858095..4222294 100644 --- a/sysutils/memgrep/Makefile +++ b/sysutils/memgrep/Makefile @@ -14,7 +14,7 @@ MAINTAINER= clement@FreeBSD.org COMMENT= Utility to manipulate memory from running processes and core files HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile index fe12581..aa7a768 100644 --- a/sysutils/mount.app/Makefile +++ b/sysutils/mount.app/Makefile @@ -9,20 +9,19 @@ PORTNAME= mountapp PORTVERSION= 3.0 PORTREVISION= 3 CATEGORIES= sysutils windowmaker -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mountapp +MASTER_SITES= SF MAINTAINER= nm@web.am COMMENT= Windowmaker application, Resembles wmmount with extra functionality -BUILD_DEPENDS+= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker +BUILD_DEPENDS+= ${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker USE_GETTEXT= yes USE_GNOME= gtk12 glib12 GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl MAKE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 44840a4..9005e5a 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,6 @@ RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ CONFIGURE_ARGS= --enable-gnome-mount USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \ diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile index 5f97686..5cd9f3b 100644 --- a/sysutils/nitrogen/Makefile +++ b/sysutils/nitrogen/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gtk20 INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-inotify -CXXFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib OPTIONS= XINERAMA "Xinerama support" on @@ -35,7 +35,7 @@ MAN1= nitrogen.1 CONFIGURE_ARGS+=--disable-xinerama .else CONFIGURE_ARGS+=--enable-xinerama -LIB_DEPENDS+= Xinerama:${PORTSDIR}/x11/libXinerama +USE_XORG+= xinerama .endif post-patch: diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile index aa277be..68b8851 100644 --- a/sysutils/ntfsprogs/Makefile +++ b/sysutils/ntfsprogs/Makefile @@ -7,7 +7,7 @@ PORTNAME= ntfsprogs PORTVERSION= 1.13.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= linux-ntfs @@ -93,8 +93,8 @@ post-patch: @${REINPLACE_CMD} -e 's|$$(DESTDIR)/sbin|$$(DESTDIR)/${PREFIX}/sbin|' \ ${WRKSRC}/ntfsprogs/Makefile.in @${REINPLACE_CMD} -e \ - 's|$$(libdir)/\(gnome-vfs-2.0/modules\)|${X11BASE}/lib/\1|; \ - s|$$(sysconfdir)/\(gnome-vfs-2.0/modules\)|${X11BASE}/etc/\1|' \ + 's|$$(libdir)/\(gnome-vfs-2.0/modules\)|${LOCALBASE}/lib/\1|; \ + s|$$(sysconfdir)/\(gnome-vfs-2.0/modules\)|${LOCALBASE}/etc/\1|' \ ${WRKSRC}/libntfs/Makefile.in .if defined(WITH_UBLIO) @${REINPLACE_CMD} -e 's|^libntfs_la_LIBADD =|& -lublio|' \ diff --git a/sysutils/ntfsprogs/pkg-plist b/sysutils/ntfsprogs/pkg-plist index 59011dd..a0b23a9 100644 --- a/sysutils/ntfsprogs/pkg-plist +++ b/sysutils/ntfsprogs/pkg-plist @@ -52,7 +52,6 @@ sbin/ntfslabel sbin/ntfsresize sbin/ntfsundelete @dirrm include/ntfs -%%GNOMEVFS2%%@cwd %%X11BASE%% %%GNOMEVFS2%%etc/gnome-vfs-2.0/modules/libntfs.conf %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.a %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.la diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile index 82f60fb..ab0b873 100644 --- a/sysutils/nvtv/Makefile +++ b/sysutils/nvtv/Makefile @@ -7,10 +7,9 @@ PORTNAME= nvtv PORTVERSION= 0.4.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= nv-tv-out +MASTER_SITES= SF/nv-tv-out DISTNAME= nvtv-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -22,10 +21,10 @@ ONLY_FOR_ARCHS= i386 CONFIGURE_ENV= CC="${CC} -I${PREFIX}/include" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib GNU_CONFIGURE= yes USE_GNOME= gtk12 +USE_XORG= x11 xxf86vm xmu MAN1= nvtv.1x MAN8= nvtvd.8 diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index 29828f5..d09e214 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -8,6 +8,7 @@ PORTNAME= pessulus PORTVERSION= 2.16.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +22,6 @@ USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 WANT_GNOME= yes USE_PYTHON= yes USE_GETTEXT= yes -USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile index 01e91c9..6961bf7 100644 --- a/sysutils/scanbuttond/Makefile +++ b/sysutils/scanbuttond/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_FILES+= pkg-message diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile index a915557..35f4d62 100644 --- a/sysutils/serpentine/Makefile +++ b/sysutils/serpentine/Makefile @@ -30,7 +30,7 @@ OPTIONS= MUINE "Cd-Burner Plugin for muine audio player (i386 only)" Off .include <bsd.port.pre.mk> -.if (defined(WITH_MUINE) || exists(${X11BASE}/bin/muine)) && ${ARCH}=="i386" +.if (defined(WITH_MUINE) || exists(${LOCALBASE}/bin/muine)) && ${ARCH}=="i386" BUILD_DEPENDS+= muine:${PORTSDIR}/audio/muine RUN_DEPENDS+= muine:${PORTSDIR}/audio/muine PLIST_SUB+= MUINE="" diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index 38194ec..20c72f2 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -129,7 +129,7 @@ QMON= noqmon post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/pvm/src/aimk @@ -137,7 +137,7 @@ post-patch: -e "s|%%CXX%%|${CXX}|g" \ -e "s|%%CFLAGS%%|${CFLAGS}|g" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/aimk \ ${WRKSRC}/dist/pvm/src/aimk @test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \ @@ -156,7 +156,7 @@ post-patch: ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|" @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \ diff --git a/sysutils/sge60/files/aimk.private b/sysutils/sge60/files/aimk.private index 7257c0d..f883b4c 100644 --- a/sysutils/sge60/files/aimk.private +++ b/sysutils/sge60/files/aimk.private @@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%% set BERKELEYDB_HOME = %%LOCALBASE%% set BDB_INCLUDE_SUBDIR = db42 set BDB_LIB_SUFFIX = -4.2 -set X11BASE = %%X11BASE%% +set LOCALBASE = %%LOCALBASE%% diff --git a/sysutils/sge60/files/patch-aimk b/sysutils/sge60/files/patch-aimk index 5fad14f..83a4c19 100644 --- a/sysutils/sge60/files/patch-aimk +++ b/sysutils/sge60/files/patch-aimk @@ -24,7 +24,7 @@ $FreeBSD$ set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" -+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include" set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" @@ -33,10 +33,10 @@ $FreeBSD$ set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" -+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" ++ set XINCD = "$XMTINCD $XINCD -I${LOCALBASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" -+ set XLIBD = "-L${X11BASE}/lib" ++ set XLIBD = "-L${LOCALBASE}/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" diff --git a/sysutils/sge60/files/patch-dist_util_arch__variables b/sysutils/sge60/files/patch-dist_util_arch__variables index 7a75f9d..f990992 100644 --- a/sysutils/sge60/files/patch-dist_util_arch__variables +++ b/sysutils/sge60/files/patch-dist_util_arch__variables @@ -11,7 +11,7 @@ $FreeBSD$ + RC_PREFIX=%%LOCALBASE%%/etc/rc.d RC_SUFFIX=.sh - XTERM=/usr/X11R6/bin/xterm -+ XTERM=%%X11BASE%%/bin/xterm ++ XTERM=%%LOCALBASE%%/bin/xterm MAILER=/usr/bin/mail QLOGIN_COMMAND=telnet QLOGIN_DAEMON=/usr/libexec/telnetd diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile index 24dae61..185904b 100644 --- a/sysutils/sge61/Makefile +++ b/sysutils/sge61/Makefile @@ -135,7 +135,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/pvm/src/aimk @@ -143,7 +143,7 @@ post-patch: -e "s|%%CXX%%|${CXX}|g" \ -e "s|%%CFLAGS%%|${CFLAGS}|g" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/aimk \ ${WRKSRC}/dist/pvm/src/aimk @test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \ @@ -163,7 +163,7 @@ post-patch: ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|" @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ diff --git a/sysutils/sge61/files/aimk.private b/sysutils/sge61/files/aimk.private index 7257c0d..f883b4c 100644 --- a/sysutils/sge61/files/aimk.private +++ b/sysutils/sge61/files/aimk.private @@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%% set BERKELEYDB_HOME = %%LOCALBASE%% set BDB_INCLUDE_SUBDIR = db42 set BDB_LIB_SUFFIX = -4.2 -set X11BASE = %%X11BASE%% +set LOCALBASE = %%LOCALBASE%% diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk index 3a27044..c16574e 100644 --- a/sysutils/sge61/files/patch-aimk +++ b/sysutils/sge61/files/patch-aimk @@ -24,7 +24,7 @@ $FreeBSD$ set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" -+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include" set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" @@ -33,10 +33,10 @@ $FreeBSD$ set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" -+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" ++ set XINCD = "$XMTINCD $XINCD -I${LOCALBASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" -+ set XLIBD = "-L${X11BASE}/lib" ++ set XLIBD = "-L${LOCALBASE}/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" diff --git a/sysutils/sge61/files/patch-dist_util_arch__variables b/sysutils/sge61/files/patch-dist_util_arch__variables index 7a75f9d..f990992 100644 --- a/sysutils/sge61/files/patch-dist_util_arch__variables +++ b/sysutils/sge61/files/patch-dist_util_arch__variables @@ -11,7 +11,7 @@ $FreeBSD$ + RC_PREFIX=%%LOCALBASE%%/etc/rc.d RC_SUFFIX=.sh - XTERM=/usr/X11R6/bin/xterm -+ XTERM=%%X11BASE%%/bin/xterm ++ XTERM=%%LOCALBASE%%/bin/xterm MAILER=/usr/bin/mail QLOGIN_COMMAND=telnet QLOGIN_DAEMON=/usr/libexec/telnetd diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile index 24dae61..185904b 100644 --- a/sysutils/sge62/Makefile +++ b/sysutils/sge62/Makefile @@ -135,7 +135,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/dist/util/arch_variables \ ${WRKSRC}/dist/pvm/src/aimk @@ -143,7 +143,7 @@ post-patch: -e "s|%%CXX%%|${CXX}|g" \ -e "s|%%CFLAGS%%|${CFLAGS}|g" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \ - -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/aimk \ ${WRKSRC}/dist/pvm/src/aimk @test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \ @@ -163,7 +163,7 @@ post-patch: ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|" @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \ diff --git a/sysutils/sge62/files/aimk.private b/sysutils/sge62/files/aimk.private index 7257c0d..f883b4c 100644 --- a/sysutils/sge62/files/aimk.private +++ b/sysutils/sge62/files/aimk.private @@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%% set BERKELEYDB_HOME = %%LOCALBASE%% set BDB_INCLUDE_SUBDIR = db42 set BDB_LIB_SUFFIX = -4.2 -set X11BASE = %%X11BASE%% +set LOCALBASE = %%LOCALBASE%% diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk index 3a27044..c16574e 100644 --- a/sysutils/sge62/files/patch-aimk +++ b/sysutils/sge62/files/patch-aimk @@ -24,7 +24,7 @@ $FreeBSD$ set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" -+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include" set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" @@ -33,10 +33,10 @@ $FreeBSD$ set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" -+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" ++ set XINCD = "$XMTINCD $XINCD -I${LOCALBASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" -+ set XLIBD = "-L${X11BASE}/lib" ++ set XLIBD = "-L${LOCALBASE}/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" diff --git a/sysutils/sge62/files/patch-dist_util_arch__variables b/sysutils/sge62/files/patch-dist_util_arch__variables index 7a75f9d..f990992 100644 --- a/sysutils/sge62/files/patch-dist_util_arch__variables +++ b/sysutils/sge62/files/patch-dist_util_arch__variables @@ -11,7 +11,7 @@ $FreeBSD$ + RC_PREFIX=%%LOCALBASE%%/etc/rc.d RC_SUFFIX=.sh - XTERM=/usr/X11R6/bin/xterm -+ XTERM=%%X11BASE%%/bin/xterm ++ XTERM=%%LOCALBASE%%/bin/xterm MAILER=/usr/bin/mail QLOGIN_COMMAND=telnet QLOGIN_DAEMON=/usr/libexec/telnetd diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile index ecf3e25..303ec88 100644 --- a/sysutils/thefish/Makefile +++ b/sysutils/thefish/Makefile @@ -7,6 +7,7 @@ PORTNAME= thefish PORTVERSION= 0.6.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,8 +16,7 @@ MAINTAINER= mmendez@energyhq.be COMMENT= Qt/Gtk+/ncurses rc.conf editor/management tool MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ - LOCALBASE="${LOCALBASE}" \ - X11BASE="${X11BASE}" + LOCALBASE="${LOCALBASE}" WANT_GNOME= yes @@ -46,7 +46,7 @@ MAKE_ENV+= WITH_GTK=yes .if defined(WITH_QT) USE_QT_VER= 3 MAKE_ENV+= WITH_QT=yes -CXXFLAGS+= -Wall -DWITH_QT -I${X11BASE}/include +CXXFLAGS+= -Wall -DWITH_QT -I${LOCALBASE}/include .endif MAN1= thefish.1 diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile index 346f395..0b3b12a 100644 --- a/sysutils/torsmo/Makefile +++ b/sysutils/torsmo/Makefile @@ -9,15 +9,14 @@ PORTNAME= torsmo PORTVERSION= 0.18 PORTREVISION= 7 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= novel@FreeBSD.org COMMENT= System monitor that renders text on desktop GNU_CONFIGURE= yes USE_XORG= x11 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MAN1= torsmo.1 PLIST_FILES= bin/torsmo \ diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile index 3d952cf..0672424 100644 --- a/sysutils/usbhotkey/Makefile +++ b/sysutils/usbhotkey/Makefile @@ -8,8 +8,7 @@ PORTNAME= usbhotkey PORTVERSION= 0.3.1 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= usbhotkey +MASTER_SITES= SF/usbhotkey MAINTAINER= ntarmos@ceid.upatras.gr COMMENT= A utility to remap USB keyboards under X11 @@ -22,8 +21,8 @@ OPTIONS= GUI "Enable GUI bits (Imlib dependency)" on USE_RUBY= yes USE_GMAKE= yes HAS_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/sysutils/wmapm/files/patch-aa b/sysutils/wmapm/files/patch-aa index acc9fc6..9ca1463 100644 --- a/sysutils/wmapm/files/patch-aa +++ b/sysutils/wmapm/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -Wall -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lX11 -lXext OBJS = wmapm.o \ ../wmgeneral/wmgeneral.o diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile index 3dafd88..d90e1d2 100644 --- a/sysutils/wmavgload/Makefile +++ b/sysutils/wmavgload/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Another WindowMaker load gauge USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= wmavgload NO_INSTALL_MANPAGES= yes diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile index 7a35a2a..5150823 100644 --- a/sysutils/wmbattery/Makefile +++ b/sysutils/wmbattery/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmbattery PORTVERSION= 1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils windowmaker MASTER_SITES= http://www.kitenet.net/programs/wmbattery/old/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -19,9 +19,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= xpm GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include - MAN1= wmbattery.1 post-install: diff --git a/sysutils/wmbluecpu/files/patch-Makefile b/sysutils/wmbluecpu/files/patch-Makefile index 45ed764..ac3dd82 100644 --- a/sysutils/wmbluecpu/files/patch-Makefile +++ b/sysutils/wmbluecpu/files/patch-Makefile @@ -3,8 +3,8 @@ @@ -1,43 +1,23 @@ -#Makefile +CC ?= cc -+LDIR = -L${X11BASE}/lib -+IDIR = -I${X11BASE}/include ++LDIR = -L${LOCALBASE}/lib ++IDIR = -I${LOCALBASE}/include -PREFIX=/usr/local -BINDIR=$(PREFIX)/bin diff --git a/sysutils/wmbsdbatt/files/patch-Makefile b/sysutils/wmbsdbatt/files/patch-Makefile index c7a49d9..e079b36 100644 --- a/sysutils/wmbsdbatt/files/patch-Makefile +++ b/sysutils/wmbsdbatt/files/patch-Makefile @@ -11,8 +11,8 @@ HEADER = dockapp.h -CFLAGS += -Wall -I/usr/local/include -I/usr/X11R6/include -LDFLAGS += -L/usr/local/lib -L/usr/X11R6/lib -lX11 -lXext -lXpm -+CFLAGS += -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include -+LDFLAGS += -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lX11 -lXext -lXpm ++CFLAGS += -Wall -I$(LOCALBASE)/include ++LDFLAGS += -L$(LOCALBASE)/lib -lX11 -lXext -lXpm all: ${PROGRAM} diff --git a/sysutils/wmcube/files/patch-Makefile.FREEBSD b/sysutils/wmcube/files/patch-Makefile.FREEBSD index 1fea419..c4e2906 100644 --- a/sysutils/wmcube/files/patch-Makefile.FREEBSD +++ b/sysutils/wmcube/files/patch-Makefile.FREEBSD @@ -7,8 +7,8 @@ -LIBDIR = -L/usr/X11R6/lib -LIBDIR = -L/usr/X11R6/lib -INCDIR = -I/usr/X11R6/include -+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib -+INCDIR = -I${X11BASE}/include ++LIBDIR = -L${LOCALBASE}/lib -L${LOCALBASE}/lib ++INCDIR = -I${LOCALBASE}/include # Edit OSLIBS as appropriate to include OS specific libraries. diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile index fda10d8..03bfc9c 100644 --- a/sysutils/wmdiskmon/Makefile +++ b/sysutils/wmdiskmon/Makefile @@ -7,14 +7,14 @@ PORTNAME= wmdiskmon PORTVERSION= 0.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils windowmaker MASTER_SITES= http://tnemeth.free.fr/projets/programmes/ MAINTAINER= ports@FreeBSD.org COMMENT= Disk usage monitor dockapp -USE_XPM= x11 xpm +USE_XORG= x11 xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix="" diff --git a/sysutils/wmflame/files/patch-Makefile b/sysutils/wmflame/files/patch-Makefile index a90360b..18c4e70 100644 --- a/sysutils/wmflame/files/patch-Makefile +++ b/sysutils/wmflame/files/patch-Makefile @@ -9,8 +9,8 @@ $FreeBSD$ -OBJS = wmflame.o ../wmgeneral/wmgeneral.o +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 +OBJS = wmflame.o ../wmgeneral/wmgeneral.o diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile index b8d68dc..8314681 100644 --- a/sysutils/wmfsm/Makefile +++ b/sysutils/wmfsm/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= wmfsm.1 PLIST_FILES= bin/wmfsm -CPPFLAGS= -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile index dea47bc..ea043cc 100644 --- a/sysutils/wmhm/Makefile +++ b/sysutils/wmhm/Makefile @@ -26,8 +26,8 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "requires speaker(4)" ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` -CONFIGURE_ARGS+=--with-xpm-includes=${X11BASE}/include \ - --with-xpm-library=${X11BASE}/lib +CONFIGURE_ARGS+=--with-xpm-includes=${LOCALBASE}/include \ + --with-xpm-library=${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/sysutils/wminet/files/patch-aa b/sysutils/wminet/files/patch-aa index fb302a6..3f82229 100644 --- a/sysutils/wminet/files/patch-aa +++ b/sysutils/wminet/files/patch-aa @@ -4,9 +4,9 @@ -LIBDIR = -L/usr/X11R6/lib -LIBS = -lXpm -lXext -lX11 -FLAGS = -O2 -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 -lkvm -+CFLAGS += -I${X11BASE}/include ++CFLAGS += -I${LOCALBASE}/include +CFLAGS += -DDEFAULT_WMINETRC="\"${PREFIX}/etc/wminetrc\"" OBJS = wminet.o \ ../wmgeneral/wmgeneral.o \ diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile index d596f08..a108368 100644 --- a/sysutils/wmlmmon/Makefile +++ b/sysutils/wmlmmon/Makefile @@ -19,8 +19,8 @@ ONLY_FOR_ARCHS= i386 USE_XORG= xpm GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include \ - --with-xpm-libraries=${X11BASE}/lib +CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include \ + --with-xpm-libraries=${LOCALBASE}/lib MAN8= wmlmmon.8 MANCOMPRESSED= yes PLIST_FILES= bin/wmlmmon diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile index d4d4b2b..83073c8 100644 --- a/sysutils/wmmemfree/Makefile +++ b/sysutils/wmmemfree/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmmemfree PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils windowmaker MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/xutils @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Memory and swap monitoring dockapp USE_BZIP2= yes -USE_X_PREFIX= yes USE_XORG= xpm MAN1= ${PORTNAME}.1 diff --git a/sysutils/wmmemfree/files/patch-Makefile b/sysutils/wmmemfree/files/patch-Makefile index 4587a4b..ef220cc 100644 --- a/sysutils/wmmemfree/files/patch-Makefile +++ b/sysutils/wmmemfree/files/patch-Makefile @@ -3,8 +3,8 @@ @@ -1,38 +1,17 @@ -#Makefile +CC ?= cc -+LDIR = -L${X11BASE}/lib -+IDIR = -I${X11BASE}/include ++LDIR = -L${LOCALBASE}/lib ++IDIR = -I${LOCALBASE}/include -PROG=wmmemfree -OBJS=dockapp.o draw.o mem_linux.o options.o wmmemfree.o diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile index fef9d9a..6996c1e 100644 --- a/sysutils/wmmount/Makefile +++ b/sysutils/wmmount/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The freespace for Window Maker USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: diff --git a/sysutils/wmpccard/files/patch-Makefile b/sysutils/wmpccard/files/patch-Makefile index 396d76c..af5a4f0 100644 --- a/sysutils/wmpccard/files/patch-Makefile +++ b/sysutils/wmpccard/files/patch-Makefile @@ -13,8 +13,8 @@ -X11INCLUDES = -I${PREFIX}/include -X11LDFLAGS = -L${PREFIX}/lib -+X11INCLUDES = -I${X11BASE}/include -+X11LDFLAGS = -L${X11BASE}/lib ++X11INCLUDES = -I${LOCALBASE}/include ++X11LDFLAGS = -L${LOCALBASE}/lib X11LIBS = -lXext -lX11 -lXpm -CC = cc diff --git a/sysutils/wmzazof/files/patch-Makefile b/sysutils/wmzazof/files/patch-Makefile index 0511212..3af74b4 100644 --- a/sysutils/wmzazof/files/patch-Makefile +++ b/sysutils/wmzazof/files/patch-Makefile @@ -6,8 +6,8 @@ -INCDIR = -I/usr/X11R6/include/X11 -DESTDIR= /usr/bin -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -ldockapp -lX11 -lXext -lXpm OBJS = wmzazof.o diff --git a/sysutils/xacpim/files/patch-Makefile b/sysutils/xacpim/files/patch-Makefile index 5b0c8f1..cc01999 100644 --- a/sysutils/xacpim/files/patch-Makefile +++ b/sysutils/xacpim/files/patch-Makefile @@ -3,13 +3,13 @@ @@ -1,10 +1,9 @@ -CC = gcc -CFLAGS = -O2 -ansi -Wall -L/usr/X11R6/lib -I/usr/X11R6/include -+CFLAGS += -L${X11BASE}/lib -I${X11BASE}/include ++CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include OBJS = main.o graphics.o sys.o osdep/freebsd.o all:: ${OBJS} - ${CC} -o xacpim *.o -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include -+ ${CC} -o xacpim *.o -lX11 -L${X11BASE}/lib -I${X11BASE}/include ++ ${CC} -o xacpim *.o -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include install:: xacpim strip xacpim diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile index e598135..8df1825 100644 --- a/sysutils/xbatt/Makefile +++ b/sysutils/xbatt/Makefile @@ -17,7 +17,7 @@ COMMENT= Laptop battery status display for X11 ONLY_FOR_ARCHS= i386 USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xbatt diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile index 2e46210..968a9e5 100644 --- a/sysutils/xbattbar/Makefile +++ b/sysutils/xbattbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbattbar PORTVERSION= 1.4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://iplab.aist-nara.ac.jp/member/suguru/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -16,7 +16,6 @@ MAINTAINER= sumikawa@FreeBSD.org COMMENT= Simple battery meter USE_IMAKE= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/xbattbar-${PORTVERSION} MAN1= xbattbar.1 PLIST_FILES= bin/xbattbar diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile index 12c3d69..f25cc98 100644 --- a/sysutils/xfce4-utils/Makefile +++ b/sysutils/xfce4-utils/Makefile @@ -7,7 +7,6 @@ PORTNAME= xfce4-utils PORTVERSION= 4.4.2 -PORTREVISION= 0 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= xfce-utils-${PORTVERSION} @@ -38,12 +37,9 @@ PLIST_SUB+= WITH_DBUS="@comment " .endif post-patch: -.if ${X11BASE} != ${LOCALBASE} - @${REINPLACE_CMD} 's|/usr/local/share:|${X11BASE}/share:|' \ + @${REINPLACE_CMD} 's|/usr/local/share:|${LOCALBASE}/share:|' \ ${WRKSRC}/scripts/startxfce4.in -.else @${REINPLACE_CMD} 's|/usr/local/share:||' \ ${WRKSRC}/scripts/startxfce4.in -.endif .include <bsd.port.post.mk> diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile index 012d588..caa97c0 100644 --- a/sysutils/xloadface/Makefile +++ b/sysutils/xloadface/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf PATCH_STRIP= -p1 USE_IMAKE= yes -XLOADFACEDIR= $(X11BASE)/lib/X11/xloadface +XLOADFACEDIR= $(LOCALBASE)/lib/X11/xloadface MAN1= xloadface.1 MANLANG= ja diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 4d610a2..019a310 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -8,15 +8,14 @@ PORTNAME= xosview PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= clsung@FreeBSD.org COMMENT= A graphical performance meter -USE_X_PREFIX= yes +USE_XORG= xpm GNU_CONFIGURE= yes MAN1= xosview.1 diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index 551e60a..77b3183 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -7,11 +7,10 @@ PORTNAME= xvidcap DISTVERSION= 1.1.4p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= sysutils multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= thierry@FreeBSD.org COMMENT= Capture your X display to individual frames or MPEG video @@ -30,12 +29,12 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKE="${GMAKE}" -CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ - -with-forced-embedded-ffmpeg # To be removed after ffmpeg-devel's upgrade +CONFIGURE_ARGS= -with-forced-embedded-ffmpeg # To be removed after ffmpeg-devel's upgrade USE_GMAKE= yes # To be removed after ffmpeg-devel's upgrade USE_GNOME= glib20 libglade2 USE_GETTEXT= yes +USE_XORG= x11 xmu INSTALLS_OMF= yes .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == "" diff --git a/sysutils/xwlans/files/patch-Makefile b/sysutils/xwlans/files/patch-Makefile index 5e2db76..af7e86e 100644 --- a/sysutils/xwlans/files/patch-Makefile +++ b/sysutils/xwlans/files/patch-Makefile @@ -18,12 +18,12 @@ clean:: rm *.o --- 1,14 ---- -! CFLAGS += -L${X11BASE}/lib -I${X11BASE}/include +! CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include OBJS = main.o graphics.o sys.o osdep/freebsd.o all:: ${OBJS} -! ${CC} -o xwlans *.o -lX11 -L${X11BASE}/lib -I${X11BASE}/include +! ${CC} -o xwlans *.o -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include install:: xwlans strip xwlans diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile index aa0c66b..1c02351 100644 --- a/textproc/gnome-spell/Makefile +++ b/textproc/gnome-spell/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-spell PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,7 +20,6 @@ COMMENT= A GNOME/Bonobo component for spell checking LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell USE_BZIP2= yes -USE_XLIB= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile index b70d4df..4e6b282 100644 --- a/textproc/gnome-translate/Makefile +++ b/textproc/gnome-translate/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-translate PORTVERSION= 0.99 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= libtranslate @@ -20,7 +20,6 @@ LIB_DEPENDS= translate:${PORTSDIR}/textproc/libtranslate INSTALLS_OMF= yes INSTALLS_ICONS= yes GCONF_SCHEMAS= gnome-translate.schemas -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix eel2 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 0d93de5..fd9f9cf 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkspell PORTVERSION= 2.0.11 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= textproc gnome MASTER_SITES= http://gtkspell.sourceforge.net/download/ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} @@ -26,7 +26,6 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 GNU_CONFIGURE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/gxditview/Makefile b/textproc/gxditview/Makefile index c40b224..8973230 100644 --- a/textproc/gxditview/Makefile +++ b/textproc/gxditview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxditview PORTVERSION= ${GXDVVERSION}${GXDVREVISION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc DISTFILES= # none @@ -28,7 +28,7 @@ GXDVREVISION!= sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' /usr/src/contrib/groff/RE .if exists(/usr/src/contrib/groff/src/devices/xditview) && \ exists(/usr/src/gnu/usr.bin/groff/src/devices/xditview) -USE_X_PREFIX= yes +USE_XORG= x11 xproto xt xmu xaw MANCOMPRESSED= maybe WRKSRC= /usr/src/gnu/usr.bin/groff/src/devices/xditview MAKE_ENV= MAKEOBJDIR=${WRKDIR} diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index a2c43b6..af2ef0b 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-c ONLY_FOR_ARCHS= i386 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index e51a0de..3fa85e9 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -18,7 +18,7 @@ COMMENT= Internet/Intranet Input Method Framework protocol library ONLY_FOR_ARCHS= i386 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env diff --git a/textproc/lemmatizer/Makefile b/textproc/lemmatizer/Makefile index 96c7aa8..8707b1e 100644 --- a/textproc/lemmatizer/Makefile +++ b/textproc/lemmatizer/Makefile @@ -28,7 +28,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-datadir=${DB_DIR} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib pre-fetch: diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile index 6e1e8a5..4cb0a70 100644 --- a/textproc/liblingoteach/Makefile +++ b/textproc/liblingoteach/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libxml2 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITH_COMP) CONFIGURE_ARGS+= --with-compression diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile index 8c15095..7de1453 100644 --- a/textproc/libxdiff/Makefile +++ b/textproc/libxdiff/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile index 9624601..24d9c0c 100644 --- a/textproc/libxml++/Makefile +++ b/textproc/libxml++/Makefile @@ -19,6 +19,6 @@ COMMENT= XML API for C++ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget libxml2 pkgconfig GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index 665bee1..bd9568f 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_GCC= 3.4+ USE_GNOME= gnomehack gnometarget libxml2 pkgconfig GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION="2.6" API_VERSION="2.6" DOC_VERSION=${PORTVERSION:R} diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile index 73e52e6..e5c55dc 100644 --- a/textproc/linux-expat/Makefile +++ b/textproc/linux-expat/Makefile @@ -18,7 +18,7 @@ BRANDELF_DIRS= usr/bin USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile index 73e52e6..e5c55dc 100644 --- a/textproc/linux-f10-expat/Makefile +++ b/textproc/linux-f10-expat/Makefile @@ -18,7 +18,7 @@ BRANDELF_DIRS= usr/bin USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile index 50be2e7..d826d1a 100644 --- a/textproc/linux-f10-libxml/Makefile +++ b/textproc/linux-f10-libxml/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libxml USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile index 1f8546b..6fa129d 100644 --- a/textproc/linux-f10-libxml2/Makefile +++ b/textproc/linux-f10-libxml2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libxml2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile index 73e52e6..e5c55dc 100644 --- a/textproc/linux-f8-expat/Makefile +++ b/textproc/linux-f8-expat/Makefile @@ -18,7 +18,7 @@ BRANDELF_DIRS= usr/bin USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile index 50be2e7..d826d1a 100644 --- a/textproc/linux-f8-libxml/Makefile +++ b/textproc/linux-f8-libxml/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libxml USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile index 1f8546b..6fa129d 100644 --- a/textproc/linux-f8-libxml2/Makefile +++ b/textproc/linux-f8-libxml2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libxml2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile index 50be2e7..d826d1a 100644 --- a/textproc/linux-libxml/Makefile +++ b/textproc/linux-libxml/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of libxml USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile index 1f8546b..6fa129d 100644 --- a/textproc/linux-libxml2/Makefile +++ b/textproc/linux-libxml2/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of libxml2 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/textproc/linux-xerces-c2/Makefile b/textproc/linux-xerces-c2/Makefile index 365a0b7..7736161 100644 --- a/textproc/linux-xerces-c2/Makefile +++ b/textproc/linux-xerces-c2/Makefile @@ -21,7 +21,7 @@ COMMENT= Validating XML parser from the Apache XML Project (linux version) USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile index 4817f87..ec278c6 100644 --- a/textproc/modlogan/Makefile +++ b/textproc/modlogan/Makefile @@ -33,7 +33,7 @@ LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client # Please don't remove the comments, as soon as autoconf/libtool get's # updated in the ports collection the comments may be removed. # They serve as a reminder. -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \ --program-transform-name=\'\' diff --git a/textproc/nunnimcax/Makefile b/textproc/nunnimcax/Makefile index dabb92f..7975a24 100644 --- a/textproc/nunnimcax/Makefile +++ b/textproc/nunnimcax/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= nunnimcax MAINTAINER= skv@FreeBSD.org COMMENT= C, non validating XML parser with SAX-like API -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES SHLIB_MAJOR= 2 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/textproc/pcrs/Makefile b/textproc/pcrs/Makefile index 1d7fc81..8d3c9c7 100644 --- a/textproc/pcrs/Makefile +++ b/textproc/pcrs/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= pcrs.3 PLIST_FILES= bin/pcrsed \ diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile index bcf5941..76086b6 100644 --- a/textproc/rast/Makefile +++ b/textproc/rast/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-default-encoding=${DEFAULT_ENCODING} \ --with-filter-moduledir=${PREFIX}/lib/rast/filters CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-lz" -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES MAN1= rast-config.1 rast-create.1 rast-delete.1 rast-optimize.1 \ rast-register.1 rast-search.1 diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile index 358601a..c3651fe 100644 --- a/textproc/scim-input-pad/Makefile +++ b/textproc/scim-input-pad/Makefile @@ -18,7 +18,7 @@ COMMENT= SCIM add-on to input various symbols with on-screen pad BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile index a8fb049..2065f40 100644 --- a/textproc/scim-kmfl-imengine/Makefile +++ b/textproc/scim-kmfl-imengine/Makefile @@ -7,6 +7,7 @@ PORTNAME= scim-kmfl-imengine PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://anthesphoria.net/files/distribution/ @@ -21,6 +22,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \ LIB_DEPENDS= kmfl:${PORTSDIR}/textproc/libkmfl RUN_DEPENDS= ${BUILD_DEPENDS} +USE_XORG= x11 xkbfile USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 intltool intlhack pkgconfig glib20 USE_GETTEXT= yes diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile index d5dbc94..af736eb 100644 --- a/textproc/scim/Makefile +++ b/textproc/scim/Makefile @@ -7,10 +7,9 @@ PORTNAME= scim PORTVERSION= 1.4.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=scim +MASTER_SITES= SF MAINTAINER= lx@FreeBSD.org COMMENT= Smart Common Input Method platform @@ -20,6 +19,7 @@ USE_GNOME= gnomehack gnomehier gtk20 intlhack USE_AUTOTOOLS= libtool:15 USE_ICONV= yes USE_GMAKE= yes +USE_XORG= x11 xpm USE_LDCONFIG= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 4d16dc8..bdd4f5e 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -17,7 +17,7 @@ PKGNAMESUFFIX= -nox11 MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_GNOME= yes USE_GNOME+= gnometarget glib20 USE_GMAKE= yes diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile index 48e4dc0..d15c1ad 100644 --- a/textproc/wbxml2/Makefile +++ b/textproc/wbxml2/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= aclocal:19 autoconf:261 autoheader:261 automake:19 libtool:15 AUTOMAKE_ARGS= -acf -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= pkgconfig CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile index 822463b..3e79f5f 100644 --- a/textproc/wordnet/Makefile +++ b/textproc/wordnet/Makefile @@ -20,7 +20,7 @@ MAKE_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} PLIST_SUB+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} USE_BZIP2= yes REINPLACE_ARGS= -i "" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_FILES= pkg-message SUB_LIST+= TCL_VER=${TCL_VER} diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile index 8639f3e..6d7cb5b 100644 --- a/textproc/yamcha/Makefile +++ b/textproc/yamcha/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= svm_learn:${PORTSDIR}/science/svmlight USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_PERL5_BUILD=yes DOC_FILES= feature.png feature2.png feature3.png \ feature4.png feature5.png index.html \ diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile index c635fef..fd6c963 100644 --- a/ukrainian/monacofonts/Makefile +++ b/ukrainian/monacofonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= monaco PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ukrainian x11-fonts MASTER_SITES= http://www.brama.com/compute/unix/ PKGNAMEPREFIX= koi8-u- @@ -17,10 +17,11 @@ DISTNAME= ${PORTNAME} MAINTAINER= mi@aldan.algebra.com COMMENT= A collection of 5 "fixed" fonts for X11 from www.brama.com -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_ZIP= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/Monaco.bdf diff --git a/ukrainian/monacofonts/files/Makefile b/ukrainian/monacofonts/files/Makefile index 16da67e..44d7fa8 100644 --- a/ukrainian/monacofonts/files/Makefile +++ b/ukrainian/monacofonts/files/Makefile @@ -8,10 +8,10 @@ PCFS:= ${STEMS:S/$/.pcf.gz/} all: ${PCFS} fonts.dir fonts.alias .bdf.pcf.gz: - ${X11BASE}/bin/bdftopcf < $< | gzip -9 > $@ + ${LOCALBASE}/bin/bdftopcf < $< | gzip -9 > $@ fonts.dir: ${PCFS} - ${X11BASE}/bin/mkfontdir + ${LOCALBASE}/bin/mkfontdir # I don't know why ``isoir-111'' was chosen for this fonts' encoding -- # they are in koi8-u, so the each will have a corresponding alias. @@ -24,7 +24,7 @@ fonts.alias: fonts.dir print $$2 " " name; gsub("koi8-u", "koi8-r", $$2); \ print $$2 " " name}' < fonts.dir > fonts.alias -DIR= ${X11BASE}/lib/X11/fonts/koi8u-monaco +DIR= ${LOCALBASE}/lib/X11/fonts/koi8u-monaco install: all ${MKDIR} ${DIR} diff --git a/ukrainian/monacofonts/pkg-message b/ukrainian/monacofonts/pkg-message index 7b0a420..9552676 100644 --- a/ukrainian/monacofonts/pkg-message +++ b/ukrainian/monacofonts/pkg-message @@ -1,8 +1,8 @@ For your X-server to use the fonts, you have to add - the ${X11BASE}/lib/X11/fonts/koi8u-monaco (X11BASE is, - usually, /usr/X11R6) to the server's font-path. Use - ``xset fp+'' to do this for the current X-session and + the ${LOCALBASE}/lib/X11/fonts/koi8u-monaco (LOCALBASE is, + usually, /usr/local) to the server's font-path. Use + ``xset fp+'' ${LOCALBASE} to do this for the current X-session and consult your X-server's documentation to make this permanent. diff --git a/vietnamese/gtk-im-vi/Makefile b/vietnamese/gtk-im-vi/Makefile index 87f136d..f3bd785 100644 --- a/vietnamese/gtk-im-vi/Makefile +++ b/vietnamese/gtk-im-vi/Makefile @@ -22,7 +22,7 @@ USE_LDCONFIG= YES .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; s,ChangeLog,,' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},; s,ChangeLog,,' \ ${WRKSRC}/Makefile.in ${WRKSRC}/po/Makefile.in.in post-install: diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile index e6d6fb5..0ac4b7e 100644 --- a/vietnamese/unicode-uhoai/Makefile +++ b/vietnamese/unicode-uhoai/Makefile @@ -8,7 +8,7 @@ PORTNAME= unicode-uhoai PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= http://www.geocities.com/~starkville/mozilla/ DISTNAME= uhoaiw21 @@ -18,12 +18,11 @@ COMMENT= Unicode TrueType Font with UHoai Vietnamese encoding USE_ZIP= yes NO_WRKSUBDIR= yes -USE_X_PREFIX= yes NO_BUILD= taken care of in do-install target BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/TrueType diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile index 2e71cb4..3d4f19c 100644 --- a/vietnamese/vnterm/Makefile +++ b/vietnamese/vnterm/Makefile @@ -21,7 +21,9 @@ USE_IMAKE= yes .include <bsd.port.pre.mk> BUILD_DEPENDS= ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet \ - mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale RUN_DEPENDS= ${PREFIX}/lib/X11/fonts/vietnamese/fonts.dir:${PORTSDIR}/vietnamese/vnxfonts EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/programs/xterm diff --git a/vietnamese/vnxfonts/Makefile b/vietnamese/vnxfonts/Makefile index e21c8a4..4875b75 100644 --- a/vietnamese/vnxfonts/Makefile +++ b/vietnamese/vnxfonts/Makefile @@ -10,7 +10,7 @@ PORTNAME= vnxfonts PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= obrien @@ -20,11 +20,11 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= obrien@FreeBSD.org COMMENT= X fonts for displaying Vietnamese -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/fonts/X -USE_X_PREFIX= yes do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/vietnamese diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile index 87b0b44..447db60 100644 --- a/vietnamese/xvnkb/Makefile +++ b/vietnamese/xvnkb/Makefile @@ -8,10 +8,9 @@ PORTNAME= xvnkb PORTVERSION= 0.2.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= vietnamese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= chinhngt@sectorb.msk.ru COMMENT= A Vietnamese input method for X-Window @@ -21,12 +20,12 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" XLIB_DIR="${X11BASE}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" XLIB_DIR="${LOCALBASE}" .if defined(WITHOUT_XFT) CONFIGURE_ARGS+= --no-xft .else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG= xft .endif SUB_LIST= PORTVERSION=${PORTVERSION} @@ -43,7 +42,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/locale/la_LN.UTF-8/LC_CTYPE:${PORTSDIR}/misc/ut .endif post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/tools/Makefile.dep + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/tools/Makefile.dep post-install: @${STRIP_CMD} ${PREFIX}/bin/xvnkb diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile index 8344e55..3bb9fb1 100644 --- a/www/WebMagick/Makefile +++ b/www/WebMagick/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 2.03p3 PORTREVISION= 27 PORTEPOCH= 1 CATEGORIES= www graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= webmagick +MASTER_SITES= SF/webmagick DISTNAME= ${PORTNAME}-2.03pre3 MAINTAINER= ache@freebsd.org @@ -31,7 +30,7 @@ CONFIGURE_ENV= webmagick_cv_rootpath=${PREFIX}/www/data \ .include <bsd.port.pre.mk> -.if !exists(${X11BASE}/bin/xlsfonts) +.if !exists(${LOCALBASE}/bin/xlsfonts) WITHOUT_X11= yes .endif diff --git a/www/amaya/Makefile b/www/amaya/Makefile index d9e30de..d0a1bde 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -7,6 +7,7 @@ PORTNAME= amaya PORTVERSION= 9.55 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ \ @@ -24,12 +25,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= adam-ports@blacktabby.org COMMENT= The W3C's testbed web editor/browser -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/Amaya/obj +USE_XORG= xft x11 USE_GMAKE= yes USE_GNOME= gtk12 imlib USE_ICONV= yes diff --git a/www/ashe/files/patch-aa b/www/ashe/files/patch-aa index e944583..a309d9e 100644 --- a/www/ashe/files/patch-aa +++ b/www/ashe/files/patch-aa @@ -6,7 +6,7 @@ -INCLUDES = -I/usr/include/X11 - -CC=gcc -g $(INCLUDES) -+CFLAGS += -I${X11BASE}/include -DMOTIF1_2 ++CFLAGS += -I${LOCALBASE}/include -DMOTIF1_2 RANLIB=ranlib diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index feb3343..cb801ea 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -19,7 +19,7 @@ MAINTAINER= b3k@mail.ru COMMENT= An implementation of an ICAP server GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= c_icap USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index 45dae5b..8b48792 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -20,7 +20,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|-pedantic||g' ${WRKSRC}/configure diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile index f7ecab3..e339a86 100644 --- a/www/cgihtml/Makefile +++ b/www/cgihtml/Makefile @@ -16,7 +16,7 @@ MASTER_SITES= http://www.eekim.com/software/cgihtml/ \ MAINTAINER= roam@FreeBSD.org COMMENT= Library that simplifies the task of writing CGI programs in C -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile index 8780867..951a40f 100644 --- a/www/dillo-i18n/Makefile +++ b/www/dillo-i18n/Makefile @@ -84,8 +84,8 @@ CONFIGURE_ARGS+= --disable-anti-alias .if defined(WITH_DILLO_DLGUI) CONFIGURE_ARGS+= --enable-dlgui BUILD_DEPENDS+= fltk>=2.0.r4825:${PORTSDIR}/x11-toolkits/fltk2 -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-dlgui .endif diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 0310242..0532ce4 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -47,8 +47,8 @@ CONFIGURE_ARGS+= --disable-ssl .if defined(WITH_DILLO_DLGUI) CONFIGURE_ARGS+= --enable-dlgui BUILD_DEPENDS+= fltk>=2.0.r4825:${PORTSDIR}/x11-toolkits/fltk2 -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-dlgui .endif diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index 0310242..0532ce4 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -47,8 +47,8 @@ CONFIGURE_ARGS+= --disable-ssl .if defined(WITH_DILLO_DLGUI) CONFIGURE_ARGS+= --enable-dlgui BUILD_DEPENDS+= fltk>=2.0.r4825:${PORTSDIR}/x11-toolkits/fltk2 -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-dlgui .endif diff --git a/www/dotproject-devel/Makefile b/www/dotproject-devel/Makefile index d9e402a..621c28d 100644 --- a/www/dotproject-devel/Makefile +++ b/www/dotproject-devel/Makefile @@ -8,8 +8,7 @@ PORTNAME= dotproject PORTVERSION= ${DOTPROJECTVER}.${DEVELVERSION:C/^([a-z]).*/\1/}${DEVELVERSION:C/^[a-z]*//} CATEGORIES= www devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-${DOTPROJECTVER}-${DEVELVERSION} @@ -33,7 +32,7 @@ SUB_LIST+= DOTPROJECTDIR=${DOTPROJECTDIR} SUB_FILES= pkg-message .if defined(WITH_JPGRAPH) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/webfonts/arial.ttf:${PORTSDIR}/x11-fonts/webfonts \ +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/webfonts/arial.ttf:${PORTSDIR}/x11-fonts/webfonts \ ${PREFIX}/share/jpgraph/jpgraph.php:${PORTSDIR}/graphics/jpgraph2 .endif diff --git a/www/dummyflash/files/patch-aa b/www/dummyflash/files/patch-aa index c178e1d..62557ce 100644 --- a/www/dummyflash/files/patch-aa +++ b/www/dummyflash/files/patch-aa @@ -52,7 +52,7 @@ +# api gets control. + +# PLUGIN_DEFINES= -DXP_UNIX -DPLUGIN_TRACE -+PLUGIN_DEFINES= -DXP_UNIX -I../../../include -I../Source/_gen -I${X11BASE}/include ++PLUGIN_DEFINES= -DXP_UNIX -I../../../include -I../Source/_gen -I${LOCALBASE}/include + +CC= gcc +OPTIMIZER= -g diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 76c32bb..94d75d8 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -8,6 +8,7 @@ PORTNAME= epiphany-extensions PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +22,6 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GECKO= firefox firefox15<->firefox xulrunner USE_GNOME= gnomeprefix gnomehack intlhack gnometarget INSTALLS_OMF= yes diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 73df6e1..972d176 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -8,7 +8,7 @@ PORTNAME= epiphany PORTVERSION= 2.22.1.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +26,6 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_PYTHON= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 0289aac..546ecd5 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -8,6 +8,7 @@ PORTNAME= evolution-webcal PORTVERSION= 2.21.92 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,7 +17,6 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Webcal(endar) handler for gnome -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile index f7ec549..c905f91 100644 --- a/www/fcgi/Makefile +++ b/www/fcgi/Makefile @@ -17,7 +17,7 @@ COMMENT= FastCGI Development Kit USE_AUTOTOOLS= libtool:15 USE_PERL5= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= cgi-fcgi.1 MAN3= FCGI_Accept.3 FCGI_Finish.3 FCGI_SetExitStatus.3 \ diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 024a1fa..7bd2430 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -8,6 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox-remote/Makefile b/www/firefox-remote/Makefile index e580beb..1b71a92 100644 --- a/www/firefox-remote/Makefile +++ b/www/firefox-remote/Makefile @@ -49,7 +49,7 @@ PLIST_SUB+= MENU_THUNDERBIRD="@comment " .endif do-build: - @${REINPLACE_CMD} -e 's|@X11BASE@|${PREFIX}|g' \ + @${REINPLACE_CMD} -e 's|@LOCALBASE@|${PREFIX}|g' \ ${WRKSRC}/${FIREFOX_REMOTE} @${REINPLACE_CMD} -e 's|@UTF8@|${UTF8_HACK}|g' \ ${WRKSRC}/${FIREFOX_REMOTE} @@ -62,15 +62,15 @@ do-install: ${PREFIX}/bin/${THUNDERBIRD_REMOTE} .if defined (WITH_MENU_FIREFOX) ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \ - ${X11BASE}/share/applications/ + ${LOCALBASE}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \ - ${X11BASE}/share/pixmaps/ + ${LOCALBASE}/share/pixmaps/ .endif .if defined (WITH_MENU_THUNDERBIRD) ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \ - ${X11BASE}/share/applications/ + ${LOCALBASE}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \ - ${X11BASE}/share/pixmaps/ + ${LOCALBASE}/share/pixmaps/ .endif ${CAT} ${PKGMESSAGE} diff --git a/www/firefox-remote/pkg-message b/www/firefox-remote/pkg-message index 796f2f2..d0af0c6 100644 --- a/www/firefox-remote/pkg-message +++ b/www/firefox-remote/pkg-message @@ -1,7 +1,7 @@ ======================================================================== To enable mailto: in firefox the easiest way is to install the MozEx -navigation extension and use "${X11BASE}/bin/thunderbird-remote %r" +navigation extension and use "${LOCALBASE}/bin/thunderbird-remote %r" (without quotes) as the Mailer command. ======================================================================== diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 024a1fa..7bd2430 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -8,6 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 024a1fa..7bd2430 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -8,6 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile index d25d754..df7a579 100644 --- a/www/flashplugin-mozilla/Makefile +++ b/www/flashplugin-mozilla/Makefile @@ -7,10 +7,9 @@ PORTNAME?= flashplugin-mozilla PORTVERSION= 0.4.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gplflash +MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} MAINTAINER= llwang@infor.org @@ -20,14 +19,14 @@ LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/plugin +USE_XORG= xt x11 xext USE_BZIP2= yes -USE_X_PREFIX= yes PLUGIN_DIR= lib/browser_plugins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-plugin-dir="${PREFIX}/${PLUGIN_DIR}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXt" + LDFLAGS="-L${LOCALBASE}/lib -lXt" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} post-patch: diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 3a6308f..2a7e466 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -8,9 +8,9 @@ PORTNAME= galeon PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://osdn.dl.sourceforge.net/sourceforge/galeon/ +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//} MAINTAINER= gnome@FreeBSD.org @@ -19,7 +19,6 @@ COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine) USE_GECKO= firefox mozilla seamonkey xulrunner WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//} USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ gnomedesktop diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 9f7e32a..4bd6aace 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-user-share PORTVERSION= 0.31 +PORTREVISION= 1 CATEGORIES= www deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +22,6 @@ LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_APACHE= 2.0+ USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 GNU_CONFIGURE= yes diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile index f236d96..5370c1a 100644 --- a/www/gnome-web-photo/Makefile +++ b/www/gnome-web-photo/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnome-web-photo PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 @@ -22,7 +22,6 @@ USE_GECKO= firefox seamonkey xulrunner firefox15<->firefox GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gecko=${GECKO} USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomevfs2 gnomehack gnomeprefix GCONF_SCHEMAS= thumbnailer.schemas diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 14f2f22..34af656 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml PORTVERSION= 1.1.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 @@ -19,7 +19,6 @@ COMMENT= Lightweight HTML rendering/printing/editing engine LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal USE_GETTEXT= yes diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 64e2ada..a1b0b9a 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkhtml3 PORTVERSION= 3.12.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,7 +25,6 @@ DEPRECATED= Older API; newer applications should use www/gtkhtml3 USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack \ libgnomeprintui diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile index 415def9..044bdec 100644 --- a/www/gurlchecker/Makefile +++ b/www/gurlchecker/Makefile @@ -26,8 +26,8 @@ OPTIONS= CROCO "Use CROCO library for CSS2 validation" off \ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/www/helixplugin/files/BSDmakefile b/www/helixplugin/files/BSDmakefile index 3c3a1a3..b69e16a 100644 --- a/www/helixplugin/files/BSDmakefile +++ b/www/helixplugin/files/BSDmakefile @@ -6,7 +6,7 @@ CXXFLAGS += -I${LOCALBASE}/include/${GECKO}/xpcom CXXFLAGS += -I${LOCALBASE}/include/${GECKO}/npapi CXXFLAGS += -I${LOCALBASE}/include/${GECKO}/string CXXFLAGS += -I${LOCALBASE}/include/${GECKO} -CXXFLAGS += -I${X11BASE}/include +CXXFLAGS += -I${LOCALBASE}/include CXXFLAGS += -I${TOP}/player/app/plugin/include CXXFLAGS += -I${TOP}/player/app/gtk/pub diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 17da7f5..310ff2c 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -8,7 +8,7 @@ PORTNAME= kazehakase PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ${PORTNAME}/30219 @@ -18,7 +18,6 @@ COMMENT= Kazehakase is a browser with gecko engine like Epiphany or Galeon LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls -USE_X_PREFIX= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 USE_GMAKE= yes USE_GETTEXT= yes @@ -26,7 +25,7 @@ USE_GECKO= firefox mozilla seamonkey xulrunner firefox15<->seamonkey USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gecko_engine=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAN1= kazehakase.1 OPTIONS= WEBKIT "Webkit Backend (along with Gecko)" On diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index f9a50b2..040cbd7 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -25,7 +25,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index f9a50b2..040cbd7 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -25,7 +25,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile index 3a23653..666b5b6 100644 --- a/www/kompozer/Makefile +++ b/www/kompozer/Makefile @@ -8,7 +8,7 @@ PORTNAME= kompozer DISTVERSION= 0.7.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF DISTNAME= ${PORTNAME}-${DISTVERSION}dfsg-src diff --git a/www/larbin/Makefile b/www/larbin/Makefile index e3c0916..855d622 100644 --- a/www/larbin/Makefile +++ b/www/larbin/Makefile @@ -9,14 +9,13 @@ PORTNAME= larbin PORTVERSION= 2.6.3 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A powerful HTTP crawler with an easy interface BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ - makedepend:${X_IMAKE_PORT} + makedepend:${PORTSDIR}/devel/makedepend USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 7eb7ee5..b9d1ee3 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgtkhtml PORTVERSION= 2.11.1 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11 @@ -17,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack USE_LDCONFIG= yes diff --git a/www/man2web/Makefile b/www/man2web/Makefile index 8ea0ae8..b8a39dee 100644 --- a/www/man2web/Makefile +++ b/www/man2web/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --bindir="${PREFIX}/${CGIDIR}" \ --sysconfdir="${PREFIX}/etc" \ - --with-manpath=/usr/share/man:${X11BASE}/man:${LOCALBASE}/man \ + --with-manpath=/usr/share/man:${LOCALBASE}/man \ --with-distro=freebsd --enable-lynx PLIST_SUB= CGIDIR="${CGIDIR}" diff --git a/www/mmosaic/files/patch-Makefile b/www/mmosaic/files/patch-Makefile index 0516000..63b77d6 100644 --- a/www/mmosaic/files/patch-Makefile +++ b/www/mmosaic/files/patch-Makefile @@ -60,7 +60,7 @@ #xinc = -I/usr/X11/include # Linux, FreeBSD -#xinc = -I/usr/X11R6/include -+xinc = -I/${X11BASE}/include ++xinc = -I/${LOCALBASE}/include # Irix #xinc = -I/usr/include # Solaris 2.x @@ -76,7 +76,7 @@ #xlibs = -L/usr/X11/lib -lXm_s -lXt_s -lX11_s -lXqnx_s -lXt -lXmu -lXext # Linux, FreeBSD, NetBSD with Lesstif -#xlibs = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lm -+xlibs = -L/${X11BASE}/lib -lXm -lXmu -lXt -lXext -lX11 -lm ++xlibs = -L/${LOCALBASE}/lib -lXm -lXmu -lXt -lXext -lX11 -lm # some distrib. of Linux require -lSM -lICE # Linux Red Hat 6.1 lesstif-0.88.1-3 kernel 2.2.12-20 #xlibs = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lm -lSM -lICE diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile index 6b00ca7..df571aa 100644 --- a/www/mod_webapp/Makefile +++ b/www/mod_webapp/Makefile @@ -24,7 +24,7 @@ USE_PYTHON_BUILD=yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes # Release information for distribution files. TOMCAT_RELEASE= ${PORTVERSION} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2a91240..60f75ab 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -7,7 +7,7 @@ PORTNAME= mozilla PORTVERSION= 1.7.13 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 9c9cce8..16b845c5 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -56,8 +56,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ nspr4:${PORTSDIR}/devel/nspr \ - nss3:${PORTSDIR}/security/nss \ - Xft.2:${PORTSDIR}/x11-fonts/libXft + nss3:${PORTSDIR}/security/nss MAINTAINER?= gnome@FreeBSD.org @@ -68,7 +67,8 @@ MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes USE_PERL5_BUILD=yes -USE_XLIB= yes +USE_XORG= printproto sm xt xi xext x11 xinerama \ + ice xproto MOZILLA_SUFX?= none WRKSRC?= ${WRKDIR}/mozilla @@ -141,8 +141,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 @@ -223,8 +223,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|@LOCALBASE@|${LOCALBASE}|g' \ + -e 's|@LOCALBASE@|${LOCALBASE}|g' \ -e 's|@FAKEDIR@|${FAKEDIR}|g' \ -e 's|@PERL@|${PERL5}|g' \ -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ @@ -233,8 +232,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|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ -e 's|%%PERL%%|${PERL5}|g' \ -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ @@ -292,7 +290,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 \ @@ -303,7 +301,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/www/mozplugger/Makefile b/www/mozplugger/Makefile index 2f7c181..a8cae34 100644 --- a/www/mozplugger/Makefile +++ b/www/mozplugger/Makefile @@ -7,7 +7,7 @@ PORTNAME= mozplugger PORTVERSION= 1.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZDEV} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lorenl@north-winds.org COMMENT= Framework for loading web content in external viewers -EXTRACT_DEPENDS=bzip2:${PORTSDIR}/archivers/bzip2 +EXTRACT_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 +USE_XORG= x11 xt MAN7= mozplugger.7 -USE_XLIB= yes - FETCH_CMD= /usr/bin/fetch -Rr ALL_TARGET= freebsd diff --git a/www/mozplugger/files/patch-Makefile b/www/mozplugger/files/patch-Makefile index bfa0473..7798df7 100644 --- a/www/mozplugger/files/patch-Makefile +++ b/www/mozplugger/files/patch-Makefile @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ # Where is your Xwindows located? -X11=/usr/X11R6 -+X11=${X11BASE} ++X11=${LOCALBASE} # # For building rpms @@ -29,7 +29,7 @@ freebsd: - ${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/ -+ ${MAKE} all CC=${CC} XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=${X11BASE} ++ ${MAKE} all CC=${CC} XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=${LOCALBASE} openbsd: ${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/ diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index cad64f7..8bc0e4f 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -7,9 +7,9 @@ PORTNAME= mplayerplug-in PORTVERSION= 3.50 +PORTREVISION= 1 CATEGORIES= www multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mplayerplug-in +MASTER_SITES= SF/mplayerplug-in MAINTAINER= marcus@FreeBSD.org COMMENT= A Mozilla plugin for the MPlayer media player @@ -29,8 +29,9 @@ PLUGINSFILES= mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gmp USE_GNOME= gnometarget -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DBSD" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBSD" \ + LDFLAGS="-L${LOCALBASE}/lib" +USE_XORG= x11 xpm xt .include <bsd.port.pre.mk> .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" diff --git a/www/neon/Makefile b/www/neon/Makefile index 63ec9fc..b09d10c 100644 --- a/www/neon/Makefile +++ b/www/neon/Makefile @@ -18,7 +18,7 @@ COMMENT= An HTTP and WebDAV client library for Unix systems LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/www/neon26/Makefile b/www/neon26/Makefile index 63ec9fc..b09d10c 100644 --- a/www/neon26/Makefile +++ b/www/neon26/Makefile @@ -18,7 +18,7 @@ COMMENT= An HTTP and WebDAV client library for Unix systems LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/www/neon28/Makefile b/www/neon28/Makefile index 63ec9fc..b09d10c 100644 --- a/www/neon28/Makefile +++ b/www/neon28/Makefile @@ -18,7 +18,7 @@ COMMENT= An HTTP and WebDAV client library for Unix systems LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/www/neon29/Makefile b/www/neon29/Makefile index 63ec9fc..b09d10c 100644 --- a/www/neon29/Makefile +++ b/www/neon29/Makefile @@ -18,7 +18,7 @@ COMMENT= An HTTP and WebDAV client library for Unix systems LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/www/nspluginwrapper-devel/Makefile b/www/nspluginwrapper-devel/Makefile index cbed28c..5d2e989 100644 --- a/www/nspluginwrapper-devel/Makefile +++ b/www/nspluginwrapper-devel/Makefile @@ -34,7 +34,7 @@ USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --target-os=linux --target-cpu=i386 \ - --with-x11-prefix=${X11BASE} --with-cc=${CC} --with-cxx=${CXX} + --with-x11-prefix=${LOCALBASE} --with-cc=${CC} --with-cxx=${CXX} LIBDIR= ${PREFIX}/lib/${PORTNAME} @@ -49,7 +49,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,x86_64,amd64,g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure post-install: ${MKDIR} ${LIBDIR}/i386/linux @@ -60,7 +60,7 @@ post-install: .include <bsd.port.pre.mk> # XXX switch to USE_XORG once XFree86-4 is removed -BUILD_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} -RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} +BUILD_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} +RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} .include <bsd.port.post.mk> diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile index cbed28c..5d2e989 100644 --- a/www/nspluginwrapper/Makefile +++ b/www/nspluginwrapper/Makefile @@ -34,7 +34,7 @@ USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --target-os=linux --target-cpu=i386 \ - --with-x11-prefix=${X11BASE} --with-cc=${CC} --with-cxx=${CXX} + --with-x11-prefix=${LOCALBASE} --with-cc=${CC} --with-cxx=${CXX} LIBDIR= ${PREFIX}/lib/${PORTNAME} @@ -49,7 +49,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,x86_64,amd64,g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure post-install: ${MKDIR} ${LIBDIR}/i386/linux @@ -60,7 +60,7 @@ post-install: .include <bsd.port.pre.mk> # XXX switch to USE_XORG once XFree86-4 is removed -BUILD_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} -RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} +BUILD_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} +RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} .include <bsd.port.post.mk> diff --git a/www/nvu/Makefile b/www/nvu/Makefile index ef7ef71..fde708e 100644 --- a/www/nvu/Makefile +++ b/www/nvu/Makefile @@ -29,7 +29,7 @@ MAKEFILE= client.mk ALL_TARGET= build_all MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> .include "${PORTSDIR}/www/mozilla/Makefile.common" diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index 4d8946e..dfd833f 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -30,8 +30,8 @@ USE_JAVA= yes GNU_CONFIGURE= yes LIBTOOLFILES= configure mozilla-plugin/configure lib/gtkglext/configure CONFIGURE_ARGS= --enable-gecko-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}" \ + LDFLAGS="-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ LIBS="-lm" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/www/opera/Makefile b/www/opera/Makefile index 5f7c716..a456515 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -49,7 +49,7 @@ NO_BUILD= yes OPTIONS= ASPELL "Use the aspell library for spell checking" on \ SHARED "Use a shared Qt library (instead of static)" on -.if exists(${X11BASE}/lib/libqt-mt.prl) +.if exists(${LOCALBASE}/lib/libqt-mt.prl) QT_PRESENT= on .else QT_PRESENT= off @@ -106,7 +106,7 @@ PLIST_SUB+= KDE="@comment " post-patch: @${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g ; \ ${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \ ${WRKSRC}/config/opera6rc @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/install.sh diff --git a/www/opera/files/patch-ini_pluginpath.ini b/www/opera/files/patch-ini_pluginpath.ini index 2ed8b72..b7ae0e7 100644 --- a/www/opera/files/patch-ini_pluginpath.ini +++ b/www/opera/files/patch-ini_pluginpath.ini @@ -13,7 +13,7 @@ -/usr/X11R6/Acrobat7/Browser/intellinux=1 -/usr/local/Acrobat5/Browsers/intellinux=1 -/usr/local/Acrobat4/Browsers/intellinux=1 -+%%X11BASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux=1 ++%%LOCALBASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux=1 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 +%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1 diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile index 6f109ad..f05934d 100644 --- a/www/osb-nrcore/Makefile +++ b/www/osb-nrcore/Makefile @@ -7,10 +7,9 @@ PORTNAME= osb-nrcore PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtk-webcore +MASTER_SITES= SF/gtk-webcore MAINTAINER= ports@FreeBSD.org COMMENT= Gtk+ WebCore html rendering engine @@ -18,6 +17,7 @@ COMMENT= Gtk+ WebCore html rendering engine BUILD_DEPENDS= osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore RUN_DEPENDS= osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore +USE_XORG= x11 xt USE_GNOME= gnomehack gnometarget gtk20 USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/www/p5-Apache-Scoreboard/Makefile b/www/p5-Apache-Scoreboard/Makefile index 794bc34..0893ffa 100644 --- a/www/p5-Apache-Scoreboard/Makefile +++ b/www/p5-Apache-Scoreboard/Makefile @@ -23,6 +23,6 @@ PERL_CONFIGURE= YES MAN3= Apache::Scoreboard.3 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES .include <bsd.port.mk> diff --git a/www/p5-Apache2-Scoreboard/Makefile b/www/p5-Apache2-Scoreboard/Makefile index bc0656c..04baf98 100644 --- a/www/p5-Apache2-Scoreboard/Makefile +++ b/www/p5-Apache2-Scoreboard/Makefile @@ -22,7 +22,7 @@ PERL_CONFIGURE= 5.8.0+ MAN3= Apache::Scoreboard.3 Apache::DummyScoreboard.3 -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES post-patch: @${RM} -f ${WRKSRC}/lib/Apache/*.orig diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile index 2f4c5c7..8f376f0 100644 --- a/www/rssowl/Makefile +++ b/www/rssowl/Makefile @@ -7,10 +7,9 @@ PORTNAME= rssowl PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= rssowl +MASTER_SITES= SFE DISTNAME= rssowl_${PORTVERSION:S|.|_|g}_src MAINTAINER= m.sund@arcor.de @@ -19,7 +18,6 @@ COMMENT= Portable RSS, RDF, Atom Newsfeeds reader BUILD_DEPENDS= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt -USE_X_PREFIX= yes BUILD_WRKSRC= ${WRKSRC}/src ONLY_FOR_ARCHS= i386 amd64 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 8e8b036..28580d88 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -8,7 +8,7 @@ PORTNAME= seamonkey DISTVERSION= 1.1.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 8e8b036..28580d88 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -8,7 +8,7 @@ PORTNAME= seamonkey DISTVERSION= 1.1.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile index faf6de7..740920e 100644 --- a/www/sidplug/Makefile +++ b/www/sidplug/Makefile @@ -29,7 +29,7 @@ CFLAGS+= -fPIC do-install: @${MKDIR} ${PREFIX}/lib/browser_plugins @${INSTALL_PROGRAM} ${WRKSRC}/npsidplug.so ${PREFIX}/lib/browser_plugins - @${LN} -sf ${X11BASE}/bin/xsidplay ${PREFIX}/bin/sidplug + @${LN} -sf ${LOCALBASE}/bin/xsidplay ${PREFIX}/bin/sidplug .ifndef(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/Lazy_Fast.sid ${EXAMPLESDIR} diff --git a/www/ump/Makefile b/www/ump/Makefile index 33b4d63..bc43e566 100644 --- a/www/ump/Makefile +++ b/www/ump/Makefile @@ -76,7 +76,7 @@ post-extract: 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 @cd ${WRKSRC}; ${SETENV} CONFIG_HEADERS='' CONFIG_FILES=ump/Makefile ${SH} ./config.status diff --git a/www/websh/Makefile b/www/websh/Makefile index 81b5b59..123c724 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \ --with-tcl=${TCL_LIBDIR} USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_FILES= httpd.conf pkgIndex.tcl pkg-message SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION:R} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 4144c55..946282f 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -132,8 +132,7 @@ USE_XPI= ${WITH_XPI_APPS} USE_XPI= ${XPI_APPS_ALL_WC} .endif -XPI_APPS?= ${USE_XPI:S.^.${LOCALBASE}/lib/.:S.$./extensions.} \ - ${USE_XPI:S.^.${X11BASE}/lib/.:S.$./extensions.} +XPI_APPS?= ${USE_XPI:S.^.${LOCALBASE}/lib/.:S.$./extensions.} XPI_SLDIRS_ALL= ${XPI_APPS_ALL:S.^.${XPI_SLDIR}/.} XPI_SLDIRS= ${USE_XPI:S.^.${XPI_SLDIR}/.} XPI_LINKFARMS= ${XPI_APPS} ${XPI_SLDIRS} diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index c4d6c55..7b6d0d9 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -8,7 +8,7 @@ PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 10 +PORTREVISION?= 11 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ diff --git a/x11-clocks/abclock/files/patch-Makefile b/x11-clocks/abclock/files/patch-Makefile index 7d51d48..00c7f75 100644 --- a/x11-clocks/abclock/files/patch-Makefile +++ b/x11-clocks/abclock/files/patch-Makefile @@ -12,14 +12,14 @@ -XLIBDIR = -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/X11R5/lib -L/usr/X11R4/lib \ - -L/usr/lib/X11 -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/X11R4 -+XLIBDIR = -L$(X11BASE)/lib ++XLIBDIR = -L$(LOCALBASE)/lib -XINCLUDEDIR = -I/usr/X11/include -I/usr/X11R6/include -I/usr/X11R5/include -I/usr/X11R4/include \ - -I/usr/include/X11 -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/X11R4 \ - -I/usr/local/X11/include -I/usr/local/X11R6/include -I/usr/local/X11R5/include -I/usr/local/X11R4/include \ - -I/usr/local/include/X11 -I/usr/local/include/X11R6 -I/usr/local/include/X11R5 -I/usr/local/include/X11R4 \ - -I/usr/X386/include -I/usr/x386/include -I/usr/XFree86/include/X11 -I/usr/local/x11r5/include -+XINCLUDEDIR = -I$(X11BASE)/include ++XINCLUDEDIR = -I$(LOCALBASE)/include all: abclock abc_img diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile index 595044c..0d2d0a2 100644 --- a/x11-clocks/alltraxclock/Makefile +++ b/x11-clocks/alltraxclock/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}2_0.2-1 MAINTAINER= novel@FreeBSD.org COMMENT= An analog clock plugin for gkrellm2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 ALL_TARGET= alltraxclock.so diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile index c1334f9..4e29cb0 100644 --- a/x11-clocks/asclock-gtk/Makefile +++ b/x11-clocks/asclock-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= asclock-gtk PORTVERSION= 2.1.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-clocks afterstep windowmaker MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -19,6 +19,7 @@ COMMENT= New flavor of asclock (GTK version) WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= asclock +USE_XORG= x11 xt USE_GNOME= gtk12 HAS_CONFIGURE= yes diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile index 6f6ec27..d2bf127 100644 --- a/x11-clocks/asclock-xlib/Makefile +++ b/x11-clocks/asclock-xlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= asclock-xlib PORTVERSION= 2.0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-clocks afterstep windowmaker MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -16,12 +16,12 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= New flavor of asclock WRKSRC= ${WRKDIR}/asclock-xlib -USE_XPM= YES +USE_XORG= xpm .if defined(BATCH) USE_IMAKE= YES .else -USE_X_PREFIX= YES +USE_XORG= x11 HAS_CONFIGURE= YES .endif diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile index 9a056f4..33c9710 100644 --- a/x11-clocks/astime/Makefile +++ b/x11-clocks/astime/Makefile @@ -17,7 +17,7 @@ COMMENT= Time/Date applet for WindowMaker USE_XORG= xpm GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xpm-library="${X11BASE}/lib" --with-xpm-includes="${X11BASE}/include/X11" +CONFIGURE_ARGS+=--with-xpm-library="${LOCALBASE}/lib" --with-xpm-includes="${LOCALBASE}/include/X11" INSTALL_TARGET= install install.man MAN1= astime.1 diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile index 62a9e4e..f7755eb 100644 --- a/x11-clocks/astzclock/Makefile +++ b/x11-clocks/astzclock/Makefile @@ -15,7 +15,7 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= Afterstep clock with some timezone extensions USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= astzclock.1 PLIST_FILES= bin/astzclock diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile index c2edb02..3d80109 100644 --- a/x11-clocks/bmp-alarm/Makefile +++ b/x11-clocks/bmp-alarm/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes PLIST_FILES= lib/bmp/General/libalarm.so -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/bmp/General +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/General do-install: ${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/bmp/General diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile index af585fe..e735873 100644 --- a/x11-clocks/emiclock/Makefile +++ b/x11-clocks/emiclock/Makefile @@ -18,9 +18,9 @@ USE_IMAKE= yes MAN1= emiclock.1 LANGRES= resources/R6/EUC/EmiClock.ad -LANGDIR= ${X11BASE}/lib/X11/ja_JP.eucJP/app-defaults -LANGDIR2= ${X11BASE}/lib/X11/ja_JP.EUC/app-defaults -EMICLOCKDIR= ${X11BASE}/lib/X11/EmiClock +LANGDIR= ${LOCALBASE}/lib/X11/ja_JP.eucJP/app-defaults +LANGDIR2= ${LOCALBASE}/lib/X11/ja_JP.EUC/app-defaults +EMICLOCKDIR= ${LOCALBASE}/lib/X11/EmiClock PORTDOCS= COPYRIGHT COPYRIGHT.en .include <bsd.port.pre.mk> diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile index 8761fda..72a149c 100644 --- a/x11-clocks/gdesklets-clock/Makefile +++ b/x11-clocks/gdesklets-clock/Makefile @@ -7,7 +7,7 @@ PORTNAME= clock PORTVERSION= 0.32 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-clocks gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -20,7 +20,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets USE_BZIP2= yes USE_PYTHON= yes -USE_XLIB= yes +USE_XORG= x11 NAME= Clock DATADIR= ${PREFIX}/share diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile index 8e03239..664800e 100644 --- a/x11-clocks/gdesklets-countdown/Makefile +++ b/x11-clocks/gdesklets-countdown/Makefile @@ -7,7 +7,7 @@ PORTNAME= countdown PORTVERSION= 0.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-clocks gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +19,7 @@ COMMENT= Countdown the remaining time until a configurable date RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 USE_PYTHON= yes NAME= Countdown diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile index ec65f90..9ec3a4c 100644 --- a/x11-clocks/gdesklets-ebichuclock/Makefile +++ b/x11-clocks/gdesklets-ebichuclock/Makefile @@ -7,7 +7,7 @@ PORTNAME= ebichuclock PORTVERSION= 0.1.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-clocks gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +19,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \ ${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 NAME= ebichuclock DATADIR= ${PREFIX}/share diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile index 7a7a4da..7b9be96 100644 --- a/x11-clocks/glclock/Makefile +++ b/x11-clocks/glclock/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut USE_GL= yes MAKEFILE= makefile MAKE_ARGS= CC="${CXX}" LN="${CXX}" OPT="${OPT}" \ - INCLUDE_PATH="-I${X11BASE}/include" \ - LIB_PATH="-L${X11BASE}/lib" + INCLUDE_PATH="-I${LOCALBASE}/include" \ + LIB_PATH="-L${LOCALBASE}/lib" OPT= -DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \ ${CFLAGS} diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile index a546d77..f43aa1f 100644 --- a/x11-clocks/mlclock/Makefile +++ b/x11-clocks/mlclock/Makefile @@ -21,9 +21,9 @@ PLIST_FILES= bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji PLIST_DIRS= %%DATADIR%% do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include \ + cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include \ -DRCFILE=\".mlclockrc\" mlclock.c -o mlclock \ - -L${X11BASE}/lib -lX11 + -L${LOCALBASE}/lib -lX11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mlclock ${PREFIX}/bin diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile index f7f4055..d1fc0b3 100644 --- a/x11-clocks/osdclock/Makefile +++ b/x11-clocks/osdclock/Makefile @@ -20,8 +20,8 @@ COMMENT= Small clock which uses libxosd to render text to the root window LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd USE_GCC= 3.4 -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib ${PTHREAD_LIBS}" \ +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PREFIX="${PREFIX}" PLIST_FILES= bin/osd_clock diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile index f21e3a3..2d29e29 100644 --- a/x11-clocks/pclock/Makefile +++ b/x11-clocks/pclock/Makefile @@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig/src USE_XORG= x11 xau xdmcp xext xpm MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \ - INCDIR="-I. -I${X11BASE}/include ${CPPFLAGS}" \ - LIBDIR="-L${X11BASE}/lib ${LDFLAGS}" + INCDIR="-I. -I${LOCALBASE}/include ${CPPFLAGS}" \ + LIBDIR="-L${LOCALBASE}/lib ${LDFLAGS}" post-extract: cd ${WRKSRC} && ${RM} -f getopt* diff --git a/x11-clocks/washerdryer/files/patch-Makefile b/x11-clocks/washerdryer/files/patch-Makefile index 0acc494..dfee17e 100644 --- a/x11-clocks/washerdryer/files/patch-Makefile +++ b/x11-clocks/washerdryer/files/patch-Makefile @@ -4,7 +4,7 @@ -LIBDIR = -L/usr/X11R6/lib -L/usr/lib -L/opt/gnome/lib -LIBS = -lXpm -lXext -lX11 -lm -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -CFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -I/opt/gnome/include/gtk-1.2 -I/opt/gnome/include/glib-1.2 -I/opt/gnome/lib/glib/include -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib +LIBS = `${GTK_CONFIG} --libs` -lXpm +CFLAGS += `${GTK_CONFIG} --cflags` OBJS = washerDryer.o \ diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile index a3fec72..e67cf4f 100644 --- a/x11-clocks/wmbday/Makefile +++ b/x11-clocks/wmbday/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://buzzinhornetz.ath.cx/wmbday/files/ MAINTAINER= uspoerlein@gmail.com COMMENT= Window Maker dock app that will remind you of birthdays -BUILD_DEPENDS= ${X11BASE}/bin/xmessage:${X_CLIENTS_PORT} +BUILD_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage HAS_CONFIGURE= yes MAKEFILE= BSDmakefile diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile index 5421031..4d1a38d 100644 --- a/x11-clocks/wmbinclock/Makefile +++ b/x11-clocks/wmbinclock/Makefile @@ -21,7 +21,7 @@ USE_XORG= xpm post-patch: @${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c @${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmBinClock ${PREFIX}/bin diff --git a/x11-clocks/wmblueclock/files/patch-Makefile b/x11-clocks/wmblueclock/files/patch-Makefile index a15735e..001c63a 100644 --- a/x11-clocks/wmblueclock/files/patch-Makefile +++ b/x11-clocks/wmblueclock/files/patch-Makefile @@ -10,8 +10,8 @@ -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +CC ?= cc -+LDIR = -L${X11BASE}/lib -+IDIR = -I${X11BASE}/include ++LDIR = -L${LOCALBASE}/lib ++IDIR = -I${LOCALBASE}/include -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/x11-clocks/wmcalclock/files/patch-aa b/x11-clocks/wmcalclock/files/patch-aa index a028f58..da2526f 100644 --- a/x11-clocks/wmcalclock/files/patch-aa +++ b/x11-clocks/wmcalclock/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile index 33ffbfe..67287e5 100644 --- a/x11-clocks/wmclock/Makefile +++ b/x11-clocks/wmclock/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dockable clock applet for Window Maker USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= wmclock.1 PLIST_FILES= bin/wmclock diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile index 28d37cb..a4265ac 100644 --- a/x11-clocks/wmdate/Makefile +++ b/x11-clocks/wmdate/Makefile @@ -17,7 +17,7 @@ COMMENT= Date app for the WindowMaker dock LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm PLIST_FILES= bin/wmdate diff --git a/x11-clocks/wmitime/files/patch-aa b/x11-clocks/wmitime/files/patch-aa index 7a8b2d6..ed9398b 100644 --- a/x11-clocks/wmitime/files/patch-aa +++ b/x11-clocks/wmitime/files/patch-aa @@ -5,9 +5,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR = ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -lm -FLAGS = -O2 OBJS = wmitime.o \ diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile index dbe703c..f1c648b 100644 --- a/x11-clocks/wmtime/Makefile +++ b/x11-clocks/wmtime/Makefile @@ -19,7 +19,7 @@ COMMENT= Time/Date applet for WindowMaker PLIST_FILES= bin/wmtime WRKSRC= ${WRKDIR}/wmtime.app/wmtime USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm post-extract: ${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile diff --git a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile index af58c5b..1da0510 100644 --- a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile +++ b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile @@ -5,7 +5,7 @@ -LIBDIR = -L/usr/X11R6/lib -L/usr/lib -LIBS = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0` -CFLAGS = `pkg-config --cflags gtk+-2.0` -+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 `pkg-config --libs gtk+-2.0` ${PTHREAD_LIBS} +CFLAGS += `pkg-config --cflags gtk+-2.0` ${PTHREAD_CFLAGS} diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile index 527cb79..bb14c6d 100644 --- a/x11-clocks/wmtz/Makefile +++ b/x11-clocks/wmtz/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmtz PORTVERSION= 0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-clocks windowmaker afterstep MASTER_SITES= http://www.geocities.com/jl1n/wmtz/ @@ -15,17 +15,16 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Dockapp that displays the time in different time zones USE_GMAKE= yes -MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -I${X11BASE}/include" \ - LIBDIR="-L${X11BASE}/lib" +MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBDIR="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/wmtz -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm x11 MAN1= wmtz.1 PLIST_FILES= bin/wmtz \ etc/wmtzrc.default do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${X11BASE}/bin/wmtz + @${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${PREFIX}/bin/wmtz @${INSTALL_MAN} ${WRKSRC}/wmtz.1 ${PREFIX}/man/man1/ @${ECHO} "===> Installing wmtzrc.default in ${PREFIX}/etc." @${ECHO} "===> Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it." diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile index 8741ae9..9e90569 100644 --- a/x11-clocks/xmms-alarm/Makefile +++ b/x11-clocks/xmms-alarm/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= lib/xmms/General/libalarm.so post-patch: @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/General +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/General do-install: ${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/xmms/General diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile index 6289d68..04957d0f 100644 --- a/x11-clocks/xtu/Makefile +++ b/x11-clocks/xtu/Makefile @@ -27,7 +27,7 @@ USE_GNOME= imlib CPPFLAGS= -DUSE_IMLIB `${IMLIB_CONFIG} --cflags` LDFLAGS= `${IMLIB_CONFIG} --libs` .else -USE_XPM= yes +USE_XORG= x11 xpm xext CPPFLAGS= -DUSE_XPM LDFLAGS= -lXpm -lX11 -lXext .endif diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile index 346439f..b78925f 100644 --- a/x11-drivers/synaptics/Makefile +++ b/x11-drivers/synaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= synaptics PORTVERSION= 0.14.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ @@ -17,12 +17,9 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= nork@FreeBSD.org COMMENT= The Synaptics touchpad X driver -BUILD_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT} -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_XORG= xorg-server xi xproto USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> @@ -54,7 +51,7 @@ post-extract: .endfor pre-install: - ${MKDIR} ${X11BASE}/lib/xorg/modules/input/ + ${MKDIR} ${LOCALBASE}/lib/xorg/modules/input/ post-install: .if !defined(NOPORTDOCS) diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile index f57b5db..58bc8c59 100644 --- a/x11-drivers/synaptics/files/patch-Makefile +++ b/x11-drivers/synaptics/files/patch-Makefile @@ -23,7 +23,7 @@ -I$(SDKDIR) else - INSTALLED_X = /usr/X11R6 -+ INSTALLED_X = ${X11BASE} ++ INSTALLED_X = ${LOCALBASE} INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input SYNAPTICS_DRV = synaptics_drv.o LDCOMBINEFLAGS = -r @@ -31,8 +31,8 @@ else SERVERSRC = $(TOP)/programs/Xserver ALLINCLUDES = -I. \ -+ -I${X11BASE}/include \ -+ -I${X11BASE}/include/X11 \ ++ -I${LOCALBASE}/include \ ++ -I${LOCALBASE}/include/X11 \ + -I$(SERVERSRC)/hw/xfree86 \ -I$(SERVERSRC)/hw/xfree86/common \ -I$(SERVERSRC)/hw/xfree86/os-support \ @@ -41,7 +41,7 @@ -I$(SERVERSRC)/include \ -I$(TOP)/include - X_INCLUDES_ROOT = $(TOP) -+ X_INCLUDES_ROOT = $(X11BASE) ++ X_INCLUDES_ROOT = $(LOCALBASE) endif endif diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile index e32c65c..ce2b700 100644 --- a/x11-fm/evidence/Makefile +++ b/x11-fm/evidence/Makefile @@ -9,8 +9,7 @@ PORTNAME= evidence PORTVERSION= 0.9.8 PORTREVISION= 9 CATEGORIES= x11-fm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= freebsd@troback.com COMMENT= Enlightened file-manager @@ -40,8 +39,8 @@ CONFIGURE_ARGS= --disable-dbus \ --disable-thumbnailer-avi \ --disable-thumbnailer-mpeg3 \ --enable-plugin-ttf -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa index 7f0f349..80b9cd8 100644 --- a/x11-fm/ezfm/files/patch-aa +++ b/x11-fm/ezfm/files/patch-aa @@ -18,14 +18,14 @@ # -CC= gcc -g -DLINUX -I../include +CC?= gcc -g -DLINUX -I../include -+CFLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include ++CFLAGS+= -I$(LOCALBASE)/include # #---------------------------------------------------------------------------------- -LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext -ljpeg -ltiff -lpng -lz -lm -lc -STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext -lm -lc -+LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext -ljpeg -ltiff -lpng -lz -lm -lc -+STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${X11BASE}/lib -lX11 -lXext -lm -lc ++LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -lX11 -lXext -ljpeg -ltiff -lpng -lz -lm -lc ++STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${LOCALBASE}/lib -lX11 -lXext -lm -lc SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \ signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\ diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile index b331509..08bdfc5 100644 --- a/x11-fm/filerunner/Makefile +++ b/x11-fm/filerunner/Makefile @@ -19,7 +19,7 @@ COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 MAKEFILE= Makefile.freebsd_gcc -MAKE_ENV+= X11BASE=${X11BASE} +MAKE_ENV+= LOCALBASE=${LOCALBASE} pre-build: # @ ${RM} ${WRKSRC}/ext.so diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa index c99e323..f83d3e2 100644 --- a/x11-fm/filerunner/files/patch-aa +++ b/x11-fm/filerunner/files/patch-aa @@ -8,7 +8,7 @@ -X11INC = /usr/X11/include +TCLINC = ${PREFIX}/include/tcl8.4 +TKINC = ${PREFIX}/include/tk8.4 -+X11INC = ${X11BASE}/include ++X11INC = ${LOCALBASE}/include -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC) +CFLAGS += -Wall -fPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC) diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile index 6dfecb2..7402bde 100644 --- a/x11-fm/fsv/Makefile +++ b/x11-fm/fsv/Makefile @@ -7,10 +7,9 @@ PORTNAME= fsv PORTVERSION= 0.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= lx@redundancy.redundancy.org COMMENT= 3D filesystem visualizer @@ -18,10 +17,10 @@ COMMENT= 3D filesystem visualizer LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_GETTEXT= yes -USE_GL= yes +USE_GL= gl USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib +CONFIGURE_ARGS= --with-GL-prefix=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile index 348ccc0..2f9f39a 100644 --- a/x11-fm/gnome-commander2/Makefile +++ b/x11-fm/gnome-commander2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-commander PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-commander/1.2 @@ -24,13 +24,11 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ CONFLICTS= gnome-commander-* USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui -USE_GCC= 3.4+ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_OMF= yes MAN1= gnome-commander.1 diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 1018dbc..9a64bf7 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -8,7 +8,7 @@ PORTNAME= nautilus PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +22,6 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \ librsvg2 desktopfileutils ltverhack gvfs ltasneededhack GNOME_DESKTOP_VERSION=2 diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile index f5d3837..e1011d5 100644 --- a/x11-fm/rox-filer/Makefile +++ b/x11-fm/rox-filer/Makefile @@ -6,10 +6,9 @@ PORTNAME= rox-filer PORTVERSION= 2.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= rox +MASTER_SITES= SF/rox DISTNAME= rox-filer-${PORTVERSION} MAINTAINER= olgeni@FreeBSD.org @@ -22,6 +21,7 @@ PLIST_SUB+= LOCALBASE=${LOCALBASE} USE_AUTOTOOLS= autoconf:213 USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= x11 USE_GNOME= pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango libglade2 HAS_CONFIGURE= yes diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile index e14466e..fa06145 100644 --- a/x11-fm/tdfsb/Makefile +++ b/x11-fm/tdfsb/Makefile @@ -45,7 +45,7 @@ post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \ s|gcc|${CC}| ; s| -lm|| ; \ s|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|-O2|${CFLAGS}|g' \ ${WRKSRC}/${COMPILE_SCRIPT} diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile index 53150cf..0b643f8 100644 --- a/x11-fm/x-files/Makefile +++ b/x11-fm/x-files/Makefile @@ -7,7 +7,7 @@ PORTNAME= x-files PORTVERSION= 2.00b1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm tk MASTER_SITES= http://users.tkk.fi/~mkivinie/X-Files/data/ DISTNAME= X-Files-${PORTVERSION} @@ -20,13 +20,12 @@ RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 WRKSRC= ${WRKDIR}/X-Files NO_BUILD= yes -USE_X_PREFIX= yes MAN1= X-Files.1x pre-install: @tclsh8.3 ${SCRIPTDIR}/mktclIndex ${WRKSRC} @${RM} -f ${WRKSRC}/xfinstall.tcl - @${SED} s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile + @${SED} s#@PREFIX@#${PREFIX}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile @${MV} ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl do-install: @@ -36,8 +35,8 @@ do-install: .endfor @${CHMOD} 0555 ${PREFIX}/lib/X11/X-Files/X-Files.tcl @${LN} -s ${PREFIX}/lib/X11/X-Files/X-Files.tcl ${PREFIX}/bin/X-Files - @${MKDIR} ${X11BASE}/include/X11/pixmaps - @${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps - @${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1 + @${MKDIR} ${PREFIX}/include/X11/pixmaps + @${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${PREFIX}/include/X11/pixmaps + @${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/x11-fm/x-files/files/patch-aa b/x11-fm/x-files/files/patch-aa index f14dfbc..a5158c7 100644 --- a/x11-fm/x-files/files/patch-aa +++ b/x11-fm/x-files/files/patch-aa @@ -5,7 +5,7 @@ +# The main file for the X-Files +# The next line is executed by /bin/sh, but not Tcl \ +exec wish8.3 $0 ${1+"$@"} -+set xf(xf_home) "@X11BASE@/lib/X11/X-Files/" ++set xf(xf_home) "@PREFIX@/lib/X11/X-Files/" proc MAIN {argc argv} { global xf xf_image env menu tk_version diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile index 8127dea..a32ca86 100644 --- a/x11-fm/xdiskusage/Makefile +++ b/x11-fm/xdiskusage/Makefile @@ -34,10 +34,10 @@ BROKEN= Does not compile do-build: .for i in panels xdiskusage - ${CXX} ${CXXFLAGS} -I${X11BASE}/include -c \ + ${CXX} ${CXXFLAGS} -I${LOCALBASE}/include -c \ ${WRKSRC}/${i}.C -o ${WRKSRC}/${i}.o .endfor - ${CXX} ${CXXFLAGS} -L${X11BASE}/lib -o \ + ${CXX} ${CXXFLAGS} -L${LOCALBASE}/lib -o \ ${WRKSRC}/xdiskusage ${WRKSRC}/panels.o \ ${WRKSRC}/xdiskusage.o -lfltk -lm -lXext -lX11 ${LDFLAGS} diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile index 03b2c65..2a75e10 100644 --- a/x11-fm/xfm/Makefile +++ b/x11-fm/xfm/Makefile @@ -17,7 +17,7 @@ COMMENT= The X File Manager LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xfm.1 xfmtype.1 .include <bsd.port.mk> diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile index fea15a4..5aaa11d 100644 --- a/x11-fm/xnc/Makefile +++ b/x11-fm/xnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= xnc PORTVERSION= 5.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm MASTER_SITES= http://www.xnc.dubna.su/src-5/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -28,8 +28,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GETTEXT= yes -USE_XLIB= yes GNU_CONFIGURE= yes +USE_XORG= x11 xext xt CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11-fm/xplore/Makefile b/x11-fm/xplore/Makefile index da23d26..a5f365e 100644 --- a/x11-fm/xplore/Makefile +++ b/x11-fm/xplore/Makefile @@ -16,7 +16,7 @@ COMMENT= Yet another Motif file manager USE_IMAKE= yes USE_MOTIF= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xplore.1 xploretype.1 diff --git a/x11-fonts/arkpandora/Makefile b/x11-fonts/arkpandora/Makefile index 535510ca..b53b317 100644 --- a/x11-fonts/arkpandora/Makefile +++ b/x11-fonts/arkpandora/Makefile @@ -7,7 +7,7 @@ PORTNAME= arkpandora PORTVERSION= 2.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.users.bigpond.net.au/gavindi/ DISTNAME= ttf-${PORTNAME}-${PORTVERSION} @@ -20,7 +20,7 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig \ ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" @@ -33,7 +33,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -TTMKFDIR_CMD?= ${X11BASE}/bin/ttmkfdir +TTMKFDIR_CMD?= ${LOCALBASE}/bin/ttmkfdir .SILENT: @@ -75,7 +75,7 @@ install-conf: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/arkpandora/pkg-plist b/x11-fonts/arkpandora/pkg-plist index 4bf5849..6f92b28 100644 --- a/x11-fonts/arkpandora/pkg-plist +++ b/x11-fonts/arkpandora/pkg-plist @@ -20,4 +20,4 @@ etc/fonts/local.conf.arkpandora @unexec /bin/rm %D/%%FONTSDIR%%/fonts.scale @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 diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile index 6ba14bf..21431ac 100644 --- a/x11-fonts/artwiz-aleczapka-de/Makefile +++ b/x11-fonts/artwiz-aleczapka-de/Makefile @@ -8,7 +8,7 @@ PORTNAME= artwiz-aleczapka-de PORTVERSION= 1.3 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= artwizaleczapka MAINTAINER= herbert.skuhra@gmx.at @@ -21,7 +21,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia.de aqui.de cure.de drift.de edges.de fkp.de gelly.de \ glisp-bold.de glisp.de kates.de lime.de mints-mild.de \ mints-strong.de nu.de smoothansi.de snap.de -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \ ${WRKSRC}/fonts.dir @@ -32,7 +32,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka-de/pkg-message b/x11-fonts/artwiz-aleczapka-de/pkg-message index 0831ae0..11bfafe 100644 --- a/x11-fonts/artwiz-aleczapka-de/pkg-message +++ b/x11-fonts/artwiz-aleczapka-de/pkg-message @@ -6,11 +6,11 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de" Additionally you have to do: - # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de + # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de # fc-cache -v . ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile index 442a4d5..cdec317 100644 --- a/x11-fonts/artwiz-aleczapka-se/Makefile +++ b/x11-fonts/artwiz-aleczapka-se/Makefile @@ -8,7 +8,7 @@ PORTNAME= artwiz-aleczapka-se PORTVERSION= 1.3 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= artwizaleczapka MAINTAINER= herbert.skuhra@gmx.at @@ -21,7 +21,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \ glisp-bold.se glisp.se kates.se lime.se mints-mild.se \ mints-strong.se nu.se smoothansi.se snap.se -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias ${WRKSRC}/fonts.dir .include <bsd.port.pre.mk> @@ -31,7 +31,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-message b/x11-fonts/artwiz-aleczapka-se/pkg-message index a870950..c4cd0b8 100644 --- a/x11-fonts/artwiz-aleczapka-se/pkg-message +++ b/x11-fonts/artwiz-aleczapka-se/pkg-message @@ -6,11 +6,11 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se" Additionally you have to do: - # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se + # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se # fc-cache -v . ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile index 1bf4f13..e66bf65 100644 --- a/x11-fonts/artwiz-aleczapka/Makefile +++ b/x11-fonts/artwiz-aleczapka/Makefile @@ -22,7 +22,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia aqui cure cursor drift edges fkp gelly \ glisp-bold glisp kates lime mints-mild mints-strong \ nu smoothansi snap -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \ ${WRKSRC}/fonts.cache-1 ${WRKSRC}/fonts.dir @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka/pkg-message b/x11-fonts/artwiz-aleczapka/pkg-message index 6ce65b0..4154e64 100644 --- a/x11-fonts/artwiz-aleczapka/pkg-message +++ b/x11-fonts/artwiz-aleczapka/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-en" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-en" ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile index 92bf0d3..908ae2a 100644 --- a/x11-fonts/artwiz-fonts/Makefile +++ b/x11-fonts/artwiz-fonts/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/fluxbox-${PORTNAME} FONTS= anorexia aqui cure cursor drift edges gelly glisp-bold \ glisp lime mints-mild mints-strong nu snap -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir .include <bsd.port.pre.mk> @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-fonts/pkg-message b/x11-fonts/artwiz-fonts/pkg-message index da47a74..e9a2451 100644 --- a/x11-fonts/artwiz-fonts/pkg-message +++ b/x11-fonts/artwiz-fonts/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-fonts" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-fonts" ------------------------------------------------------------------ diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile index c94d55d..76673b2 100644 --- a/x11-fonts/avifonts/Makefile +++ b/x11-fonts/avifonts/Makefile @@ -33,7 +33,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/avifonts/files/pkg-message.in b/x11-fonts/avifonts/files/pkg-message.in index fa36fd0..53eac50 100644 --- a/x11-fonts/avifonts/files/pkg-message.in +++ b/x11-fonts/avifonts/files/pkg-message.in @@ -9,6 +9,6 @@ Add the following line to the "Files" section of your X configuration file: FontPath "%%FONTSDIR%%/" -Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config -if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf +Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/XF86Config +if you are using XFree86, and %%LOCALBASE%%/etc/X11/xorg.conf if you are using X.Org. diff --git a/x11-fonts/avifonts/pkg-plist b/x11-fonts/avifonts/pkg-plist index 0bdc84f..e618978 100644 --- a/x11-fonts/avifonts/pkg-plist +++ b/x11-fonts/avifonts/pkg-plist @@ -17,4 +17,4 @@ %%FONTSDIR%%/fonts.dir @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile index 342ba05..1a16d07 100644 --- a/x11-fonts/bitmap-fonts/Makefile +++ b/x11-fonts/bitmap-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= bitmap-fonts PORTVERSION= ${BITMAP_FONTS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts elisp MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \ ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/ @@ -16,7 +16,9 @@ DISTNAME= ${PORTNAME}-${BITMAP_FONTS_VER} MAINTAINER= conrads@cox.net COMMENT= Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale # distfile version BITMAP_FONTS_VER= 1.0 @@ -26,7 +28,6 @@ PKGINSTALL= ${WRKDIR}/INSTALL PKGDEINSTALL= ${WRKDIR}/DEINSTALL NO_WRKSUBDIR= yes -USE_X_PREFIX= yes PLIST_SUB= FONTSDIR=${FONTSDIR} @@ -43,18 +44,18 @@ do-build: done pre-install: - @${SETENV} PKG_PREFIX=${X11BASE} \ + @${SETENV} PKG_PREFIX=${LOCALBASE} \ ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @(cd ${WRKSRC}; \ for i in ${BITMAP_FONTS_SIZE} ; do \ - ${INSTALL_DATA} bitmap$${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \ + ${INSTALL_DATA} bitmap$${i}.pcf.gz ${LOCALBASE}/${FONTSDIR} ; \ done ; \ ) post-install: - @${SETENV} PKG_PREFIX=${X11BASE} \ + @${SETENV} PKG_PREFIX=${LOCALBASE} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/x11-fonts/bitmap-fonts/pkg-descr b/x11-fonts/bitmap-fonts/pkg-descr index a539230..b66d442 100644 --- a/x11-fonts/bitmap-fonts/pkg-descr +++ b/x11-fonts/bitmap-fonts/pkg-descr @@ -3,6 +3,6 @@ Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font. Bitmap font is used on Mule with bitmap-mule or Emacs20 with bitmap-emacs20. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ --- Porting by shige <shige@FreeBSD.org> diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile index 559ff0d..68dcfea 100644 --- a/x11-fonts/bitstream-vera/Makefile +++ b/x11-fonts/bitstream-vera/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes -PREFIX?= ${X11BASE} NO_BUILD= yes MTREE_FILE= /etc/mtree/BSD.x11-4.dist @@ -67,7 +66,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist index 2298a6b..c46c0ce 100644 --- a/x11-fonts/bitstream-vera/pkg-plist +++ b/x11-fonts/bitstream-vera/pkg-plist @@ -15,4 +15,4 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% @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 diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile index 6a1161b..ab137e5 100644 --- a/x11-fonts/code2000/Makefile +++ b/x11-fonts/code2000/Makefile @@ -7,6 +7,7 @@ PORTNAME= code2000 PORTVERSION= 1.17 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://code2000.net/ DISTFILES= ${PORTNAME:U}${EXTRACT_SUFX:U} @@ -21,7 +22,6 @@ BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ RESTRICTED= Only unmodified original package can be distributed -USE_X_PREFIX= yes USE_ZIP= yes PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" @@ -33,9 +33,9 @@ SUB_LIST= FONTSDIR=${FONTSDIR} FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir -FCCACHE_CMD= ${X11BASE}/bin/fc-cache -f -v +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir +FCCACHE_CMD= ${LOCALBASE}/bin/fc-cache -f -v post-extract: move-fonts rename-license diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile index bdf91cd..e5eda17 100644 --- a/x11-fonts/cyr-rfx/Makefile +++ b/x11-fonts/cyr-rfx/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyr-rfx-${CYR_RFX_ENCODING} PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts ukrainian russian MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \ ftp://ftp.inp.nsk.su/%SUBDIR%/ @@ -17,10 +17,11 @@ EXTRACT_SUFX= .bdfs.tgz MAINTAINER= mi@aldan.algebra.com COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} \ - mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 # See WWW for other available encodings CYR_RFX_ENCODING?= koi8-o @@ -30,11 +31,11 @@ NCPUS!= /sbin/sysctl -n hw.ncpu 2> /dev/null || echo 1 MAKE_ARGS+= -j ${NCPUS} MAKEFILE= ${FILESDIR}/Makefile.bdf2pcf INST_DIR= "lib/X11/fonts/${PORTNAME}" -MAKE_ENV+= INST_DIR="${X11BASE}/${INST_DIR}" MKDIR="${MKDIR}" +MAKE_ENV+= INST_DIR="${LOCALBASE}/${INST_DIR}" MKDIR="${MKDIR}" PLIST_SUB+= INST_DIR="${INST_DIR}" post-install: - @${SED} -e 's,/usr/X11R6,${X11BASE},g' -e \ + @${SED} -e 's,/usr/X11R6,${LOCALBASE},g' -e \ 's,koi8-o,${CYR_RFX_ENCODING},g' < ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile index e31a0f9..fbe367a 100644 --- a/x11-fonts/dejavu/Makefile +++ b/x11-fonts/dejavu/Makefile @@ -8,9 +8,9 @@ PORTNAME= dejavu DISTVERSION= 2.24 +PORTREVISION= 1 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-fonts-ttf-${DISTVERSION} MAINTAINER= ahze@FreeBSD.org @@ -19,7 +19,7 @@ COMMENT= Bitstream Vera Fonts clone with a wider range of characters RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes PORTDOCS= README status.txt unicover.txt langcover.txt PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/" @@ -43,7 +43,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} ${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index e386b6f..a179da7 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= etlfonts-noncjk PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= # disappeared DISTNAME= non-cjk @@ -16,13 +16,14 @@ EXTRACT_SUFX= .tar MAINTAINER= mita@jp.FreeBSD.org COMMENT= X11 supplemental fonts -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty -USE_X_PREFIX= yes +USE_XORG= x11 post-extract: @${GUNZIP_CMD} ${WRKSRC}/*.gz diff --git a/x11-fonts/etlfonts/files/patch-aa b/x11-fonts/etlfonts/files/patch-aa index e672954..5677bfa 100644 --- a/x11-fonts/etlfonts/files/patch-aa +++ b/x11-fonts/etlfonts/files/patch-aa @@ -11,13 +11,13 @@ + + install: .pcf_done + ( \ -+ if [ ! -d ${X11BASE}/lib/X11/fonts/non-cjk ] ; \ -+ then mkdir -p ${X11BASE}/lib/X11/fonts/non-cjk ; \ ++ if [ ! -d ${LOCALBASE}/lib/X11/fonts/non-cjk ] ; \ ++ then mkdir -p ${LOCALBASE}/lib/X11/fonts/non-cjk ; \ + fi ; \ + ) -+ cp *pcf* fonts.alias ${X11BASE}/lib/X11/fonts/non-cjk ++ cp *pcf* fonts.alias ${LOCALBASE}/lib/X11/fonts/non-cjk + ( \ -+ cd ${X11BASE}/lib/X11/fonts/non-cjk ; \ ++ cd ${LOCALBASE}/lib/X11/fonts/non-cjk ; \ + mkfontdir ; \ + ) + diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 124d264..70da310 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -22,14 +22,13 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes -PREFIX?= ${X11BASE} USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget pkgconfig ltverhack CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ - --with-default-fonts=${X11BASE}/lib/X11/fonts \ + --with-default-fonts=${LOCALBASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ --without-add-fonts \ --disable-docs @@ -65,7 +64,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ fi @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ - s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ + s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} .if !defined(PACKAGE_BUILDING) @${LDCONFIG} -m ${PREFIX}/lib diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile index 9a5c909..d875574 100644 --- a/x11-fonts/fonts-indic/Makefile +++ b/x11-fonts/fonts-indic/Makefile @@ -29,6 +29,6 @@ do-install: post-install: @${ECHO_MSG} "==> Running fc-cache" - @${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + @${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/fonts-te/Makefile b/x11-fonts/fonts-te/Makefile index da809e8..46d70f2 100644 --- a/x11-fonts/fonts-te/Makefile +++ b/x11-fonts/fonts-te/Makefile @@ -36,7 +36,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} ${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/fonts-te/pkg-plist b/x11-fonts/fonts-te/pkg-plist index 9984113..bad2de3 100644 --- a/x11-fonts/fonts-te/pkg-plist +++ b/x11-fonts/fonts-te/pkg-plist @@ -2,4 +2,4 @@ %%FONTSDIR%%/vemana.ttf @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile index 0932b80..66de0bd 100644 --- a/x11-fonts/geminifonts/Makefile +++ b/x11-fonts/geminifonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= gemini PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= http://www.brama.com/compute/unix/ PKGNAMEPREFIX= koi8-u- @@ -18,17 +18,19 @@ EXTRACT_SUFX= .tgz MAINTAINER= mi@aldan.algebra.com COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u) -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_PERL5_BUILD=yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_WRKSUBDIR= yes MAKE_ARGS+= -j 2 post-patch: ${REINPLACE_CMD} -e 's/\.Z/.gz/g' \ - -e 's|DESTDIR =.*|DESTDIR=${X11BASE}/lib/X11/fonts/koi8-u-gemini|' \ + -e 's|DESTDIR =.*|DESTDIR=${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \ ${WRKSRC}/Makefile post-install: diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message index 3be2001..0e0b305 100644 --- a/x11-fonts/geminifonts/pkg-message +++ b/x11-fonts/geminifonts/pkg-message @@ -1,7 +1,7 @@ For your X-server to use the fonts, you have to add - the ${X11BASE}/lib/X11/fonts/koi8-u-gemini (X11BASE is, - usually, /usr/X11R6) to the server's font-path. Use + the ${LOCALBASE}/lib/X11/fonts/koi8-u-gemini (LOCALBASE is, + usually, /usr/local) to the server's font-path. Use ``xset fp+'' to do this for the current X-session and consult your X-server's documentation to make this permanent. diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile index 6f36916..fa858d7 100644 --- a/x11-fonts/gentium-basic/Makefile +++ b/x11-fonts/gentium-basic/Makefile @@ -70,7 +70,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/gentium-basic/files/pkg-message.in b/x11-fonts/gentium-basic/files/pkg-message.in index f5ad249..8a90340 100644 --- a/x11-fonts/gentium-basic/files/pkg-message.in +++ b/x11-fonts/gentium-basic/files/pkg-message.in @@ -1,7 +1,7 @@ IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts before using. The copyright can be found at - %%PREFIX%%/%%FONTSDIR%%/OFL + %%LOCALBASE%%/%%FONTSDIR%%/OFL To use these fonts, follow the instructions below. @@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf: Add the following line to the "Files" section of xorg.conf: - FontPath "%%PREFIX%%/%%FONTSDIR%%/" + FontPath "%%LOCALBASE%%/%%FONTSDIR%%/" diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist index 5c0137f..70513d3 100644 --- a/x11-fonts/gentium-basic/pkg-plist +++ b/x11-fonts/gentium-basic/pkg-plist @@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @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 @dirrmtry etc/fonts/conf.d diff --git a/x11-fonts/gentium/Makefile b/x11-fonts/gentium/Makefile index 6f36916..fa858d7 100644 --- a/x11-fonts/gentium/Makefile +++ b/x11-fonts/gentium/Makefile @@ -70,7 +70,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/gentium/files/pkg-message.in b/x11-fonts/gentium/files/pkg-message.in index f5ad249..8a90340 100644 --- a/x11-fonts/gentium/files/pkg-message.in +++ b/x11-fonts/gentium/files/pkg-message.in @@ -1,7 +1,7 @@ IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts before using. The copyright can be found at - %%PREFIX%%/%%FONTSDIR%%/OFL + %%LOCALBASE%%/%%FONTSDIR%%/OFL To use these fonts, follow the instructions below. @@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf: Add the following line to the "Files" section of xorg.conf: - FontPath "%%PREFIX%%/%%FONTSDIR%%/" + FontPath "%%LOCALBASE%%/%%FONTSDIR%%/" diff --git a/x11-fonts/gentium/pkg-plist b/x11-fonts/gentium/pkg-plist index 5c0137f..70513d3 100644 --- a/x11-fonts/gentium/pkg-plist +++ b/x11-fonts/gentium/pkg-plist @@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @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 @dirrmtry etc/fonts/conf.d diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile index fbb461b..680b2f9 100644 --- a/x11-fonts/getbdf/Makefile +++ b/x11-fonts/getbdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= getbdf PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.netsw.org/x11/tools/internal/ DISTNAME= ${PORTNAME} @@ -18,7 +18,7 @@ COMMENT= Convert any X server font to .bdf format PLIST_FILES= bin/getbdf USE_PERL5_BUILD=yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_WRKSUBDIR= yes ALL_TARGET= getbdf diff --git a/x11-fonts/getbdf/files/patch-aa b/x11-fonts/getbdf/files/patch-aa index f02f0a6..3c534f9 100644 --- a/x11-fonts/getbdf/files/patch-aa +++ b/x11-fonts/getbdf/files/patch-aa @@ -27,11 +27,11 @@ --- 1,10 ---- OBJS= getbdf.o Xargs.o open_display.o -! CFLAGS+= -I. -I${X11BASE}/include +! CFLAGS+= -I. -I${LOCALBASE}/include getbdf: $(OBJS) -! cc $(CFLAGS) $(OBJS) -o getbdf -L${X11BASE}/lib -lX11 -lm +! cc $(CFLAGS) $(OBJS) -o getbdf -L${LOCALBASE}/lib -lX11 -lm clean: rm -f $(OBJS) getbdf diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile index 78de511..90dfdf1 100644 --- a/x11-fonts/gnome-font-sampler/Makefile +++ b/x11-fonts/gnome-font-sampler/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-font-sampler PORTVERSION= 0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-fonts MASTER_SITES= http://linuxadvocate.org/projects/gfontsampler/downloads/ DISTNAME= gfontsampler-${PORTVERSION} @@ -15,8 +15,7 @@ DISTNAME= gfontsampler-${PORTVERSION} MAINTAINER= jylefort@FreeBSD.org COMMENT= A program for viewing several fonts at once -USE_X_PREFIX= yes -USE_GCC= 3.4+ +USE_XORG= x11 USE_GNOME= libgnomeui gnomeprefix USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 2a6641b..9dc729e 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= intlfonts PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= intlfonts @@ -15,11 +15,12 @@ MASTER_SITE_SUBDIR= intlfonts MAINTAINER= conrads@cox.net COMMENT= Free X11 fonts for all characters that Emacs can handle -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} \ - type1inst:${PORTSDIR}/x11-fonts/p5-type1inst +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \ TT_FONTSDIR=${TT_FONTSDIR} DOCDIR=${DOCDIR} diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile index f766a80..0e636b4 100644 --- a/x11-fonts/jmk-x11-fonts/Makefile +++ b/x11-fonts/jmk-x11-fonts/Makefile @@ -7,14 +7,16 @@ PORTNAME= jmk-x11-fonts PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.jmknoble.net/fonts/ MAINTAINER= olgeni@FreeBSD.org COMMENT= Jim Knoble's font package for X -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile index 96f7df5..599fc32 100644 --- a/x11-fonts/junicode/Makefile +++ b/x11-fonts/junicode/Makefile @@ -9,8 +9,7 @@ PORTNAME= junicode DISTVERSION= 0-6-12 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gurkan@phys.ethz.ch COMMENT= Unicode font for medievalists (Latin, IPA and Runic) @@ -40,7 +39,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} .include <bsd.port.mk> diff --git a/x11-fonts/junicode/pkg-plist b/x11-fonts/junicode/pkg-plist index 0c123b2..4924ba2e 100644 --- a/x11-fonts/junicode/pkg-plist +++ b/x11-fonts/junicode/pkg-plist @@ -2,6 +2,6 @@ %%FONTSDIR%%/Junicode-BoldItalic.ttf %%FONTSDIR%%/Junicode-Italic.ttf %%FONTSDIR%%/Junicode-Regular.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile index 75c90d8..880675c 100644 --- a/x11-fonts/lfpfonts-fix/Makefile +++ b/x11-fonts/lfpfonts-fix/Makefile @@ -7,21 +7,22 @@ PORTNAME= lfpfonts-fix PORTVERSION= 0.82 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Fixed width fonts from the Linux Font Project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/lfpfonts-fix NO_BUILD= yes USE_BZIP2= yes -USE_X_PREFIX= yes do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile index 8194330..359d5e0 100644 --- a/x11-fonts/lfpfonts-var/Makefile +++ b/x11-fonts/lfpfonts-var/Makefile @@ -7,21 +7,23 @@ PORTNAME= lfpfonts-var PORTVERSION= 0.83 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Variable width fonts from the Linux Font Project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/lfpfonts-var NO_BUILD= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-var diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile index c0f4ed7..a9a81b8 100644 --- a/x11-fonts/liberation-fonts-ttf/Makefile +++ b/x11-fonts/liberation-fonts-ttf/Makefile @@ -7,6 +7,7 @@ PORTNAME= liberation-fonts-ttf PORTVERSION= 3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.redhat.com/f/fonts/ @@ -16,8 +17,8 @@ COMMENT= Liberation fonts from Red Hat to replace MS TTF fonts BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/liberation-fonts-0.2 +USE_XORG= x11 PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" @@ -29,8 +30,8 @@ FONTNAME= Liberation FONTDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} INSTDAT= License.txt fonts.dir fonts.scale -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && \ diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index fd8d8c9..47e2a68 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index fd8d8c9..47e2a68 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index fd8d8c9..47e2a68 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile index d07a543..2010793 100644 --- a/x11-fonts/manu-gothica/Makefile +++ b/x11-fonts/manu-gothica/Makefile @@ -36,7 +36,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} @${ECHO_MSG} @${ECHO_MSG} diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile index 3f19ba0..dd911da 100644 --- a/x11-fonts/mathfonts/Makefile +++ b/x11-fonts/mathfonts/Makefile @@ -35,11 +35,11 @@ PLIST_SUB+= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} -FONTSBASE= ${X11BASE}/lib/X11/fonts +FONTSBASE= ${LOCALBASE}/lib/X11/fonts FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && ${MKFONTSCL_CMD} diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile index b1b517a..ed8a9eb 100644 --- a/x11-fonts/mgopen/Makefile +++ b/x11-fonts/mgopen/Makefile @@ -32,7 +32,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/mgopen/files/pkg-message.in b/x11-fonts/mgopen/files/pkg-message.in index fa36fd0..754b546 100644 --- a/x11-fonts/mgopen/files/pkg-message.in +++ b/x11-fonts/mgopen/files/pkg-message.in @@ -9,6 +9,5 @@ Add the following line to the "Files" section of your X configuration file: FontPath "%%FONTSDIR%%/" -Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config -if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf +Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/xorg.conf if you are using X.Org. diff --git a/x11-fonts/mgopen/pkg-plist b/x11-fonts/mgopen/pkg-plist index 9a196e8..1d15daa 100644 --- a/x11-fonts/mgopen/pkg-plist +++ b/x11-fonts/mgopen/pkg-plist @@ -16,4 +16,4 @@ %%FONTSDIR%%/MgOpenModernaRegular.ttf @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/mkbold-mkitalic/Makefile b/x11-fonts/mkbold-mkitalic/Makefile index c2a609a..e5fa201 100644 --- a/x11-fonts/mkbold-mkitalic/Makefile +++ b/x11-fonts/mkbold-mkitalic/Makefile @@ -14,7 +14,6 @@ MASTER_SITES= http://hp.vector.co.jp/authors/VA013651/lib/ MAINTAINER= koma2@lovepeers.org COMMENT= Programs to make BDF font bold/italic -PREFIX?= ${X11BASE} CONFLICTS= mkbold-[0-9]* mkitalic-[0-9]* PLIST_FILES= bin/mkbold bin/mkitalic bin/mkbolditalic diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile index 80c46c8..5ae56ac 100644 --- a/x11-fonts/mkbold/Makefile +++ b/x11-fonts/mkbold/Makefile @@ -15,7 +15,6 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font bold -PREFIX?= ${X11BASE} CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkbold diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile index ce404f9..29f8c80 100644 --- a/x11-fonts/mkitalic/Makefile +++ b/x11-fonts/mkitalic/Makefile @@ -15,7 +15,6 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font italic -PREFIX?= ${X11BASE} CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkitalic diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile index db393bb..209c3e0 100644 --- a/x11-fonts/nucleus/Makefile +++ b/x11-fonts/nucleus/Makefile @@ -7,18 +7,20 @@ PORTNAME= nucleus PORTVERSION= 0.77 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Another font package for X -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 post-install: @${CAT} ${DESCR} diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile index 3f26fa8..e61f468 100644 --- a/x11-fonts/p5-type1inst/Makefile +++ b/x11-fonts/p5-type1inst/Makefile @@ -17,8 +17,8 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= A script that helps install Postscript fonts in X Window System .if !defined(WITHOUT_X11) -RUN_DEPENDS= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .endif USE_PERL5= yes diff --git a/x11-fonts/ppantsfonts/Makefile b/x11-fonts/ppantsfonts/Makefile index 0ca6223..48443ab 100644 --- a/x11-fonts/ppantsfonts/Makefile +++ b/x11-fonts/ppantsfonts/Makefile @@ -19,7 +19,7 @@ NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= moosefont terminalpants -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir WRKSRC= ${WRKDIR}/ppants @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's,$${X11BASE},${X11BASE},g' \ + @${SED} 's,$${LOCALBASE},${LOCALBASE},g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/ppantsfonts/pkg-message b/x11-fonts/ppantsfonts/pkg-message index 20d332d..caac998 100644 --- a/x11-fonts/ppantsfonts/pkg-message +++ b/x11-fonts/ppantsfonts/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/ppantsfonts" + FontPath "${LOCALBASE}/lib/X11/fonts/ppantsfonts" ------------------------------------------------------------------ diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile index c6b67f8..ad2c181 100644 --- a/x11-fonts/proggy_fonts/Makefile +++ b/x11-fonts/proggy_fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= proggy_fonts PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.proggyfonts.com/download/ DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \ @@ -19,9 +19,10 @@ DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \ MAINTAINER= llwang@infor.org COMMENT= The perfect monospaced bitmap programming fonts -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index 0049ecc..b08c411 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -18,7 +18,8 @@ MAINTAINER= conrads@cox.net COMMENT= Fonts from the SGI ProPack 1.4 (originally for Linux) EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= lib/X11/fonts/local/sgi diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile index d6e45c3..b3f1433 100644 --- a/x11-fonts/suxus/Makefile +++ b/x11-fonts/suxus/Makefile @@ -7,7 +7,7 @@ PORTNAME= suxus PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.goof.com/pcg/marc/data/ DISTFILES= ${PORTNAME}-iso-8859-1.bdf.gz fonts.alias @@ -16,11 +16,12 @@ DIST_SUBDIR= suxus MAINTAINER= wxs@FreeBSD.org COMMENT= An x11 font designed to be small yet easily read -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} \ - mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale SUB_FILES= pkg-message -USE_X_PREFIX= yes +USE_XORG= x11 do-extract: @${MKDIR} ${WRKSRC} diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile index 28e0da0..31e4ad9 100644 --- a/x11-fonts/terminus-font/Makefile +++ b/x11-fonts/terminus-font/Makefile @@ -29,12 +29,12 @@ post-build: @${GZIP_CMD} ${WRKSRC}/*.pcf do-install: - @${MKDIR} ${X11BASE}/${FONTDIR} - @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${X11BASE}/${FONTDIR} + @${MKDIR} ${LOCALBASE}/${FONTDIR} + @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR} post-install: - @cd ${X11BASE}/${FONTDIR}; mkfontdir - @${CP} ${X11BASE}/${FONTDIR}/fonts.dir ${X11BASE}/${FONTDIR}/fonts.scale || true - @command fc-cache -f -v ${X11BASE}/${FONTDIR} || true + @cd ${LOCALBASE}/${FONTDIR}; mkfontdir + @${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true + @command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true .include <bsd.port.mk> diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile index c7e3fa6..03efa8d 100644 --- a/x11-fonts/texcm-ttf/Makefile +++ b/x11-fonts/texcm-ttf/Makefile @@ -35,8 +35,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && ${MKFONTSCL_CMD} diff --git a/x11-fonts/tolkien-ttf/Makefile b/x11-fonts/tolkien-ttf/Makefile index 802b702..a901b19 100644 --- a/x11-fonts/tolkien-ttf/Makefile +++ b/x11-fonts/tolkien-ttf/Makefile @@ -33,7 +33,7 @@ do-install: post-install: @${ECHO_MSG} "==> Running fc-cache" - @${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + @${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile index 26954b3..b906e64 100644 --- a/x11-fonts/ttmkfdir/Makefile +++ b/x11-fonts/ttmkfdir/Makefile @@ -7,7 +7,7 @@ PORTNAME= ttmkfdir PORTVERSION= 3.0.9 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-fonts x11 MASTER_SITES= http://mbsd.msk.ru/dist/ @@ -20,7 +20,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 PLIST_FILES= bin/ttmkfdir USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 MAKE_ENV= LDFLAGS="${LDFLAGS}" CXXFLAGS="${CFLAGS}" CXX="${CXX}" diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index 0749802..6a29cfa 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -41,6 +41,6 @@ do-install: .endfor post-install: - @-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + @-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index e282f30..4789daf 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -43,11 +43,11 @@ EXTRACT_AFTER_ARGS= # FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -TTFONTSDIR?= ${X11BASE}/lib/X11/fonts/TrueType +TTFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType PLIST_SUB= FONTNAME="${FONTNAME}" \ FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \ - TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}" + TTFONTSDIR="${TTFONTSDIR:S|${LOCALBASE}/||}" SUB_LIST= FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}" SUB_FILES= pkg-message @@ -108,7 +108,7 @@ do-install: # post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist index 8db0242..8f5627a 100644 --- a/x11-fonts/webfonts/pkg-plist +++ b/x11-fonts/webfonts/pkg-plist @@ -37,4 +37,4 @@ %%DOCSDIR%%/LICENSE @dirrm %%DOCSDIR%% @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile index 32fb600..dc6971a 100644 --- a/x11-fonts/wqy/Makefile +++ b/x11-fonts/wqy/Makefile @@ -7,10 +7,10 @@ PORTNAME= wqy PORTVERSION= 0.8.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://dryice.name/computer/FreeBSD/distfiles/ MASTER_SITE_SUBDIR= wqy DISTNAME= ${PORTNAME}-bitmapfont-pcf-${PORTVERSION}-6 @@ -20,7 +20,7 @@ COMMENT= A font which includes all the CJK characters covered by Unicode 4.0 WRKSRC= ${WRKDIR}/${PORTNAME}-bitmapfont NO_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 FONTSDIR= lib/X11/fonts/wqy CONFDDIR= etc/fonts/conf.d CONFAVAILDIR= etc/fonts/conf.avail @@ -29,8 +29,10 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} \ CONFDDIR=${CONFDDIR} \ CONFAVAILDIR=${CONFAVAILDIR} -BUILD_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} -BUILD_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ + fc-cache:${PORTSDIR}/x11-fonts/fontconfig OPTIONS= ALIAS "Install fonts.alias" off diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa index 1ab5342..751e686 100644 --- a/x11-fonts/xmbdfed/files/patch-aa +++ b/x11-fonts/xmbdfed/files/patch-aa @@ -64,8 +64,8 @@ $FreeBSD$ #LIBS = -L/usr/Motif-1.2/lib32 -lXm \ # -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) -+INCS = -I${X11BASE}/include ${FTYPE_INCS} -+LIBS = -L${X11BASE}/lib ${MOTIFLIB} \ ++INCS = -I${LOCALBASE}/include ${FTYPE_INCS} ++LIBS = -L${LOCALBASE}/lib ${MOTIFLIB} \ + -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext ${FTYPE_LIBS} + all: xmbdfed diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 6f64938..be413b0 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1 CONFLICTS= XFree86-font100dpi-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index a300aa3..0981f2d 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75 CONFLICTS= XFree86-font75dpi-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 7855454..3ee0e64 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx CONFLICTS= XFree86-fontCyrillic-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 39a8fd8..2d89072 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS= ${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m CONFLICTS= XFree86-fontDefaultBitmaps-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index f95b4ae..684022a 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -18,14 +18,12 @@ COMMENT= X.Org TrueType fonts RUN_DEPENDS= ${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \ ${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \ ${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \ - ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - -CONFLICTS= XFree86-fontScalable-* + ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ + ${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ do-install: # empty NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 3fc860e..bf10b17 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -27,6 +27,6 @@ CONFLICTS= XFree86-fontScalable-* do-install: # empty NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index eb3137a..9640236 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -7,6 +7,7 @@ PORTNAME= xorg-fonts PORTVERSION= 7.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none @@ -16,7 +17,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.org fonts meta-port USE_XORG= fontutil -PREFIX?= ${X11BASE} FONTSDIR= ${PREFIX}/lib/X11/fonts RUN_DEPENDS= ${FONTSDIR}/100dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \ diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile index 5ad3a785..7692b6e 100644 --- a/x11-servers/Xfstt/Makefile +++ b/x11-servers/Xfstt/Makefile @@ -7,14 +7,14 @@ PORTNAME= xfstt PORTVERSION= 1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= http://download.berlios.de/xfstt/ MAINTAINER= ports@FreeBSD.org COMMENT= A TrueType font server for X11 -USE_X_PREFIX= yes +USE_XORG= fontsproto xproto GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var --disable-nls diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile index d744595..db2751f 100644 --- a/x11-servers/driglide/Makefile +++ b/x11-servers/driglide/Makefile @@ -29,7 +29,7 @@ ONLY_FOR_ARCHS= i386 CFLAGS+= -O post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure.in \ ${WRKSRC}/h3/glide3/src/Makefile.am \ ${WRKSRC}/h5/glide3/src/Makefile.am diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile index ac3ae99..cf56a40 100644 --- a/x11-servers/mga_hal/Makefile +++ b/x11-servers/mga_hal/Makefile @@ -7,7 +7,7 @@ PORTNAME= mga_hal PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ftp://ftp.matrox.com/pub/mga/archive/linux/%SUBDIR%/:i386,amd64 MASTER_SITE_SUBDIR= 2006/:i386 2006/64bit/:amd64 @@ -19,7 +19,6 @@ COMMENT= Module for additional features with X.Org/XFree86 Matrox driver RESTRICTED= Matrox drivers may not be distributed. ONLY_FOR_ARCHS= i386 amd64 -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile index 7819adc..6fc9d07 100644 --- a/x11-servers/x2vnc/Makefile +++ b/x11-servers/x2vnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= x2vnc PORTVERSION= 1.72 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= http://fredrik.hubbe.net/x2vnc/ DISTNAME= ${PORTNAME}-1.7.2 @@ -15,10 +15,12 @@ DISTNAME= ${PORTNAME}-1.7.2 MAINTAINER= ports@FreeBSD.org COMMENT= A program to link multiple X and VNC servers together -USE_X_PREFIX= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +USE_XORG= x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm MAN1= x2vnc.1 PLIST_FILES= bin/x2vnc diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index b8626d1..fadee0a 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-dmx PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -26,7 +26,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ compositeproto trapproto recordproto resourceproto \ xineramaproto evieproto xkbfile xfont fontenc xkbui \ xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ - xau dmx xtst xres pixman + xau dmx xtst xres pixman xtrans CONFIGURE_ARGS= --disable-xprint --disable-xvfb --disable-xorg --disable-xnest \ --enable-dmx --localstatedir=/var diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index 0ba3f45..29111a4 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -20,7 +20,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm -RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config +RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config CONFLICTS= XFree86-Server-* diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 64bb692..0f5d45f 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -20,7 +20,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm -RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config +RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config CONFLICTS= XFree86-Server-* diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile index 546a874..784ad9f 100644 --- a/x11-themes/bluecurve-themes/Makefile +++ b/x11-themes/bluecurve-themes/Makefile @@ -28,11 +28,11 @@ DISTFILES= # empty EXTRACT_ONLY= # empty # note: gtk-/icon-/metacity- are brought in by gnome- -RUN_DEPENDS= ${X11BASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \ +RUN_DEPENDS= ${LOCALBASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \ ${LOCALBASE}/share/themes/Bluecurve/index.theme:${PORTSDIR}/x11-themes/gnome-bluecurve-theme \ ${LINUXBASE}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/linux-gtk-bluecurve-theme \ - ${X11BASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \ - ${X11BASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme + ${LOCALBASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \ + ${LOCALBASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme NO_BUILD= yes diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile index 705bbfc..4736aa2 100644 --- a/x11-themes/clearlooks-metacity/Makefile +++ b/x11-themes/clearlooks-metacity/Makefile @@ -8,7 +8,7 @@ PORTNAME= clearlooks-metacity PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes MASTER_SITES= http://www.stellingwerff.com/ #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -21,7 +21,6 @@ CONFLICTS= gnome-themes-2.11.9[1-9]* gnome-themes-2.* WRKSRC= ${WRKDIR}/Clearlooks/metacity-1/ USE_GNOME= metacity gnomeprefix -USE_X_PREFIX= yes DATADIR= share/themes/Clearlooks/metacity-1 NO_BUILD= yes diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile index a67f4e8..31a2de5 100644 --- a/x11-themes/clearlooks/Makefile +++ b/x11-themes/clearlooks/Makefile @@ -10,9 +10,7 @@ PORTNAME?= clearlooks PORTVERSION= 0.6.2 PORTREVISION= 6 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= clearlooks -DISTNAME= clearlooks-${PORTVERSION} +MASTER_SITES= SF MAINTAINER= ahze@FreeBSD.org COMMENT?= GTK+ 2.x engine based on Bluecurve @@ -22,8 +20,8 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if defined(PORTNAME) && ${PORTNAME} == "clearlooks" OPTIONS+= ANIMATION "Enable experimental animated progressbars" Off \ diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile index d0c0bd5..88d14ae 100644 --- a/x11-themes/cursor-bluecurve-theme/Makefile +++ b/x11-themes/cursor-bluecurve-theme/Makefile @@ -18,8 +18,6 @@ BROKEN= Incorrect pkg-plist and unfetchable DEPRECATED= "${BROKEN}" EXPIRATION_DATE= 2007-11-02 -PREFIX= ${X11BASE} - THEMES= Bluecurve Bluecurve-inverse LBluecurve LBluecurve-inverse .for t in ${THEMES} @@ -45,7 +43,7 @@ do-build: .include "${MASTERDIR}/bsd.bluecurve.mk" .include <bsd.port.pre.mk> -BUILD_DEPENDS+= xcursorgen:${X_CLIENTS_PORT} # needed by cursorthemegen -RUN_DEPENDS+= xcursorgen:${X_CLIENTS_PORT} # for the lib/X11/icons directory +BUILD_DEPENDS+= xcursorgen:${PORTSDIR}/x11/xcursorgen # needed by cursorthemegen +RUN_DEPENDS+= xcursorgen:${PORTSDIR}/x11/xcursorgen # for the lib/X11/icons directory .include <bsd.port.post.mk> diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile index 7c797cd..87a607b 100644 --- a/x11-themes/emerald-themes/Makefile +++ b/x11-themes/emerald-themes/Makefile @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \ diff --git a/x11-themes/enlightenment-theme-BlueSteel/Makefile b/x11-themes/enlightenment-theme-BlueSteel/Makefile index d33a896..ca47500 100644 --- a/x11-themes/enlightenment-theme-BlueSteel/Makefile +++ b/x11-themes/enlightenment-theme-BlueSteel/Makefile @@ -7,18 +7,18 @@ PORTNAME= enlightenment-theme-BlueSteel PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= enlightenment DISTNAME= ${PORTNAME:S/enlightenment/e16/}-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= A themes of enlightenment window menager -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd NO_BUILD= yes diff --git a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile index 53cb609..0f4b687 100644 --- a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile +++ b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile @@ -7,18 +7,18 @@ PORTNAME= enlightenment-theme-BrushedMetal-Tigert PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= enlightenment DISTNAME= e16-theme-BrushedMetal-Tigert-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= A themes of enlightenment window menager -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd NO_BUILD= yes diff --git a/x11-themes/enlightenment-theme-Ganymede/Makefile b/x11-themes/enlightenment-theme-Ganymede/Makefile index 6fd3738..8295bd2 100644 --- a/x11-themes/enlightenment-theme-Ganymede/Makefile +++ b/x11-themes/enlightenment-theme-Ganymede/Makefile @@ -7,18 +7,18 @@ PORTNAME= enlightenment-theme-Ganymede PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= enlightenment DISTNAME= ${PORTNAME:S/enlightenment/e16/}-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= A themes of enlightenment window menager -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd NO_BUILD= yes diff --git a/x11-themes/enlightenment-theme-ShinyMetal/Makefile b/x11-themes/enlightenment-theme-ShinyMetal/Makefile index 21b493a9..139eaff 100644 --- a/x11-themes/enlightenment-theme-ShinyMetal/Makefile +++ b/x11-themes/enlightenment-theme-ShinyMetal/Makefile @@ -7,18 +7,18 @@ PORTNAME= enlightenment-theme-ShinyMetal PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= enlightenment DISTNAME= ${PORTNAME:S/enlightenment/e16/}-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= A themes of enlightenment window menager -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd NO_BUILD= yes diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile index f694f8d..f1332d6 100644 --- a/x11-themes/gtk-engines/Makefile +++ b/x11-themes/gtk-engines/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-engines PORTVERSION= 0.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gtk-engines/0.12 @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/gtk-engines/0.12 MAINTAINER= gnome@FreeBSD.org COMMENT= Theme engine for gtk+ toolkits -USE_XLIB= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 index af33131..74b111e 100644 --- a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 +++ b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 @@ -8,7 +8,7 @@ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` GTK_LIBS = `$(GTK_CONFIG) --libs` LN_S = ln -s INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) -XLIBDIR=$(X11BASE)/lib +XLIBDIR=$(LOCALBASE)/lib LOCALLIBDIR=$(LOCALBASE)/lib enginedir = $(XLIBDIR)/gtk/themes/engines engine_LTLIBRARIES = libindustrial.la diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile index e3b53d3..a1d302c 100644 --- a/x11-themes/phase/Makefile +++ b/x11-themes/phase/Makefile @@ -20,7 +20,7 @@ USE_KDEBASE_VER=3 USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include <bsd.port.mk> diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile index 900eff4..4910f8a 100644 --- a/x11-themes/polymer/Makefile +++ b/x11-themes/polymer/Makefile @@ -7,7 +7,7 @@ PORTNAME= polymer PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-themes MASTER_SITES= http://static.int.pl/~mig21/dev/releases/polymer/ \ ${MASTER_SITE_LOCAL} @@ -18,11 +18,10 @@ COMMENT= Qt port of Plastik KDE theme BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -USE_X_PREFIX= yes USE_BZIP2= yes USE_AUTOTOOLS= autoheader:261 USE_QT_VER= 3 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile index 5736888..39a2c43 100644 --- a/x11-themes/qinx/Makefile +++ b/x11-themes/qinx/Makefile @@ -18,7 +18,7 @@ USE_KDEBASE_VER=3 USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include <bsd.port.mk> diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile index 946b1f2..a24a310 100644 --- a/x11-themes/qt-bluecurve-theme/Makefile +++ b/x11-themes/qt-bluecurve-theme/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qt-bluecurve-theme - +PORTREVISION= 1 COMMENT= The Bluecurve QT theme MASTERDIR= ${.CURDIR}/../bluecurve-themes @@ -14,16 +14,15 @@ MASTERDIR= ${.CURDIR}/../bluecurve-themes USE_QT_VER= 3 BUILD_WRKSRC= ${WRKSRC}/art/qt/Bluecurve -QT_CFLAGS= -I${X11BASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS} -QT_LIBS= -L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS} -USE_X_PREFIX= yes +QT_CFLAGS= -I${LOCALBASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS} +QT_LIBS= -L${LOCALBASE}/lib -lqt-mt ${PTHREAD_LIBS} SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|GtkStyle|0|' ${BUILD_WRKSRC}/bluecurve.cpp @${REINPLACE_CMD} -e \ - 's|^\(libraryPath\)=.*|\1=${X11BASE}/lib/plugins|' \ + 's|^\(libraryPath\)=.*|\1=${LOCALBASE}/lib/plugins|' \ ${WRKSRC}/art/qt/qtrc do-build: diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile index 4d0618a..8d06529 100644 --- a/x11-themes/sapphire-themes/Makefile +++ b/x11-themes/sapphire-themes/Makefile @@ -25,17 +25,17 @@ NO_BUILD= yes NO_WRKSUBDIR= yes do-patch: - ${REINPLACE_CMD} 's:~/\.:${X11BASE}/share/:g' \ + ${REINPLACE_CMD} 's:~/\.:${LOCALBASE}/share/:g' \ ${WRKDIR}/menu/default \ ${WRKDIR}/themes/*.theme ${REINPLACE_CMD} 's:-15-:-12-:g' ${WRKDIR}/themes/*.theme do-install: - ${MKDIR} ${X11BASE}/share/sapphire/themes/backgrounds/ + ${MKDIR} ${LOCALBASE}/share/sapphire/themes/backgrounds/ ${INSTALL_DATA} ${WRKDIR}/themes/backgrounds/* \ - ${X11BASE}/share/sapphire/themes/backgrounds/ + ${LOCALBASE}/share/sapphire/themes/backgrounds/ ${INSTALL_DATA} ${WRKDIR}/themes/*.theme \ - ${X11BASE}/share/sapphire/themes/ - ${INSTALL_DATA} ${WRKDIR}/menu/default ${X11BASE}/share/sapphire/menu/ + ${LOCALBASE}/share/sapphire/themes/ + ${INSTALL_DATA} ${WRKDIR}/menu/default ${LOCALBASE}/share/sapphire/menu/ .include <bsd.port.mk> diff --git a/x11-themes/xmms-bluecurve-theme/Makefile b/x11-themes/xmms-bluecurve-theme/Makefile index 00729e1..b419768 100644 --- a/x11-themes/xmms-bluecurve-theme/Makefile +++ b/x11-themes/xmms-bluecurve-theme/Makefile @@ -6,6 +6,7 @@ # PORTNAME= xmms-bluecurve-theme +PORTREVISION= 1 COMMENT= The Bluecurve XMMS skin @@ -14,9 +15,9 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \ MASTERDIR= ${.CURDIR}/../bluecurve-themes -NO_BUILD= yes +PREFIX= ${LOCALBASE} -PREFIX= ${X11BASE} +NO_BUILD= yes SKIN= Bluecurve-xmms.zip PLIST_FILES= share/xmms/Skins/${SKIN} diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile index 1f89d7c..c3f2867 100644 --- a/x11-themes/xmms-eq-skins/Makefile +++ b/x11-themes/xmms-eq-skins/Makefile @@ -9,14 +9,14 @@ PORTNAME= xmms-eq-skins PORTVERSION= 0.2 PORTREVISION= 3 CATEGORIES= x11-themes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= equ DISTNAME= eq-xmms-skins-${PORTVERSION} MAINTAINER= alepulver@FreeBSD.org COMMENT= Additional skins for the XMMS EQ plugin -RUN_DEPENDS= ${X11BASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq +RUN_DEPENDS= ${LOCALBASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq USE_BZIP2= yes WRKSRC= ${WRKDIR}/EQskins diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile index 7fb73fc..167cc8b 100644 --- a/x11-toolkits/SoXt/Makefile +++ b/x11-toolkits/SoXt/Makefile @@ -21,7 +21,7 @@ USE_MOTIF= yes USE_PERL5_BUILD= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${X11BASE} +CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${LOCALBASE} # avoid renaming of soxt-config and soxt-config.1 CONFIGURE_TARGET= --target="" USE_LDCONFIG= yes diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/Xaw3d/files/pkg-message.in index 6bfd4a6..524bf43 100644 --- a/x11-toolkits/Xaw3d/files/pkg-message.in +++ b/x11-toolkits/Xaw3d/files/pkg-message.in @@ -2,7 +2,7 @@ If you want Xaw3d to replace the default Athena Widget Set so most X applications will get a 3-D look, do this (as root): -cd %%X11BASE%%/lib +cd %%LOCALBASE%%/lib mv libXaw.so.%%XAWVER%% libXaw2d.so.%%XAWVER%% ln -s libXaw3d.so.%%XAWVER%% libXaw.so.%%XAWVER%% ******************************************************************* diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile index cf0d983..806eb835 100644 --- a/x11-toolkits/XawPlus/Makefile +++ b/x11-toolkits/XawPlus/Makefile @@ -20,13 +20,13 @@ USE_XORG= x11 xaw WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \ - INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib" + INC_PATH="-I. -I${LOCALBASE}/include" LIB_PATH="-L${LOCALBASE}/lib" ALL_TARGET= lib USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's:so\.3\..:so.3:' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's:%%X11BASE%%:${X11BASE}:' ${WRKSRC}/test/Makefile + @${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' ${WRKSRC}/test/Makefile do-install: @${MKDIR} ${PREFIX}/include/X11/XawPlus diff --git a/x11-toolkits/XawPlus/files/patch-test::Makefile b/x11-toolkits/XawPlus/files/patch-test::Makefile index e0450de..2d8c3dd 100644 --- a/x11-toolkits/XawPlus/files/patch-test::Makefile +++ b/x11-toolkits/XawPlus/files/patch-test::Makefile @@ -14,7 +14,7 @@ $FreeBSD$ -LIB_PATH = -L/usr/X11/lib # Libraries for X -INC_PATH = -I/usr/X11/include # Header for X -+PREFIX=%%X11BASE%% ++PREFIX=%%XLOCALBASE%% + +LIB_PATH = -L$(PREFIX)/lib # Libraries for X +INC_PATH = -I$(PREFIX)/include # Header for X diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile index 67a0983..c3c0711 100644 --- a/x11-toolkits/efltk/Makefile +++ b/x11-toolkits/efltk/Makefile @@ -7,9 +7,9 @@ PORTNAME= efltk PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ede +MASTER_SITES= SF/ede MAINTAINER= sem@FreeBSD.org COMMENT= Extended Fast Light Toolkit @@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --disable-mysql USE_MYSQL= yes .endif -USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= autoconf:213 @@ -36,6 +35,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include" MAKE_ENV+= LD_LIBRARY_PATH="${WRKSRC}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes +USE_XORG= x11 xext .include <bsd.port.mk> diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile index ea053d3..459fc9a 100644 --- a/x11-toolkits/enhance/Makefile +++ b/x11-toolkits/enhance/Makefile @@ -8,7 +8,7 @@ PORTNAME= enhance PORTVERSION= 20080223 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ @@ -17,7 +17,6 @@ COMMENT= A library for rapid application development with ETK/Glade USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack pkgconfig gnometarget USE_LDCONFIG= yes USE_EFL= ecore etk exml diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile index 3f633b7..ac477c7 100644 --- a/x11-toolkits/flu/Makefile +++ b/x11-toolkits/flu/Makefile @@ -7,7 +7,7 @@ PORTNAME= flu PORTVERSION= 2.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://www.osc.edu/~jbryan/FLU/ DISTNAME= FLU_${PORTVERSION} @@ -17,10 +17,10 @@ COMMENT= A library containing extra widgets for FLTK LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk -USE_GL= yes +USE_GL= gl USE_LDCONFIG= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --I=${X11BASE}/include --L=${X11BASE}/lib +CONFIGURE_ARGS= --prefix=${PREFIX} --I=${LOCALBASE}/include --L=${LOCALBASE}/lib USE_GMAKE= yes PORTDOCS= * diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile index b12e958..48293ad 100644 --- a/x11-toolkits/fox12/Makefile +++ b/x11-toolkits/fox12/Makefile @@ -39,8 +39,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= XFT "Enable Xft support" on \ SHM "Enable Shared Memory support" on \ diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index d0f5c30..83e62a5 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -39,8 +39,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \ CUPS "Enable CUPS support" off \ diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile index 6488315..7e292b5 100644 --- a/x11-toolkits/fox16/Makefile +++ b/x11-toolkits/fox16/Makefile @@ -38,8 +38,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= XFT "Enable Xft support" on \ SHM "Enable Shared Memory support" on \ diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index a2be4b2..6475b66 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -8,10 +8,9 @@ PORTNAME= gai PORTVERSION= 0.5.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= lx@redundancy.redundancy.org COMMENT= General Applet Interface Library @@ -19,7 +18,7 @@ COMMENT= General Applet Interface Library LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext USE_BZIP2= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl USE_GNOME= gnomepanel GNU_CONFIGURE= yes @@ -30,11 +29,11 @@ PLIST_FILES= include/gai/gai.h lib/libgai.so.${PORTVERSION} \ share/locale/de/LC_MESSAGES/gai.mo PLIST_DIRS= include/gai PORTDOCS= * -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \ - s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure + s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in index e023337..11088b8 100644 --- a/x11-toolkits/gai/files/patch-gai_Makefile.in +++ b/x11-toolkits/gai/files/patch-gai_Makefile.in @@ -8,7 +8,7 @@ +CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ -LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ -+LDFLAGS += -fPIC -L$(X11BASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ ++LDFLAGS += -fPIC -L$(LOCALBASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@ CC = @CC@ diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index e97e654..b593cac 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -7,7 +7,7 @@ PORTNAME= gal PORTVERSION= 0.24 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.24 @@ -19,7 +19,7 @@ COMMENT= A collection of widgets taken from GNOME gnumeric and evolution LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 135a822..eab6728 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gal2 PORTVERSION= 2.5.3 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \ ltverhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-static --with-libiconv diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index b7b0a7b..ab2965e 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -7,6 +7,7 @@ # PORTNAME= gdl +PORTREVISION= 1 PORTVERSION= 0.7.11 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -16,7 +17,6 @@ COMMENT= Components intended to be shared between GNOME development tools USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 9be85de..2d9cf50 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnocl PORTVERSION= 0.9.90 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnocl +MASTER_SITES= SF/gnocl MAINTAINER= ports@FreeBSD.org COMMENT= GTK+ and Gnome extension for Tcl @@ -19,12 +18,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tcl8.4/tcl.h:${PORTSDIR}/lang/tcl84 USE_GMAKE= yes USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -USE_X_PREFIX= yes USE_GNOME= gtk20 .include <bsd.port.pre.mk> diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index d7591fc..b149f83 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gtk+/1.2 @@ -16,8 +16,8 @@ DISTNAME= gtk+-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) -USE_XLIB= yes USE_PERL5= yes +USE_XORG= x11 ice xext sm inputproto xi USE_GNOME= glib12 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 13e10e3..ff45cf8 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -41,11 +41,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \ - xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \ - xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \ - xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \ - xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 13e10e3..ff45cf8 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -41,11 +41,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \ - xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \ - xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \ - xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \ - xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile index 0a0428d..8e3c04a 100644 --- a/x11-toolkits/gtkdatabox2/Makefile +++ b/x11-toolkits/gtkdatabox2/Makefile @@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data USE_GNOME= gtk20 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFLICTS= gtkdatabox-0.1.* diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile index 5c343aa..d47c98b 100644 --- a/x11-toolkits/gtkglarea--/Makefile +++ b/x11-toolkits/gtkglarea--/Makefile @@ -30,8 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-lib-GL USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \ +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lGL -lGLU \ ${PTHREAD_LIBS} post-patch: diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile index 19b08b1..3acb314 100644 --- a/x11-toolkits/gtkscintilla/Makefile +++ b/x11-toolkits/gtkscintilla/Makefile @@ -9,7 +9,7 @@ PORTNAME= gtkscintilla PORTVERSION= 0.8.2 PORTREVISION= 5 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= moleskine DISTNAME= GtkScintilla-${PORTVERSION} diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa index 3bc3616..5a77f15 100644 --- a/x11-toolkits/gtkscintilla/files/patch-aa +++ b/x11-toolkits/gtkscintilla/files/patch-aa @@ -20,7 +20,7 @@ $FreeBSD$ -CFLAGS = $(shell gtk-config --cflags) -g -Wall -DGTK -DSCI_LEXER -LDFLAGS_PRE = $(shell gtk-config --libs) -DGTK -LDFLAGS_POST = $(LEXERS) $(SCINTILLA_LIB) -lstdc++ -+SCINTILLA_INCLUDE = $(X11BASE)/include/scintilla ++SCINTILLA_INCLUDE = $(LOCALBASE)/include/scintilla +SCINTILLA_LIB = -lscintilla +SCINTILLA_IFACE = scintilla/include/Scintilla.iface +LEXERS = -lscintilla_lexers diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index 2c76925..63e63ba 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview PORTVERSION= 1.8.5 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index bc77ffd..43805f7 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 2.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile index 6ea8a33..e6912d1 100644 --- a/x11-toolkits/guile-gtk/Makefile +++ b/x11-toolkits/guile-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= guile-gtk PORTVERSION= 0.60 +PORTREVISION= 1 CATEGORIES= x11-toolkits scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +17,6 @@ COMMENT= Guile binding library for GTK+ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnometarget ltverhack gdkpixbuf libglade USE_AUTOTOOLS= libtool:15 diff --git a/x11-toolkits/hs-frantk/files/patch-src::Makefile b/x11-toolkits/hs-frantk/files/patch-src::Makefile index 3766c69..1f9777a 100644 --- a/x11-toolkits/hs-frantk/files/patch-src::Makefile +++ b/x11-toolkits/hs-frantk/files/patch-src::Makefile @@ -26,7 +26,7 @@ -CC_INC = -I/usr/X11/include -I/usr/local/include +#CC = gcc +CC_OPTS = ${CFLAGS} -+CC_INC = -I${X11BASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 ++CC_INC = -I${LOCALBASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 -GHC = ghc-5.00.2 -GHC-PKG=ghc-pkg-5.00.2 @@ -51,7 +51,7 @@ # The directories containing the X11, Tcl and Tk (binary) libraries: -CCLIB = -L /usr/lib/X11 -L /usr/local/lib -+CCLIB = -L ${X11BASE}/lib/X11 -L /usr/local/lib ++CCLIB = -L ${LOCALBASE}/lib/X11 -L /usr/local/lib # the libraries required by Tcl/Tk: diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib index 420cb3e..5fbff64a 100644 --- a/x11-toolkits/itk/files/Makefile.lib +++ b/x11-toolkits/itk/files/Makefile.lib @@ -5,7 +5,7 @@ CFLAGS+= -I. -I./../generic \ -I${TCL_INCLUDEDIR}/generic \ -I${PREFIX}/include/itcl${MAJOR}.${MINOR}/ \ -I${TK_INCLUDEDIR}/generic \ - -I${X11BASE}/include \ + -I${LOCALBASE}/include \ -DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\ -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\ -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\ @@ -14,7 +14,7 @@ CFLAGS+= -I. -I./../generic \ -DHAVE_SYS_FILIO_H=1 \ -DRETSIGTYPE=void \ -DITK_LIBRARY=\"${ITK_LIBRARY}\" -LDADD+= -L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk${USE_TK} +LDADD+= -L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${USE_TK} .PATH: ${.CURDIR}/generic diff --git a/x11-toolkits/jdic/Makefile b/x11-toolkits/jdic/Makefile index d6114f7..6dd4232 100644 --- a/x11-toolkits/jdic/Makefile +++ b/x11-toolkits/jdic/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdic PORTVERSION= 20061102 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits java MASTER_SITES= https://jdic.dev.java.net/files/documents/880/43269/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS_REASON= the required com.sun.jnlp is part of jawaws.jar, only ins USE_ZIP= yes USE_ANT= yes -USE_XLIB= yes +USE_XORG= x11 xext USE_GNOME= pkgconfig # libgnome USE_JAVA= yes JAVA_VERSION= 1.5+ @@ -53,7 +53,7 @@ PLIST_FILES= %%JAVAJARDIR%%/jdic.jar \ pre-configure: .for mk in ${MKFILES} - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/jdic/src/unix/native/${mk}/Makefile .endfor diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 66d0623..b6db914 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -8,7 +8,7 @@ PORTNAME= libbonoboui PORTVERSION= 2.22.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \ diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile index da64047..8ecf1d8 100644 --- a/x11-toolkits/libbonobouimm/Makefile +++ b/x11-toolkits/libbonobouimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbonobouimm PORTVERSION= 1.3.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,11 +21,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomeprefix libbonoboui USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 47b92a9..57a222c 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.20.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +18,6 @@ COMMENT= An implementation of the ATK interfaces for GNOME widgets USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile index c00d621..8892a67 100644 --- a/x11-toolkits/libgdiplus/Makefile +++ b/x11-toolkits/libgdiplus/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgdiplus PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://go-mono.com/sources/${PORTNAME}/ @@ -17,13 +17,15 @@ COMMENT= GDI+ API for System.Windows.Forms in Mono LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ - png.5:${PORTSDIR}/graphics/png + png.5:${PORTSDIR}/graphics/png \ + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ + freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USE_GNOME= gnomehack gnometarget glib20 USE_GMAKE= yes -INSTALLS_SHLIB= yes -USE_XLIB= yes +USE_XORG= x11 xrender +USE_LDCONFIG= yes LIBTOOLFILES= configure cairo/configure USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 11375f7..83b7b51 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomeprintui PORTVERSION= 2.18.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,8 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= x11 xpm USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ intlhack ltverhack diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile index caccf46..6dd936c 100644 --- a/x11-toolkits/libgnomeprintuimm/Makefile +++ b/x11-toolkits/libgnomeprintuimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomeprintuimm PORTVERSION= 2.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5 @@ -22,11 +22,9 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprintui -USE_GCC= 3.4+ -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile index 92af142..10b52ae 100644 --- a/x11-toolkits/libgnomeuimm/Makefile +++ b/x11-toolkits/libgnomeuimm/Makefile @@ -7,10 +7,9 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -22,11 +21,10 @@ LIB_DEPENDS= gnomemm-2.0:${PORTSDIR}/x11/libgnomemm \ glademm-2.0:${PORTSDIR}/devel/libglademm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnomeui USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index fd926d6..e7b2f78 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -27,12 +28,11 @@ LATEST_LINK= libgnomeuimm26 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnomeui GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static PLIST_SUB= VERSION="2.6" API_VERSION="2.6" diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index c7c1686..0b860d4 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgtk-java PORTVERSION= 2.10.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Java wrapper for Gtk+, Pango, Atk, and Glib LIB_DEPENDS= cairojni-${CAIRO_API_VERSION}.1:${PORTSDIR}/graphics/cairo-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index a9251b3..4f65baf 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpanelappletmm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,9 +22,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack lthack gnomepanel USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 15f0627..021312f 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -7,7 +7,7 @@ PORTNAME= libzvt PORTVERSION= 2.0.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library components for Zed's Virtual Terminal USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile index 4dd5f4b..adb044d 100644 --- a/x11-toolkits/linux-f10-gtk/Makefile +++ b/x11-toolkits/linux-f10-gtk/Makefile @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} USE_XLIB= yes diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile index 1dafd3a..8b06cf4 100644 --- a/x11-toolkits/linux-f10-gtk2/Makefile +++ b/x11-toolkits/linux-f10-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile index 9f0c8a5..2e60b92 100644 --- a/x11-toolkits/linux-f10-pango/Makefile +++ b/x11-toolkits/linux-f10-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile index 347e898..753837c 100644 --- a/x11-toolkits/linux-f10-qt33/Makefile +++ b/x11-toolkits/linux-f10-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index 4dd5f4b..adb044d 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} USE_XLIB= yes diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile index 1dafd3a..8b06cf4 100644 --- a/x11-toolkits/linux-f8-gtk2/Makefile +++ b/x11-toolkits/linux-f8-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile index 9f0c8a5..2e60b92 100644 --- a/x11-toolkits/linux-f8-pango/Makefile +++ b/x11-toolkits/linux-f8-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile index 347e898..753837c 100644 --- a/x11-toolkits/linux-f8-qt33/Makefile +++ b/x11-toolkits/linux-f8-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index 4dd5f4b..adb044d 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} USE_XLIB= yes diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index 1dafd3a..8b06cf4 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile index 9f0c8a5..2e60b92 100644 --- a/x11-toolkits/linux-pango/Makefile +++ b/x11-toolkits/linux-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile index 347e898..753837c 100644 --- a/x11-toolkits/linux-qt33/Makefile +++ b/x11-toolkits/linux-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile index 9a8361e..e6de52a 100644 --- a/x11-toolkits/mesgui/Makefile +++ b/x11-toolkits/mesgui/Makefile @@ -7,10 +7,9 @@ PORTNAME= mesgui PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Make a simple GUI under OpenGL @@ -18,16 +17,16 @@ COMMENT= Make a simple GUI under OpenGL LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes MAKE_ENV= OPT="${OPT}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes OPT= ${CFLAGS} -fPIC -DPIC -Iinclude \ `${SDL_CONFIG} --cflags` `freetype-config --cflags` \ - -I${LOCALBASE}/include -I${X11BASE}/include + -I${LOCALBASE}/include LDFLAGS= `${SDL_CONFIG} --libs` `freetype-config --libs` \ - -L${LOCALBASE}/lib -L${X11BASE}/lib + -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|^CC|#CC|g ; \ diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile index 6e29125..ff7cf12 100644 --- a/x11-toolkits/mowitz/Makefile +++ b/x11-toolkits/mowitz/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d USE_AUTOTOOLS= libtool:15 USE_XORG= xpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xawm=Xaw3d diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile index 6f0eb05..854c970 100644 --- a/x11-toolkits/neXtaw/Makefile +++ b/x11-toolkits/neXtaw/Makefile @@ -7,7 +7,7 @@ PORTNAME= neXtaw PORTVERSION= 0.15.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://siag.nu/pub/neXtaw/ @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Athena Widgets with N*XTSTEP appearance USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes +USE_XORG= xmu x11 xext GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes post-patch: diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index b6cd236..38c6cf5 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -10,7 +10,7 @@ PORTNAME= open-motif PORTVERSION= 2.2.3 PORTREVISION= 5 CATEGORIES= x11-toolkits -MASTER_SITES= http://ftp.motifzone.com/%SUBDIR%/ +MASTER_SITES= http://ftp.motifzone.com/%SUBDIR%/ MASTER_SITE_SUBDIR= om${PORTVERSION}/src DISTNAME= openMotif-${PORTVERSION} EXTRACT_SUFX= .tar.gz @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_XORG= xaw xbitmaps GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= LANG=C DEMOS_SRC= ${WRKSRC}/demos/programs diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index 261193e..ace18fb 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -44,7 +44,7 @@ MAN3= Prima::Clipboard.3.gz Prima::Drawable.3.gz Prima::File.3.gz Prima::Image.3 CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALL_MAN3="${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3" \ - INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${X11BASE}" + INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${LOCALBASE}" CONFIGURE_SCRIPT= Makefile.PL USE_XORG= x11 xpm xext xrender USE_PERL5= yes diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile index 03a8394..f2276fc 100644 --- a/x11-toolkits/p5-TclTk/Makefile +++ b/x11-toolkits/p5-TclTk/Makefile @@ -24,7 +24,7 @@ PERL_CONFIGURE= yes MAN3= Tcl::Tk.3 post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile.PL do-configure: -@cd ${CONFIGURE_WRKSRC} && \ diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile index 2fe2ac5..3d15025 100644 --- a/x11-toolkits/p5-Tk-TableMatrix/Makefile +++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= 5.8.0+ -CONFIGURE_ARGS= X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include +CONFIGURE_ARGS= X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include MAN3= Tk::TableMatrix.3 \ Tk::TableMatrix::Spreadsheet.3 \ diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 66362dd..e61dd5b 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -17,7 +17,7 @@ COMMENT= A re-port of a perl5 interface to Tk8.4 PERL_CONFIGURE= 5.8.0+ USE_XORG= x11 -CONFIGURE_ARGS= X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include +CONFIGURE_ARGS= X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include WRKSRC= ${WRKDIR}/${DISTNAME} MAN1= ptked.1 \ diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index 9ca35c3..5114ede 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -29,7 +29,7 @@ LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VER= 4 PLIST_SUB= SHLIB_VER="${SHLIB_VER}" diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile index ce0d341..caec539 100644 --- a/x11-toolkits/paragui/Makefile +++ b/x11-toolkits/paragui/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool:15 USE_SDL= sdl image ttf CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VER= 4 PLIST_SUB= SHLIB_VER="${SHLIB_VER}" diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile index 9333cae..ad775ff 100644 --- a/x11-toolkits/php-gtk/Makefile +++ b/x11-toolkits/php-gtk/Makefile @@ -24,7 +24,7 @@ IGNORE_WITH_PHP= 5 USE_GMAKE= yes USE_PERL5_BUILD=yes USE_GNOME= gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION} OPTIONS= LIBGLADE "GladeXML support in php-gtk" on \ @@ -68,7 +68,7 @@ PLIST_SUB+= GDKPIXBUF="@comment " .if !defined(WITHOUT_GTKHTML) USE_GNOME+= gtkhtml CONFIGURE_ARGS+= --enable-gtkhtml -ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0 +ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0 PLIST_SUB+= GTKHTML="" .else PLIST_SUB+= GTKHTML="@comment " diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile index 9333cae..ad775ff 100644 --- a/x11-toolkits/php-gtk2/Makefile +++ b/x11-toolkits/php-gtk2/Makefile @@ -24,7 +24,7 @@ IGNORE_WITH_PHP= 5 USE_GMAKE= yes USE_PERL5_BUILD=yes USE_GNOME= gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION} OPTIONS= LIBGLADE "GladeXML support in php-gtk" on \ @@ -68,7 +68,7 @@ PLIST_SUB+= GDKPIXBUF="@comment " .if !defined(WITHOUT_GTKHTML) USE_GNOME+= gtkhtml CONFIGURE_ARGS+= --enable-gtkhtml -ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0 +ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0 PLIST_SUB+= GTKHTML="" .else PLIST_SUB+= GTKHTML="@comment " diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index cd3ae23..fd90e4d 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -7,19 +7,19 @@ PORTNAME= plib PORTVERSION= 1.8.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ MAINTAINER= jylefort@FreeBSD.org COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math -USE_GL= yes +USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes CXXFLAGS+= -fPIC -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-build: ${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile index 9469499..ce7532f 100644 --- a/x11-toolkits/py-fox/Makefile +++ b/x11-toolkits/py-fox/Makefile @@ -9,7 +9,7 @@ PORTNAME= fox PORTVERSION= 1.0.5 PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= fxpy PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= FXPy-${PORTVERSION} @@ -30,7 +30,7 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-patch: - ${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/setup.py + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS}) diff --git a/x11-toolkits/py-fox/files/patch-setup b/x11-toolkits/py-fox/files/patch-setup index fb2d40f..0ebeea9 100644 --- a/x11-toolkits/py-fox/files/patch-setup +++ b/x11-toolkits/py-fox/files/patch-setup @@ -7,8 +7,8 @@ + XLIBINC = [] else: - XLIBDIR = ['/usr/X11R6/lib'] -+ XLIBDIR = ['%%X11BASE%%/lib'] -+ XLIBINC = ['%%X11BASE%%/include'] ++ XLIBDIR = ['%%LOCALBASE%%/lib'] ++ XLIBINC = ['%%LOCALBASE%%/include'] # Other libraries OLIBDIRS = ['c:\cygwin\usr\local\lib'] diff --git a/x11-toolkits/py-tkinter/files/setup.py b/x11-toolkits/py-tkinter/files/setup.py index 8bf615a..a3bd3da 100644 --- a/x11-toolkits/py-tkinter/files/setup.py +++ b/x11-toolkits/py-tkinter/files/setup.py @@ -18,7 +18,7 @@ except: tkversion = "8.4" prefix = sysconfig.PREFIX # Python 1.5 doesn't have os.getenv()? -x11base = os.environ['X11BASE'] or '/usr/X11R6' +x11base = os.environ['LOCALBASE'] or '/usr/X11R6' inc_dirs = [prefix + "/include", prefix + "/include/tcl" + tkversion, prefix + "/include/tk" + tkversion, diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile index 80e4d48..bfe8db0 100644 --- a/x11-toolkits/py-wmdockapps/Makefile +++ b/x11-toolkits/py-wmdockapps/Makefile @@ -23,6 +23,6 @@ PYDISTUTILS_PKGNAME= pywmdockapps USE_XORG= x11 xpm xau xext xfixes xi post-patch: - ${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py + ${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 6bb9435..1c4647d 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -98,7 +98,7 @@ PYDISTUTILS_BUILDARGS+= \ NO_HEADERS=1 \ NO_SCRIPTS=1 \ INSTALL_MULTIVERSION=0 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes . if defined(WITH_WXPYTHON_UNICODE) WX_UNICODE= yes diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile index 5b4f8de..45d5e83 100644 --- a/x11-toolkits/qscintilla/Makefile +++ b/x11-toolkits/qscintilla/Makefile @@ -31,7 +31,7 @@ OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on \ QMAKE= ${LOCALBASE}/bin/qmake SPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -PLUGINDIR= ${X11BASE}/lib/plugins/designer +PLUGINDIR= ${LOCALBASE}/lib/plugins/designer .include <bsd.port.pre.mk> @@ -89,9 +89,9 @@ post-configure: ${MV} Makefile.tmp Makefile && \ cd ${WRKSRC}/designer && \ ${CAT} designer.pro | ${GREP} -v lqscintilla > designer.tmp && \ - ${ECHO} "INCPATH += ${X11BASE}/include ../qt" >> \ + ${ECHO} "INCPATH += ${LOCALBASE}/include ../qt" >> \ designer.tmp && \ - ${ECHO} "LIBS += -L../qt -L${X11BASE}/lib -lqscintilla" >> \ + ${ECHO} "LIBS += -L../qt -L${LOCALBASE}/lib -lqscintilla" >> \ designer.tmp && \ ${ECHO} "DESTDIR = ." >> designer.tmp && \ ${MV} designer.tmp designer.pro ) diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 2c41a6c..f9564fc 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.3.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= x11-toolkits ipv6 MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -30,7 +30,6 @@ CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ USE_BZIP2= yes REINPLACE_ARGS= -i "" -USE_X_PREFIX= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -77,10 +76,10 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g} PREFIX_REAL!= /bin/realpath ${PREFIX} -# The previous Qt port versions installed qmake and qmake's specs under X11BASE +# The previous Qt port versions installed qmake and qmake's specs under LOCALBASE # The new devel/qmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: -.for d in ${X11BASE} ${LOCALBASE} ${PREFIX} +.for d in ${LOCALBASE} ${PREFIX} . if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h) QTBASE=$d PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++ @@ -157,7 +156,7 @@ CONFLICTS+= qt-3.3.* CONFLICTS+= qt-copy-[0-9]* .endif -.if exists(${X11BASE}/include/qt2/qapp.h) +.if exists(${LOCALBASE}/include/qt2/qapp.h) BROKEN= You have QT2 headers installed! Installing this port BROKEN+=will result in conflicts between QT3 and QT2! .endif diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 1be9f8b..8ab844b 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,7 +8,7 @@ PORTNAME= gui PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,7 +18,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface library -LIB_DEPENDS?= png:${PORTSDIR}/graphics/png +LIB_DEPENDS?= png:${PORTSDIR}/graphics/png \ + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib @@ -27,7 +28,8 @@ QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_XLIB= yes +USE_XORG= xrender xrandr xinerama inputproto xfixes sm xcursor \ + xext x11 ice xi xt ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile index 5431d53..9d2a82d 100644 --- a/x11-toolkits/qwt4/Makefile +++ b/x11-toolkits/qwt4/Makefile @@ -9,7 +9,7 @@ PORTNAME= qwt PORTVERSION= 4.2.0 PORTREVISION= 4 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR=qwt MAINTAINER= makc@issp.ac.ru diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 580088b..1407d5c 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= rep-gtk2 PORTVERSION= 0.18 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -21,7 +21,6 @@ LIB_DEPENDS= rep.13:${PORTSDIR}/lang/librep PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= libglade2 WANT_GNOME= yes diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile index 1ca0a8b..e2b43f2 100644 --- a/x11-toolkits/ruby-fox10/Makefile +++ b/x11-toolkits/ruby-fox10/Makefile @@ -9,8 +9,7 @@ PORTNAME= fox PORTVERSION= 1.0.29 PORTREVISION= 5 CATEGORIES= x11-toolkits ruby -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fxruby +MASTER_SITES= SF/fxruby PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= FXRuby-${PORTVERSION} DIST_SUBDIR= ruby @@ -39,7 +38,7 @@ DOCS_EN= ANNOUNCE ChangeLog README \ post-patch: ${RUBY} -i -p \ -e 'gsub %r:/usr/local\b:, "${LOCALBASE}"' \ - -e 'gsub %r:/usr/X11R6\b:, "${X11BASE}"' \ + -e 'gsub %r:/usr/X11R6\b:, "${LOCALBASE}"' \ ${WRKSRC}/ext/fox/extconf.rb post-install: diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 2e61dbd..049d867 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -35,11 +35,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README post-patch: general-patch - @${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/share|g' \ + @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/sample/gtk-demo/common.rb @${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \ ${WRKSRC}/sample/misc/button2.rb - @${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g' \ + @${REINPLACE_CMD} -e 's|/usr/local/share|${LOCALBASE}/share|g' \ ${WRKSRC}/sample/testgtk/testgtk* @${FIND} ${WRKSRC} -name '*.bak' -delete diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index ae596dd..68e9716 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTREVISION= ${RUBY_PORTREVISION} PORTEPOCH= 1 CATEGORIES+= x11-toolkits ruby tcl tk @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch USE_RUBY= yes USE_RUBY_EXTCONF= yes RUBY_EXTCONF_SUBDIRS= . tkutil -USE_XLIB= yes +USE_XORG= x11 WRKSRC= ${WRKDIR}/${PORTNAME} @@ -41,7 +41,7 @@ LIB_DEPENDS= tcl${TK_VERSION:S/.//}:${TCLPORTDIR}${TK_VERSION:C/[^0-9]//g} \ .include <bsd.port.pre.mk> CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ - --with-X11-dir=${X11BASE} \ + --with-X11-dir=${LOCALBASE} \ --with-tcl-include=${LOCALBASE}/include/tcl${TK_VERSION} \ --with-tk-include=${LOCALBASE}/include/tk${TK_VERSION} .if defined(WITH_TCLTK_JP) diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile index b1584739..7a0fdb7 100644 --- a/x11-toolkits/scx/Makefile +++ b/x11-toolkits/scx/Makefile @@ -26,7 +26,7 @@ EXPIRATION_DATE= 2007-10-28 PLIST_SUB= TARGET=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-patch: - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile index ee1f48d..a9432ef 100644 --- a/x11-toolkits/slingshot/Makefile +++ b/x11-toolkits/slingshot/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview WRKSRC= ${WRKDIR}/sspkg2.1 USE_LDCONFIG= yes USE_GMAKE= yes -MAKE_ENV= OPENWINHOME=${X11BASE} +MAKE_ENV= OPENWINHOME=${LOCALBASE} post-install: .if !defined(NOPORTDOCS) diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index aeccb78..d3ec517 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" -CONFIGURE_ARGS= --with-pthread=yes --with-coin=${X11BASE} +CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} USE_LDCONFIG= yes MAN1= soqt-config.1 diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh index 6a5a8a4..ab957af 100644 --- a/x11-toolkits/swt-devel/files/patch-build.sh +++ b/x11-toolkits/swt-devel/files/patch-build.sh @@ -10,7 +10,7 @@ export SWT_PTR_CFLAGS if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L${X11BASE}/lib64 ++ XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi fi diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak index e8e5ada..290378a 100644 --- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak @@ -14,7 +14,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -23,7 +23,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -31,7 +31,7 @@ -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 6a5a8a4..ab957af 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -10,7 +10,7 @@ export SWT_PTR_CFLAGS if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L${X11BASE}/lib64 ++ XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi fi diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak index 4c61c99..5c371d6 100644 --- a/x11-toolkits/swt/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt/files/patch-make_freebsd.mak @@ -14,7 +14,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -23,7 +23,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -31,7 +31,7 @@ -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile index e8b394f..56f66f2 100644 --- a/x11-toolkits/swt31/Makefile +++ b/x11-toolkits/swt31/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes MAKEFILE= make_freebsd.mak -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= BUILD=${SWT_VERSION} PLIST_FILES= %%JAVAJARDIR%%/swt.jar \ lib/libswt-atk-gtk-%%BUILD%%.so \ diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh index 9a0767c..2a9b186 100644 --- a/x11-toolkits/swt31/files/patch-build.sh +++ b/x11-toolkits/swt31/files/patch-build.sh @@ -8,7 +8,7 @@ + CC=%%CC%% + CXX=%%CXX%% + LD=%%CC%% -+ XTEST_LIB_PATH=$X11BASE/lib ++ XTEST_LIB_PATH=$LOCALBASE/lib + GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr" + GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib" + case $MODEL in diff --git a/x11-toolkits/swt31/files/patch-make_freebsd.mak b/x11-toolkits/swt31/files/patch-make_freebsd.mak index 37a5062..bb76702 100644 --- a/x11-toolkits/swt31/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt31/files/patch-make_freebsd.mak @@ -42,7 +42,7 @@ - -fpic \ + -I$(JAVA_HOME)/include/freebsd \ + -fpic -fPIC \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ ${SWT_PTR_CFLAGS} -LIBS = -shared -fpic -s +LIBS = -shared -fpic -fPIC -s diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile index 18dbfa4..580ab9f 100644 --- a/x11-toolkits/tile/Makefile +++ b/x11-toolkits/tile/Makefile @@ -19,7 +19,6 @@ USE_TK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}" TCL_INCLUDES= -I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile index 41cbe7f..4295e2a 100644 --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TCL84_PORT}:build \ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 WRKSRC= ${WRKDIR}/${DISTNAME}/unix/tk8.4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-sam \ --with-tclconfig="${PREFIX}/lib/tcl8.4" \ diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 16f5af1..e2a77c4 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -22,7 +22,7 @@ - eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" - TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1" -+ TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk84" ++ TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${LOCALBASE}/lib -lX11 -ltk84" # The Tcl SAM library # diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile index dec3bd4..da82dc3 100644 --- a/x11-toolkits/tk80/Makefile +++ b/x11-toolkits/tk80/Makefile @@ -290,8 +290,7 @@ post-configure: pre-build: @cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ - X11BASE="${X11BASE}" + SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} post-install: ${LN} -sf ${TK_LIB_FILE} ${PREFIX}/lib/${TK_LIB} diff --git a/x11-toolkits/tk80/files/Makefile.lib b/x11-toolkits/tk80/files/Makefile.lib index 866a2d4..ae5a1f3 100644 --- a/x11-toolkits/tk80/files/Makefile.lib +++ b/x11-toolkits/tk80/files/Makefile.lib @@ -1,7 +1,7 @@ NOPROFILE= yes LIB= tk80 TK_LIBRARY= ${PREFIX}/lib/tk80 -CFLAGS+= -I. -I./../generic -I../bitmaps -I$(X11BASE)/include \ +CFLAGS+= -I. -I./../generic -I../bitmaps -I$(LOCALBASE)/include \ -I${PREFIX}/include/tcl8.0/generic \ -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DSTDC_HEADERS=1 \ -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 \ diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile index db09c41..7427b86 100644 --- a/x11-toolkits/tkdnd/Makefile +++ b/x11-toolkits/tkdnd/Makefile @@ -21,7 +21,6 @@ USE_TK= yes USE_XORG= x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-tclinclude=${TCL_INCLUDEDIR} --with-tkinclude=${TK_INCLUDEDIR} --enable-shared CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile index 15c2aaa..b468aac 100644 --- a/x11-toolkits/tktray/Makefile +++ b/x11-toolkits/tktray/Makefile @@ -19,7 +19,6 @@ USE_TK= yes USE_XORG= x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-tkinclude=${TK_INCLUDEDIR} --enable-shared CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile index 02fea82..cd92e6a 100644 --- a/x11-toolkits/tktreectrl/Makefile +++ b/x11-toolkits/tktreectrl/Makefile @@ -18,7 +18,6 @@ USE_TK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}" TCL_INCLUDES= -I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic diff --git a/x11-toolkits/v/files/patch-configs-ConfigX.mk b/x11-toolkits/v/files/patch-configs-ConfigX.mk index 6dceb83..2f2ccad 100644 --- a/x11-toolkits/v/files/patch-configs-ConfigX.mk +++ b/x11-toolkits/v/files/patch-configs-ConfigX.mk @@ -39,8 +39,8 @@ -INCDIR += -I/usr/$(X11RV)/include -LIBDIR += -L/usr/$(X11RV)/lib -LIBS += -lV -lXmu -lXt -lXext -lX11 -lxm -+INCDIR += -I$(X11BASE)/include -+LIBDIR += -L$(X11BASE)/lib ++INCDIR += -I$(LOCALBASE)/include ++LIBDIR += -L$(LOCALBASE)/lib +LIBS += -lXmu -lXt -lXext -lX11 TARZ = RANLIB = ranlib diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile index 8ca82b1..368f8ac 100644 --- a/x11-toolkits/viewkit/Makefile +++ b/x11-toolkits/viewkit/Makefile @@ -7,7 +7,7 @@ PORTNAME= viewkit PORTVERSION= 0.00 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/viewkit/ \ ${MASTER_SITE_LOCAL} @@ -19,7 +19,6 @@ COMMENT= ViewKit workalike from Hungry Programmers USE_AUTOTOOLS= autoconf:261:env MOTIFPACKAGE?= open-motif -USE_X_PREFIX= yes USE_MOTIF= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-${MOTIFPACKAGE} diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile index 8acfedd..8c0e4a7 100644 --- a/x11-toolkits/viewklass/Makefile +++ b/x11-toolkits/viewklass/Makefile @@ -8,18 +8,16 @@ PORTNAME= viewklass PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ViewKlass-${PORTVERSION} MAINTAINER= araujo@FreeBSD.org COMMENT= C++ Framework for Motif -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -USE_X_PREFIX= yes USE_MOTIF= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 8c18795..e6b7129 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -8,7 +8,7 @@ PORTNAME= vte PORTVERSION= 0.16.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile index 09c448a..fbb6a43 100644 --- a/x11-toolkits/wmapp/Makefile +++ b/x11-toolkits/wmapp/Makefile @@ -17,7 +17,7 @@ COMMENT= A DockApp Graphics Library USE_XORG= x11 xpm USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= # empty PLIST_FILES= lib/libwmapp.a diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index c464c49..d6a0e4b 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,11 +7,10 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 15 +PORTREVISION?= 16 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org @@ -22,8 +21,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes @@ -38,12 +37,10 @@ CONFIGURE_ARGS= --with-libpng=sys \ --includedir=${PREFIX}/include/wx-2.4 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ -I${LOCALBASE}/include \ - -I${X11BASE}/include \ ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib \ ${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 1c434ff..b6e1a55 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 @@ -38,13 +38,11 @@ CONFIGURE_ARGS= --with-libpng=sys\ --with-mspack\ --with-gtk\ --disable-backtrace -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist @@ -56,7 +54,7 @@ CONFLICTS= wxgtk2-contrib-devel-2.5.2* .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -72,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.6 -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 7dd6aaa..f21d7dc 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 gconf2 @@ -44,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 @@ -54,7 +54,7 @@ PORTREVISION= 0 .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -70,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.8 -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 7dd6aaa..f21d7dc 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 gconf2 @@ -44,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 @@ -54,7 +54,7 @@ PORTREVISION= 0 .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -70,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.8 -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile index 32a248f..8ea1b34 100644 --- a/x11-toolkits/xclasses/Makefile +++ b/x11-toolkits/xclasses/Makefile @@ -9,8 +9,7 @@ PORTNAME= xclasses PORTVERSION= 1.4.0 PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xcmail +MASTER_SITES= SF/xcmail DISTNAME= Xclasses-public-${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org @@ -33,7 +32,7 @@ pre-configure: @${PERL} -pi \ -e "s|%%CXX%%|${CXX}|g;" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g;" \ - -e "s|%%X11BASE%%|${X11BASE}|g;" ${WRKSRC}/${file} + -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/${file} .endfor ${REINPLACE_CMD} -e 's|\([:alnum:]\)\\$$|\1 \\|' ${WRKSRC}/Makefile diff --git a/x11-toolkits/xclasses/files/patch-ac b/x11-toolkits/xclasses/files/patch-ac index e1f41f3..2da0aba 100644 --- a/x11-toolkits/xclasses/files/patch-ac +++ b/x11-toolkits/xclasses/files/patch-ac @@ -7,9 +7,9 @@ - INCLUDESDIR=${XCLASSESINCLUDE:-"/usr/local/include"} - LIBSDIR=${XCLASSESLIB:-"/usr/local/lib"} - CONFIGSDIR=${XCLASSESCONFIG:-"/usr/lib/X11/Xclasses"} -+ INCLUDESDIR=%%X11BASE%%/include/ -+ LIBSDIR=%%X11BASE%%/lib/ -+ CONFIGSDIR=%%X11BASE%%/share/Xclasses/ ++ INCLUDESDIR=%%LOCALBASE%%/include/ ++ LIBSDIR=%%LOCALBASE%%/lib/ ++ CONFIGSDIR=%%LOCALBASE%%/share/Xclasses/ ROOTID=0 if [ "$2" != "quit" ]; then @@ -38,7 +38,7 @@ # look for installed XPM lib MAKEXPM="y" - for N in /usr/include/X11 /usr/local/include/X11 -+ for N in %%X11BASE%%/include/X11/ ++ for N in %%LOCALBASE%%/include/X11/ do if [ -f "$N/xpm.h" ]; then MAKEXPM="n" @@ -47,7 +47,7 @@ # look for shapes - if [ -f "/usr/include/X11/extensions/shape.h" ]; then -+ if [ -f "%%X11BASE%%/include/X11/extensions/shape.h" ]; then ++ if [ -f "%%LOCALBASE%%/include/X11/extensions/shape.h" ]; then USESHAPE="y" else USESHAPE="n" diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index 1bc7c24..a3bf1b9 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -32,18 +32,18 @@ PATCHFILES= xforms-1.0-i18n_7.patch PATCH_DIST_STRIP= -p1 .endif -USE_XPM= yes +USE_XORG= xpm USE_GL= gl USE_IMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= fdesign.1 fd2ps.1 post-patch: ${REINPLACE_CMD} -e 's|-O4||' ${WRKSRC}/Imakefile -.if defined(X11BASE) -. if ${X11BASE} != "/usr/X11R6" - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ +.if defined(LOCALBASE) +. if ${LOCALBASE} != "/usr/X11R6" + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/image/rgb_db.c . endif .endif diff --git a/x11-toolkits/xg/files/patch-aa b/x11-toolkits/xg/files/patch-aa index 0f1e8f1..30390f1 100644 --- a/x11-toolkits/xg/files/patch-aa +++ b/x11-toolkits/xg/files/patch-aa @@ -6,7 +6,7 @@ # -MOTIF_INC = -CFLAGS = "-DUSE_XM_MWMUTIL_H -DUSE_XGPM -I../include ${MOTIF_INC}" -+MOTIF_INC = -I${X11BASE}/include -I${X11BASE}/include/X11 ++MOTIF_INC = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 +CFLAGS += -DUSE_XM_MWMUTIL_H -DUSE_XGPM -DV_USE_TM_ZONE -I../include ${MOTIF_INC} # diff --git a/x11-toolkits/xmhtml/files/patch-aa b/x11-toolkits/xmhtml/files/patch-aa index 88f171a..3339cbd 100644 --- a/x11-toolkits/xmhtml/files/patch-aa +++ b/x11-toolkits/xmhtml/files/patch-aa @@ -119,10 +119,10 @@ # Platform specific includes ifeq ($(PLATFORM),Motif) -! PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include +! PLATFORMINC=-I../../include/XmHTML -I${LOCALBASE}/include else ifeq ($(PLATFORM),gtk) -! PLATFORMINC=-I../../include/gtk-xmhtml -I${X11BASE}/include +! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include endif endif @@ -142,7 +142,7 @@ # Motif version (default) ifeq ($(PLATFORM),Motif) -! LIBDIR = -L${X11BASE}/lib +! LIBDIR = -L${LOCALBASE}/lib # This is what is required under Linux (Motif 2.0.1). # Your mileage may vary. ! LIBS = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index 74e0775..85efa7b 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -7,7 +7,7 @@ PORTNAME= xview-clients PORTVERSION= 3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.efd.lth.se/pub/X11/ \ ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \ @@ -23,7 +23,6 @@ PATCH_DEPENDS= ${NONEXISTENT}:${.CURDIR}/../xview:patch LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview USE_IMAKE= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME} ALL_TARGET= Clients diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile index 279a204..c984dd2 100644 --- a/x11-toolkits/xview/Makefile +++ b/x11-toolkits/xview/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ REINPLACE_ARGS= -i "" USE_IMAKE= yes USE_LDCONFIG= yes -IMAKEINCLUDE= "-I${X11BASE}/lib/X11/config -I${WRKSRC}/config" +IMAKEINCLUDE= "-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World SUB_FILES= pkg-message @@ -41,7 +41,7 @@ pre-configure: ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl - @${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \ + @${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ ${X11BASE2FIX:C|^|${WRKSRC}/|} diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index ca44b13..f96a15d 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -7,17 +7,17 @@ PORTNAME= aewm PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.red-bean.com/~decklin/software/aewm/ MAINTAINER= ports@FreeBSD.org COMMENT= ICCCM-compliant window manager based on 9wm -USE_X_PREFIX= yes +USE_XORG= x11 xext xt xaw WANT_GNOME= yes USE_GMAKE= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}" MAN1= aeclients.1 aewm.1 diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile index aec0e3d..6c14d4e 100644 --- a/x11-wm/afterstep-i18n/Makefile +++ b/x11-wm/afterstep-i18n/Makefile @@ -7,7 +7,7 @@ PORTNAME= afterstep-i18n PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm afterstep MASTER_SITES= ${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -30,8 +30,7 @@ COMMENT= The NeXTstep clone window manager with Fontset support RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock DIST_SUBDIR= afterstep -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index fc9e092..3d4a348 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -7,7 +7,7 @@ PORTNAME= afterstep PORTVERSION= 2.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm afterstep MASTER_SITES= ftp://ftp.afterstep.org/stable/ \ ${MASTER_SITE_SOURCEFORGE} @@ -26,7 +26,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif -RUN_DEPENDS= ${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli +RUN_DEPENDS= xli:${PORTSDIR}/graphics/xli USE_BZIP2= yes USE_GNOME= glib20 gtk20 pango diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile index a4a0d7e..7ed8656 100644 --- a/x11-wm/ahwm/Makefile +++ b/x11-wm/ahwm/Makefile @@ -8,14 +8,14 @@ PORTNAME= ahwm PORTVERSION= 0.90 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://people.cs.uchicago.edu/~ahiorean/ahwm/ MAINTAINER= ports@FreeBSD.org COMMENT= An X11 window manager -USE_XLIB= yes +USE_XORG= x11 xext GNU_CONFIGURE= yes MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile index 2ce60b5..bd22dbc 100644 --- a/x11-wm/alloywm/Makefile +++ b/x11-wm/alloywm/Makefile @@ -7,7 +7,7 @@ PORTNAME= alloywm PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.phatboydesigns.net/devel/ @@ -17,10 +17,10 @@ COMMENT= Has title bars, shading, resizing, automatic placement, window list BROKEN= Checksum mismatch HAS_CONFIGURE= yes -CONFIGURE_ARGS= --xroot=${X11BASE} +CONFIGURE_ARGS= --xroot=${LOCALBASE} PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 WANT_GNOME= yes REINPLACE_ARGS= -i'' -E SCRIPTS= ${WRKSRC}/scriptdir @@ -35,11 +35,11 @@ pre-configure: do-build: cd ${WRKSRC}/goodies && ${GMAKE} .for ii in client events main misc new screen widgets - cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${X11BASE}/include \ + cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${LOCALBASE}/include \ ${ii}.c .endfor cd ${WRKSRC}/src && ${CC} ${CFLAGS} -DSHAPE -o alloywm \ - -L${X11BASE}/lib -lXext -lX11 \ + -L${LOCALBASE}/lib -lXext -lX11 \ client.o events.o main.o misc.o new.o screen.o widgets.o pre-install: diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile index 544b1aa..5dd6a2a 100644 --- a/x11-wm/amaterus/Makefile +++ b/x11-wm/amaterus/Makefile @@ -7,7 +7,7 @@ PORTNAME= amaterus PORTVERSION= 0.34.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.taiyaki.org/amaterus/src/ @@ -16,7 +16,6 @@ COMMENT= A GTK+ window manager LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml -USE_XLIB= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile index 6c7f3e8..8cea2be 100644 --- a/x11-wm/amiwm/Makefile +++ b/x11-wm/amiwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= amiwm PORTVERSION= 0.20.p48 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ \ http://www.plig.org/xwinman/archive/amiwm/ @@ -18,7 +18,7 @@ COMMENT= A window manager that makes your desktop look like an Amiga(TM) GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_X11_EXTENSIONS_SHAPE_H" -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xmu MAN1= amiwm.1 post-install: diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 6a14744..9dc0b40 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -19,7 +20,7 @@ LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 -USE_XLIB= yes +USE_XORG= x11 xft xext xinerama xt xrandr xproto MAN1= awesome.1 \ awesome-client.1 diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile index 6a14744..9dc0b40 100644 --- a/x11-wm/awesome2/Makefile +++ b/x11-wm/awesome2/Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -19,7 +20,7 @@ LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 -USE_XLIB= yes +USE_XORG= x11 xft xext xinerama xt xrandr xproto MAN1= awesome.1 \ awesome-client.1 diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile index 54cb257..72bfdd8 100644 --- a/x11-wm/badwm/Makefile +++ b/x11-wm/badwm/Makefile @@ -7,17 +7,16 @@ PORTNAME= badwm PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= BadWM-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Window manager based on evilwm -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile index 2f782e4..4bf175d 100644 --- a/x11-wm/bbconf/Makefile +++ b/x11-wm/bbconf/Makefile @@ -7,15 +7,14 @@ PORTNAME= bbconf PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Configurator for the Blackbox window manager -USE_X_PREFIX= yes +USE_XORG= x11 USE_QT_VER= 3 USE_PERL5_BUILD= yes GNU_CONFIGURE= yes diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile index 0ed0232..33023f8 100644 --- a/x11-wm/beryl-core/Makefile +++ b/x11-wm/beryl-core/Makefile @@ -32,8 +32,8 @@ USE_PERL5= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --disable-berylmesa -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_XORG= xcomposite xfixes xdamage xrandr ice sm xinerama glproto diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile index d69a6b9..c40b3d5 100644 --- a/x11-wm/beryl-manager/Makefile +++ b/x11-wm/beryl-manager/Makefile @@ -25,8 +25,8 @@ USE_GNOME= glib20 gtk20 INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAN1= beryl-manager.1 diff --git a/x11-wm/beryl-plugins-unsupported/Makefile b/x11-wm/beryl-plugins-unsupported/Makefile index 5695175..d7fadcd 100644 --- a/x11-wm/beryl-plugins-unsupported/Makefile +++ b/x11-wm/beryl-plugins-unsupported/Makefile @@ -28,7 +28,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile index 49a0a64..41e01c1 100644 --- a/x11-wm/beryl-plugins/Makefile +++ b/x11-wm/beryl-plugins/Makefile @@ -31,8 +31,8 @@ USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= DBUS "Enable dbus support" On diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile index 80b29eb..44eeb47 100644 --- a/x11-wm/beryl-settings/Makefile +++ b/x11-wm/beryl-settings/Makefile @@ -31,7 +31,7 @@ USE_PYTHON= 2.4+ INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile index f921330..b0840f8 100644 --- a/x11-wm/blwm/Makefile +++ b/x11-wm/blwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= blwm PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm portuguese MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -22,8 +22,7 @@ MAN1= blwm.1x PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes MAKEFILE= Makefile.std -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice sm xext xpm DOCS= AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO post-patch: diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std index 93729e3..fed87a0 100644 --- a/x11-wm/blwm/files/patch-Makefile.std +++ b/x11-wm/blwm/files/patch-Makefile.std @@ -5,7 +5,7 @@ # Directory of X Window System # -XDIR = /usr/X11R6 -+XDIR = $(X11BASE) ++XDIR = $(LOCALBASE) # # Directory where you install blwm binary diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile index eb008cf..4ca7577 100644 --- a/x11-wm/clementine/Makefile +++ b/x11-wm/clementine/Makefile @@ -7,27 +7,26 @@ PORTNAME= clementine PORTVERSION= 0.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Has title bars, iconizing, and styles (unstable) RUN_DEPENDS= xv:${PORTSDIR}/graphics/xv \ - rxvt:${PORTSDIR}/x11/rxvt + rxvt:${PORTSDIR}/x11/rxvt PLIST= ${WRKDIR}/pkg-plist PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 DOCS= COPYING HISTORY LICENSE REINPLACE_ARGS= -i'' -E post-patch: ${REINPLACE_CMD} 's:^CFLAGS:IGNORE:g ; s:^DEFINES:IGNORE:g ;\ - s:/usr/X11R6:${X11BASE}:g' \ + s:/usr/X11R6:${LOCALBASE}:g' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} 's:./clementine:${PREFIX}/bin/clementine:g' \ ${WRKSRC}/windowmanager.cpp diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile index 83ab1ab..e63a8a3 100644 --- a/x11-wm/compiz-fusion-plugins-extra/Makefile +++ b/x11-wm/compiz-fusion-plugins-extra/Makefile @@ -49,8 +49,8 @@ GCONF_SCHEMAS= compiz-addhelper.schemas \ compiz-widget.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas post-patch: diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile index afd68ec..fc28ad9 100644 --- a/x11-wm/compiz-fusion-plugins-main/Makefile +++ b/x11-wm/compiz-fusion-plugins-main/Makefile @@ -51,8 +51,8 @@ GCONF_SCHEMAS= compiz-animation.schemas \ compiz-shift.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile index 164a731..6cdac08 100644 --- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile +++ b/x11-wm/compiz-fusion-plugins-unsupported/Makefile @@ -35,8 +35,8 @@ GCONF_SCHEMAS= compiz-fakeargb.schemas \ compiz-tile.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 83ab1ab..e63a8a3 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -49,8 +49,8 @@ GCONF_SCHEMAS= compiz-addhelper.schemas \ compiz-widget.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas post-patch: diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index afd68ec..fc28ad9 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -51,8 +51,8 @@ GCONF_SCHEMAS= compiz-animation.schemas \ compiz-shift.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index 164a731..6cdac08 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -35,8 +35,8 @@ GCONF_SCHEMAS= compiz-fakeargb.schemas \ compiz-tile.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index 2617801..ca7d43c 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -60,8 +60,8 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-zoom.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= RSVG "Enable librsvg2 support" on \ GTK "Enable gtk2 support" on \ diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 1b40b99..b20fd60 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -18,7 +18,7 @@ COMMENT= An extension to twm, with support for multiple virtual screens, etc LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= ctwm.1 .include <bsd.port.pre.mk> diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk index 06a9cda..c890eb9 100644 --- a/x11-wm/dwm/files/patch-config.mk +++ b/x11-wm/dwm/files/patch-config.mk @@ -11,8 +11,8 @@ -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib -+X11INC = $(X11BASE)/include -+X11LIB = $(X11BASE)/lib ++X11INC = $(LOCALBASE)/include ++X11LIB = $(LOCALBASE)/lib # includes and libs INCS = -I. -I/usr/include -I${X11INC} diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index a2f8d56..b0f17f2 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -7,29 +7,25 @@ PORTNAME= enlightenment PORTVERSION= 0.16.8.13 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= e16-${PORTVERSION}-0.01 MAINTAINER= vanilla@FreeBSD.org COMMENT= A very artistic X window manager -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - DATADIR= ${PREFIX}/share/e16 -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xft x11 USE_ICONV= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \ --disable-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_ESOUND) USE_GNOME= esound diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile index acd7677..7b73082 100644 --- a/x11-wm/e16utils/Makefile +++ b/x11-wm/e16utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= e16utils PORTVERSION= 0.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://public.planetmirror.com/pub/enlightenment/e16utils/ @@ -19,7 +19,6 @@ COMMENT= Standalone menu and keybinding editors for enlightment 0.16 LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm -USE_X_PREFIX= yes USE_GNOME= imlib SUB_STUBS= e16menuedit-0.1 e16keyedit-0.2 diff --git a/x11-wm/e16utils/files/patch-e16keyedit-0.2 b/x11-wm/e16utils/files/patch-e16keyedit-0.2 index ddb211f..2b6ab68 100644 --- a/x11-wm/e16utils/files/patch-e16keyedit-0.2 +++ b/x11-wm/e16utils/files/patch-e16keyedit-0.2 @@ -8,7 +8,7 @@ $FreeBSD$ LIB_DIRS = \ - -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib -+ -L${LOCALBASE}/lib -L${X11BASE}/lib ++ -L${LOCALBASE}/lib LIBS = \ - `gtk-config --libs` -lgdbm -lgdk_imlib -CFLAGS = \ diff --git a/x11-wm/e16utils/files/patch-e16menuedit-0.1 b/x11-wm/e16utils/files/patch-e16menuedit-0.1 index 038511f..91244e3 100644 --- a/x11-wm/e16utils/files/patch-e16menuedit-0.1 +++ b/x11-wm/e16utils/files/patch-e16menuedit-0.1 @@ -8,7 +8,7 @@ $FreeBSD$ LIB_DIRS = \ - -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib -+ -L${LOCALBASE}/lib -L${X11BASE}/lib ++ -L${LOCALBASE}/lib LIBS = \ - `gtk-config --libs` -lgdbm -lgdk_imlib -CFLAGS = \ diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile index 4a09972..b6efd2e 100644 --- a/x11-wm/ede/Makefile +++ b/x11-wm/ede/Makefile @@ -7,9 +7,9 @@ PORTNAME= ede PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ede +MASTER_SITES= SF MAINTAINER= sem@FreeBSD.org COMMENT= Equinox Desktop Environment @@ -18,7 +18,7 @@ LIB_DEPENDS= efltk.2:${PORTSDIR}/x11-toolkits/efltk WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS}" diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 3bcd63f..eba2179 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -32,8 +32,8 @@ MAN1= emerald.1 \ emerald-theme-manager.1 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" # XXX - might want to change that post-patch: diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile index c1d9898..2727914 100644 --- a/x11-wm/enlightenment-docs/Makefile +++ b/x11-wm/enlightenment-docs/Makefile @@ -7,18 +7,17 @@ PORTNAME= enlightenment-docs PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= enlightenment +MASTER_SITES= SF DISTNAME= e16-docs-${PORTVERSION}-0.02 MAINTAINER= vanilla@FreeBSD.org COMMENT= Data files of enlightenment DOX -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index a2f8d56..b0f17f2 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -7,29 +7,25 @@ PORTNAME= enlightenment PORTVERSION= 0.16.8.13 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= e16-${PORTVERSION}-0.01 MAINTAINER= vanilla@FreeBSD.org COMMENT= A very artistic X window manager -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - DATADIR= ${PREFIX}/share/e16 -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xft x11 USE_ICONV= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \ --disable-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_ESOUND) USE_GNOME= esound diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile index 593c5bd..47a673a 100644 --- a/x11-wm/epiwm/Makefile +++ b/x11-wm/epiwm/Makefile @@ -7,13 +7,14 @@ PORTNAME= epiwm PORTVERSION= 0.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.nongnu.org/epiwm/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Another fast, small, configurable window manager +USE_XORG= x11 xpm USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile index 37db5ed..677b0c6 100644 --- a/x11-wm/evilwm/Makefile +++ b/x11-wm/evilwm/Makefile @@ -23,8 +23,8 @@ PLIST_FILES= bin/evilwm CFLAGS+= -DSOLIDDRAG -DINFOBANNER -DVWM -DSHAPE -DMOUSE -DSNAP \ -DSTDIO -DCOLOURMAP -DVERSION=\\\"${PORTVERSION}\\\" \ - -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib -lX11 -lXext + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -lX11 -lXext do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile index 2638e4f..e7500fb 100644 --- a/x11-wm/expocity/Makefile +++ b/x11-wm/expocity/Makefile @@ -7,7 +7,7 @@ PORTNAME= expocity PORTVERSION= 2.6.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= http://www.pycage.de/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -20,14 +20,14 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFLICTS= metacity* USE_BZIP2= yes -USE_X_PREFIX= yes +USE_X11= x11 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack gnomehier gconf2 libglade2 GCONF_SCHEMAS= metacity.schemas USE_GETTEXT= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile index 0405e4e..2fc9ecf 100644 --- a/x11-wm/fbcmd/Makefile +++ b/x11-wm/fbcmd/Makefile @@ -25,7 +25,7 @@ USE_XORG= x11 xmu PLIST_FILES= bin/fbcmd post-extract: - @${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fbcmd ${PREFIX}/bin diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile index f337905..c309296 100644 --- a/x11-wm/fluxspace/Makefile +++ b/x11-wm/fluxspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= fluxspace PORTVERSION= 0.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= SF @@ -18,7 +18,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 BROKEN= Checksum mismatch -USE_XLIB= yes +USE_XORG= x11 USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 @@ -29,7 +29,7 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if defined(WITH_IDESK) || exists(${X11BASE}/bin/idesk) +.if defined(WITH_IDESK) || exists(${LOCALBASE}/bin/idesk) RUN_DEPENDS+= idesk:${PORTSDIR}/x11/idesk .endif .if defined(WITH_ROX-FILER) || exists(${LOCALBASE}/bin/rox) diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile index ac39ccf..3cb5619 100644 --- a/x11-wm/fluxter/Makefile +++ b/x11-wm/fluxter/Makefile @@ -7,14 +7,14 @@ PORTNAME= fluxter PORTVERSION= 0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://benedict.isomedia.com/homes/stevencooper/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Desktop pager for the Fluxbox Slit -USE_X_PREFIX= yes +USE_XORG= x11 ice xproto xt xaw xext GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index c6fbb78..2a8ab57 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -7,9 +7,9 @@ PORTNAME= fvwm95-i18n PORTVERSION= 2.0.43a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= fvwm95 DISTNAME= fvwm95-2.0.43a-Autoconf DISTFILES= ${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz @@ -23,14 +23,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Win95 lookalike fvwm2 window manager with an I18N patch LIB_DEPENDS= rplay.1:${PORTSDIR}/audio/rplay -RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons +RUN_DEPENDS= ${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons EXTRACT_ONLY= ${DISTNAME}.tgz ${PORTNAME}-${PORTVERSION}-portKit-19981123.tgz -USE_X_PREFIX= yes -USE_XPM= yes -USE_XORG= xbitmaps + +USE_XORG= xbitmaps x11 xpm xmu xext GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ +CONFIGURE_ARGS= --x-includes=${LOCALBASE}/include \ --includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib CONFIGURE_ENV= INSTALL_MAN="${INSTALL_MAN}" MAN1= fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile index a42f17b..ad330ea 100644 --- a/x11-wm/fvwm95/Makefile +++ b/x11-wm/fvwm95/Makefile @@ -7,10 +7,9 @@ PORTNAME= fvwm95 PORTVERSION= 2.0.43a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-Autoconf EXTRACT_SUFX= .tgz @@ -18,11 +17,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Win95 lookalike version of the fvwm2 window manager LIB_DEPENDS= rplay.1:${PORTSDIR}/audio/rplay -RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons +RUN_DEPENDS= ${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons -USE_X_PREFIX= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xpm xmu xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \ --libdir=${LOCALBASE}/lib diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile index bd42ec6..a71b1ac 100644 --- a/x11-wm/golem/Makefile +++ b/x11-wm/golem/Makefile @@ -7,10 +7,9 @@ PORTNAME= golem PORTVERSION= 0.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Small window manager with themes and plugins @@ -23,14 +22,14 @@ PLIST_SUB+= NO_SOUND="" PLIST_SUB+= NO_SOUND="@comment " .endif +USE_XORG= x11 xext xpm +GNU_CONFIGURE= yes + .if defined(WANT_XINERAMA) CONFIGURE_ARGS+= --enable-xinerama +USE_XORG+= xinerama .endif -USE_X_PREFIX= yes -USE_XPM= yes -GNU_CONFIGURE= yes - MANCOMPRESSED= yes MAN1= golem.1 diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile index a1855dd..62f16ea 100644 --- a/x11-wm/gwm/Makefile +++ b/x11-wm/gwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwm PORTVERSION= 1.8d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://koala.ilog.fr/ftp/pub/gwm/ EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generic Window Manager USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= gwm.1 DEPRECATED= Project is dead diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index 505fd8a..651f6dc 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= xmonad:${PORTSDIR}/x11-wm/xmonad LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index a5fd4b2..7a317d8 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ @@ -17,7 +18,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index cfb5731..d0ddaaa 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -7,6 +7,7 @@ PORTNAME= icewm PORTVERSION= 1.2.35 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF @@ -14,6 +15,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Window Manager designed for speed, usability and consistency WANT_GNOME= yes +USE_XORG= x11 ice xinerama xext USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile index 7f140e9..6c07b8f 100644 --- a/x11-wm/ion-2/Makefile +++ b/x11-wm/ion-2/Makefile @@ -8,7 +8,7 @@ PORTNAME= ion-2 PORTVERSION= 20040729 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -17,7 +17,7 @@ COMMENT= A tiling tabbed window manager CONFLICTS= ion-2002* ion-devel-* pwm-* -USE_X_PREFIX= yes +USE_XORG= x11 xext xinerama USE_AUTOTOOLS= libtool:15 libltdl:15 USE_LUA= 5.0 USE_GMAKE= yes diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk index 80061f5..a9391de 100644 --- a/x11-wm/ion-2/files/patch-system.mk +++ b/x11-wm/ion-2/files/patch-system.mk @@ -55,7 +55,7 @@ ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=$(X11BASE) ++X11_PREFIX=$(LOCALBASE) # SunOS/Solaris #X11_PREFIX=/usr/openwin diff --git a/x11-wm/ion/files/patch-system.mk b/x11-wm/ion/files/patch-system.mk index e08a035..bee9da4 100644 --- a/x11-wm/ion/files/patch-system.mk +++ b/x11-wm/ion/files/patch-system.mk @@ -29,7 +29,7 @@ ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=$(X11BASE) ++X11_PREFIX=$(LOCALBASE) # SunOS/Solaris #X11_PREFIX=/usr/openwin diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile index 44aacfa..12d31f8 100644 --- a/x11-wm/jewel/Makefile +++ b/x11-wm/jewel/Makefile @@ -26,7 +26,7 @@ post-patch: s|^CFLAGS|#CFLAGS|g; \ s|^prefix|#prefix|g; \ s|prefix|PREFIX|g; \ - s|/usr/X11R6|${X11BASE}|g; \ + s|/usr/X11R6|${LOCALBASE}|g; \ s|CC|CXX|g; \ s|CFLAGS|CXXFLAGS|g' \ ${WRKSRC}/Makefile diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index 7772244..473d9d2 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -21,9 +21,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_XORG= xpm GNU_CONFIGURE= yes USE_BZIP2= yes -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= jwm.1 diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile index bd21e9f..ee6cf2f 100644 --- a/x11-wm/kahakai/Makefile +++ b/x11-wm/kahakai/Makefile @@ -7,19 +7,16 @@ PORTNAME= kahakai PORTVERSION= 0.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= xcas@cox.net COMMENT= Kahakai window manager BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \ - ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -RUN_DEPENDS= \ - ${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts + ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts BROKEN= Does not compile @@ -28,6 +25,7 @@ DEPRECATED= "Development ceased" USE_AUTOTOOLS= libtool:15 USE_PERL5_BUILD=yes USE_BZIP2= yes +USE_XORG= x11 xft USE_GMAKE= yes GNU_CONFIGURE= yes USE_PYTHON= yes @@ -37,9 +35,9 @@ USE_EFL= imlib2 MAN1= kahakai.1 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS=${PTHREAD_CFLAGS} \ - LDFLAGS=-L${X11BASE}/lib \ + LDFLAGS=-L${LOCALBASE}/lib \ LIBS=${PTHREAD_LIBS} .include <bsd.port.pre.mk> @@ -49,7 +47,7 @@ BROKEN= "Does not compile on alpha 4.x" .endif post-patch: - @${REINPLACE_CMD} -e 's|/tmp/ktest|${X11BASE}|' \ + @${REINPLACE_CMD} -e 's|/tmp/ktest|${LOCALBASE}|' \ ${WRKSRC}/data/styles/Default.kastyle.in @${REINPLACE_CMD} -e 's|bool max|bool wmax|' \ ${WRKSRC}/src/Window.hh diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile index 6a5305c..e192006 100644 --- a/x11-wm/kompmgr/Makefile +++ b/x11-wm/kompmgr/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= bin/kompmgr do-build: cd ${WRKSRC}/kwin/kompmgr && \ - ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib -lX11 -lXdamage\ + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXdamage\ -lXfixes -lXrender -lXcomposite -lm -o kompmgr kompmgr.c do-install: diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile index 7c58cc9..8c017d9 100644 --- a/x11-wm/libcompizconfig/Makefile +++ b/x11-wm/libcompizconfig/Makefile @@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack intltool libxml2 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile index 6d32099..6ca92bd 100644 --- a/x11-wm/libdockapp/Makefile +++ b/x11-wm/libdockapp/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdockapp PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/ @@ -18,12 +18,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/^lib//}-${PORTVERSION} USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xext xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-font --without-examples -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 2866917..b252875 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -8,6 +8,7 @@ PORTNAME= metacity PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,8 +21,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFLICTS= expocity-[0-9]* USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes +USE_XORG= x11 xcomposite xdamage USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile index 9e52116..3c521ce 100644 --- a/x11-wm/mlvwm/Makefile +++ b/x11-wm/mlvwm/Makefile @@ -22,7 +22,7 @@ EXPIRATION_DATE= 2007-10-28 USE_IMAKE= yes USE_PERL5_BUILD=yes -USE_XPM= yes +USE_XORG= xpm MAN1= mlvwm.1 MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile index 9e5e023..f99d4de 100644 --- a/x11-wm/novawm/Makefile +++ b/x11-wm/novawm/Makefile @@ -7,23 +7,21 @@ PORTNAME= novawm PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= NovaWM-${PORTVERSION}_alpha MAINTAINER= ports@FreeBSD.org COMMENT= A window manager for X, developed with speed, size, and style in mind USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xpm USE_GMAKE= yes GNU_CONFIGURE= yes -MAKE_ARGS= INCLUDES=-I${X11BASE}/include \ +MAKE_ARGS= INCLUDES=-I${LOCALBASE}/include \ CXXFLAGS="${CXXFLAGS} -D_WIN_GNOME_SUPPORT" \ - novawm_LDFLAGS=-L${X11BASE}/lib + novawm_LDFLAGS=-L${LOCALBASE}/lib PLIST_FILES= bin/novawm .if !defined(NOPORTDOCS) diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile index 96ece32..6f711f1 100644 --- a/x11-wm/olvwm/Makefile +++ b/x11-wm/olvwm/Makefile @@ -28,7 +28,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= olvwm.1 olvwmrc.1 XFREE86_HTML_MAN= no diff --git a/x11-wm/orion/Makefile b/x11-wm/orion/Makefile index f40f724..510372f 100644 --- a/x11-wm/orion/Makefile +++ b/x11-wm/orion/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm scheme MASTER_SITES= ftp://ftp.scsh.net/pub/scsh/packages/orion-wm/ @@ -17,8 +17,8 @@ COMMENT= An X11 window manager written in Scheme RUN_DEPENDS= ${LOCALBASE}/lib/scsh/0.6/module-system:${PORTSDIR}/devel/sunterlib \ ${LOCALBASE}/lib/scsh/0.6/scx:${PORTSDIR}/x11-toolkits/scx -USE_X_PREFIX= yes NO_BUILD= yes +USE_XORG= x11 DEPRECATED= Version branch long since retired EXPIRATION_DATE= 2007-10-28 diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile index 5a20c65..7408835 100644 --- a/x11-wm/pager/Makefile +++ b/x11-wm/pager/Makefile @@ -7,7 +7,7 @@ PORTNAME= pager PORTVERSION= 0.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ http://mirror2.unixfreunde.de/ @@ -21,7 +21,7 @@ RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish USE_GMAKE= yes MAKEFILE= GNUmakefile -USE_XLIB= yes +USE_XORG= x11 SAWFISH_VERSION= `${LOCALBASE}/bin/sawfish --version 2>&1 | \ ${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'` diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile index a432c9a..98d67c2 100644 --- a/x11-wm/pawm/Makefile +++ b/x11-wm/pawm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pawm PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.pleyades.net/pawm/files/ @@ -15,14 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Puto Amo Window Manager USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xrandr xrender xpm USE_GMAKE= yes MAKEFILE= Makefile.in MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o" -CFLAGS+= -I. -I${X11BASE}/include -DNDEBUG -LDFLAGS= -lm -L${X11BASE}/lib -lXpm +CFLAGS+= -I. -I${LOCALBASE}/include -DNDEBUG +LDFLAGS= -lm -L${LOCALBASE}/lib -lXpm .include <bsd.port.pre.mk> diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile index 0729768..ab6b541 100644 --- a/x11-wm/peksystray/Makefile +++ b/x11-wm/peksystray/Makefile @@ -7,16 +7,15 @@ PORTNAME= peksystray PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A system tray dockapp similar to the GNOME notification area applet USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm USE_GNOME= gnometarget GNU_CONFIGURE= yes diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 902a574..a813dac 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pekwm PORTVERSION= 20060417 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://bsd-unix.org/downloads/ \ http://pekwm.org/files/ @@ -16,15 +16,13 @@ DISTNAME= ${PORTNAME}-0.1.5 MAINTAINER= xcas@cox.net COMMENT= A windowmanager based on aewm++ -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xft xpm x11 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile index d4d6f4f..109135e 100644 --- a/x11-wm/phluid/Makefile +++ b/x11-wm/phluid/Makefile @@ -7,19 +7,17 @@ PORTNAME= phluid PORTVERSION= 0.0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= phluid +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A window manager that emphasizes efficiency, speed, and beauty -USE_X_PREFIX= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" .include <bsd.port.mk> diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile index 0110cfd..047c9ca 100644 --- a/x11-wm/piewm/Makefile +++ b/x11-wm/piewm/Makefile @@ -7,7 +7,7 @@ PORTNAME= piewm PORTVERSION= 1.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.crynwr.com/piewm/ @@ -16,8 +16,7 @@ COMMENT= A tvtwm with pie (circular) menus DISABLE_SIZE= yes USE_IMAKE= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm MAN1= piewm.1 .include <bsd.port.mk> diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile index 9e6373e..07c9497 100644 --- a/x11-wm/pwm/Makefile +++ b/x11-wm/pwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pwm PORTVERSION= 2007.07.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ \ http://schot.a-eskwadraat.nl/files/ @@ -18,7 +18,7 @@ COMMENT= A lightweight window manager with emphasis on usability USE_XORG= x11 USE_GMAKE= yes -MAKE_ENV= X11_PREFIX="${X11BASE}" HAS_SYSTEM_ASPRINTF=1 +MAKE_ENV= X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1 MAN1= pwm.1x diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile index 36750c0..30f33e7 100644 --- a/x11-wm/qvwm/Makefile +++ b/x11-wm/qvwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= qvwm PORTVERSION= 1.1.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \ ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/ @@ -15,9 +15,8 @@ MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Windows 95/98/NT like window manager for X11 -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm xscrnsaver USE_GNOME= esound imlib -USE_XPM= yes GNU_CONFIGURE= yes MAN1= qvwm.1x diff --git a/x11-wm/ratmen/files/patch-Makefile b/x11-wm/ratmen/files/patch-Makefile index 9bd308c..771898c 100644 --- a/x11-wm/ratmen/files/patch-Makefile +++ b/x11-wm/ratmen/files/patch-Makefile @@ -17,8 +17,8 @@ -LIBS = -L/usr/X11R6/lib -lX11 -CFLAGS = $(OPTIMIZE) $(WARN) $(DEBUG) +CC ?= gcc -+LIBS = -L$(X11BASE)/lib -lX11 -+CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(X11BASE)/include ++LIBS = -L$(LOCALBASE)/lib -lX11 ++CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(LOCALBASE)/include all: doc $(PROG) diff --git a/x11-wm/ratmenu/files/patch-Makefile b/x11-wm/ratmenu/files/patch-Makefile index 31b5a8b..6b18c3c 100644 --- a/x11-wm/ratmenu/files/patch-Makefile +++ b/x11-wm/ratmenu/files/patch-Makefile @@ -11,8 +11,8 @@ -LIBS = -L/usr/X11R6/lib -lX11 -CFLAGS = -Os -Wall -ansi -pedantic +MANDIR = $(PREFIX)/man -+CFLAGS += -I$(X11BASE)/include -+LIBS = -L$(X11BASE)/lib -lX11 ++CFLAGS += -I$(LOCALBASE)/include ++LIBS = -L$(LOCALBASE)/lib -lX11 $(PROG): $(PROG).c $(CC) $(CFLAGS) $< $(LIBS) -o $@ diff --git a/x11-wm/sapphire/files/patch-Makefile b/x11-wm/sapphire/files/patch-Makefile index 8be0b03..15cea15 100644 --- a/x11-wm/sapphire/files/patch-Makefile +++ b/x11-wm/sapphire/files/patch-Makefile @@ -12,7 +12,7 @@ -prefix = /usr -XROOT = $(prefix)/X11R6 +prefix = ${PREFIX} -+XROOT = ${X11BASE} ++XROOT = ${LOCALBASE} DESTDIR = INCLUDES = -I$(XROOT)/include LDPATH = -L$(XROOT)/lib diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 1312f21..08511f5 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -8,6 +8,7 @@ PORTNAME= sawfish PORTVERSION= 1.3.3 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-wm MASTER_SITES= SF @@ -24,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x1 GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//} PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomehier gnomehack esound USE_AUTOTOOLS= autoconf:261:env automake:19:env libtool:15:env diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile index 337cb8d..670bdf2 100644 --- a/x11-wm/skippy-xd/Makefile +++ b/x11-wm/skippy-xd/Makefile @@ -25,7 +25,7 @@ PLIST_DIRS= %%DATADIR%% PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \ s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \ ${WRKSRC}/Makefile post-build: diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile index 6c9c07b..950e917 100644 --- a/x11-wm/skippy/Makefile +++ b/x11-wm/skippy/Makefile @@ -7,16 +7,14 @@ PORTNAME= skippy PORTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= http://thegraveyard.org/files/ MAINTAINER= ports@FreeBSD.org COMMENT= A full-screen X11 task-switcher like Apple's Expose -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - -USE_XLIB= yes +USE_XORG= x11 xext xinerama xft xmu USE_BZIP2= yes USE_GNOME= pkgconfig USE_EFL= imlib2 @@ -26,7 +24,7 @@ PLIST_DIRS= %%DATADIR%% PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \ s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \ ${WRKSRC}/Makefile post-build: diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile index 1a880d2..a43d372 100644 --- a/x11-wm/swm/Makefile +++ b/x11-wm/swm/Makefile @@ -7,13 +7,13 @@ PORTNAME= swm PORTVERSION= 1.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www2.informatik.hu-berlin.de/~sperling/prog/ EXTRACT_SUFX= c-src.tgz MAINTAINER= ports@FreeBSD.org -COMMENT=Window manager for low-memory systems, with title bars and shading +COMMENT= Window manager for low-memory systems, with title bars and shading BINS= swm swmbg swmswitch DOCDIR= share/doc/${PORTNAME} @@ -23,8 +23,7 @@ PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= share/swm/pixmaps share/swm SCRIPTS= startswm USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= x11 xext xpm WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src post-patch: @@ -35,10 +34,10 @@ post-patch: .endfor post-build: - cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ - -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${X11BASE}/lib - cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ - -o ${WRKSRC}/swmswitch -lX11 -L${X11BASE}/lib + cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \ + -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib + cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \ + -o ${WRKSRC}/swmswitch -lX11 -L${LOCALBASE}/lib pre-install: ${RM} -f ${PLIST} diff --git a/x11-wm/swm/files/patch-Makefile-xpm b/x11-wm/swm/files/patch-Makefile-xpm index 68d8f4f..96ec2be 100644 --- a/x11-wm/swm/files/patch-Makefile-xpm +++ b/x11-wm/swm/files/patch-Makefile-xpm @@ -17,7 +17,7 @@ +#CC = gcc -XROOT = /usr/X11R6 -+XROOT = $(X11BASE) ++XROOT = $(LOCALBASE) INCLPATH = -I$(XROOT)/include LDPATH = -L$(XROOT)/lib diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile index b695264..2aa85bf 100644 --- a/x11-wm/treewm/Makefile +++ b/x11-wm/treewm/Makefile @@ -7,26 +7,25 @@ PORTNAME= treewm PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Window Manager that arranges the windows in a tree -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xmu xpm xt xxf86vm PKGMESSAGE= ${WRKDIR}/pkg-message PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO default.cfg sample.cfg post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile post-build: @${SED} 's|%%D%%|${DOCSDIR}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index 48732b7..573cd14 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -18,8 +18,7 @@ COMMENT= Twm with a virtual desktop WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm MAN1= tvtwm.1 MANCOMPRESSED= no PLIST_FILES= bin/tvtwm diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile index 56ae1d7..61c56c4 100644 --- a/x11-wm/ude/Makefile +++ b/x11-wm/ude/Makefile @@ -7,9 +7,9 @@ PORTNAME= ude PORTVERSION= 0.2.9b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= udeproject MAINTAINER= ports@FreeBSD.org @@ -17,8 +17,7 @@ COMMENT= Small, fast, compact windowmanager LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice sm xext xmu xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile index 93e376e..beec3e3 100644 --- a/x11-wm/waimea-devel/Makefile +++ b/x11-wm/waimea-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= waimea PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://dev.gentoo.org/~nixphoeni/ \ ${MASTER_SITE_LOCAL} @@ -24,7 +24,7 @@ LATEST_LINK= ${PORTNAME}-devel USE_AUTOTOOLS= automake:19:env USE_GMAKE= yes USE_ICONV= yes -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile index 4061481..65ed428 100644 --- a/x11-wm/waimea/Makefile +++ b/x11-wm/waimea/Makefile @@ -7,19 +7,17 @@ PORTNAME= waimea PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= waimea +MASTER_SITES= SF MAINTAINER= danfe@FreeBSD.org COMMENT= An X11 window manager designed for maximum efficiency -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= ${LOCALBASE}/bin/Esetroot:${PORTSDIR}/x11/eterm USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= xft USE_PERL5_RUN= yes GNU_CONFIGURE= yes diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile index 416e64c..8f6c89a 100644 --- a/x11-wm/wampager/Makefile +++ b/x11-wm/wampager/Makefile @@ -7,7 +7,7 @@ PORTNAME= wampager PORTVERSION= 0.9.3.20041204 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.ijs.si/~lesi/waimea/ \ http://www.daemon.li/distfiles/ @@ -17,8 +17,8 @@ COMMENT= A mini pager for the waimea window manager PLIST_FILES= bin/wampager +USE_XORG= x11 xext xpm ice USE_BZIP2= yes GNU_CONFIGURE= yes -USE_X_PREFIX= yes .include <bsd.port.mk> diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile index 79a5f3c..de3e723 100644 --- a/x11-wm/weewm/Makefile +++ b/x11-wm/weewm/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/weewm USE_XORG= x11 post-patch: - @${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/src/Makefile do-install: diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile index c0e21ee..0983ddc 100644 --- a/x11-wm/windowlab/Makefile +++ b/x11-wm/windowlab/Makefile @@ -29,7 +29,7 @@ PORTDOCS= CHANGELOG README post-patch: @${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \ - -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile + -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/windowlab ${PREFIX}/bin diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index bcf1d09..637b449 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft -RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons +RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile index 8ad102e..1ce20a0 100644 --- a/x11-wm/wm2/Makefile +++ b/x11-wm/wm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= wm2 PORTVERSION= 4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.all-day-breakfast.com/wm2/ DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= A very simple window manager for X -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend -USE_X_PREFIX= yes +USE_XORG= x11 xext xmu ALL_TARGET= depend wm2 do-install: diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index a9e723a..819ef9e 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,9 +1,10 @@ -LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm -+LIBS = -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm ++LIBS = -L$(LOCALBASE)/lib -lXext -lX11 -lXmu -lm +LIBS += -Wl,-rpath,$(PREFIX)/lib -CC = gcc @@ -11,7 +11,7 @@ -CFLAGS = -O2 +CC ?= gcc +CCC = $(CXX) -+CFLAGS += -I$(PREFIX)/include ++CFLAGS += -I$(LOCALBASE)/include OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o .c.o: diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 5838339..e62e271 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -39,7 +39,7 @@ post-patch: @${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E '/\/usr\/share/d; \ s|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g; \ + s|/usr/X11R6|${LOCALBASE}|g; \ s|(share/pixmaps.*),|\1|g' \ ${WRKSRC}/data/WMWmakerconf* .for file in data/po/ja.po po/ja.po diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile index d910165..09fc45e 100644 --- a/x11-wm/wmanager/Makefile +++ b/x11-wm/wmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmanager PORTVERSION= 0.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -19,7 +19,8 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes +USE_XORG= x11 xext +USE_GL= gl USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa index 25944fb..982b0ed 100644 --- a/x11-wm/wmanager/files/patch-aa +++ b/x11-wm/wmanager/files/patch-aa @@ -11,8 +11,8 @@ $FreeBSD$ +bindir = $(PREFIX)/bin +incdir = ./inc +srcdir = ./src -+fltkinc = $(X11BASE)/include -+x11lib = $(X11BASE)/lib ++fltkinc = $(LOCALBASE)/include ++x11lib = $(LOCALBASE)/lib # compiler settings -CXX = g++ diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile index e5a1a30..56c3748 100644 --- a/x11-wm/wmcp/Makefile +++ b/x11-wm/wmcp/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmcp PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ @@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dockable pager for Window Maker PLIST_FILES= bin/wmcp -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xext xpm ALL_TARGET= clean wmcp do-install: diff --git a/x11-wm/wmcp/files/patch-aa b/x11-wm/wmcp/files/patch-aa index 5465a92..4069cab 100644 --- a/x11-wm/wmcp/files/patch-aa +++ b/x11-wm/wmcp/files/patch-aa @@ -5,8 +5,8 @@ -INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11 -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib -+INCLUDES = -I${X11BASE}/include/X11 -I${X11BASE}/include -+LIBINC = -L${X11BASE}/lib ++INCLUDES = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include ++LIBINC = -L${LOCALBASE}/lib LIBS = -lm -lX11 -lXpm -lXext TARGET = wmcp diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile index 3635142..3f2ebaf 100644 --- a/x11-wm/wmg/Makefile +++ b/x11-wm/wmg/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmg PORTVERSION= 0.15.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm gnome MASTER_SITES= http://ductape.net/~reeve/downloads/ DISTNAME= wmG-${PORTVERSION} @@ -15,8 +15,7 @@ DISTNAME= wmG-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Small GTK-based GNOME-compliant window manager -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index e18ae51..1edc2d4 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -7,6 +7,7 @@ PORTNAME= wmii DISTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://www.suckless.org/download/ @@ -18,10 +19,10 @@ RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu \ ${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base USE_ICONV= yes -USE_XLIB= yes +USE_XORG= x11 xextproto xt xext MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ - INCX11="-I${X11BASE}/include" LIBX11="-L${X11BASE}/lib" \ + INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib" \ CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \ LIBICONV="-liconv" MAN="${MANPREFIX}/man" diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index ba10407..2cda552 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -7,14 +7,14 @@ PORTNAME= xcompmgr PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://xapps.freedesktop.org/release/ MAINTAINER= anholt@FreeBSD.org COMMENT= A sample X compositing manager -USE_XLIB= yes +USE_XORG= x11 xcomposite xfixes xdamage xrender GNU_CONFIGURE= yes MAN1= xcompmgr.1 diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index cffcab2..afd479c 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -7,10 +7,9 @@ PORTNAME= xfce PORTVERSION= 3.8.18 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm xfce -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= oliver@FreeBSD.org COMMENT= CDE like desktop with GTK @@ -18,7 +17,7 @@ COMMENT= CDE like desktop with GTK LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_GCC= 4.1 -USE_XORG= x11 +USE_XORG= x11 xpm USE_GETTEXT= yes USE_GNOME= gdkpixbuf GNU_CONFIGURE= yes @@ -28,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \ --with-data-dir=${PREFIX}/share/xfce \ --with-locale-dir=${PREFIX}/share/locale \ - --with-xpm=${X11BASE} \ + --with-xpm=${LOCALBASE} \ --enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \ --disable-arts \ --enable-taskbar \ @@ -43,13 +42,13 @@ MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \ .include <bsd.port.pre.mk> .if defined(WITH_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG= xft CONFIGURE_ARGS+= --enable-xft .endif post-patch: @${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c @${REINPLACE_CMD} -e 's|/opt/kde3|${LOCALBASE}|g ; \ s|/opt/gnome|${LOCALBASE}|g' ${WRKSRC}/xfmenu/xfmenu.c diff --git a/x11-wm/xfce/files/patch-other::xinitrc.in b/x11-wm/xfce/files/patch-other::xinitrc.in index 75df757..66f1710 100644 --- a/x11-wm/xfce/files/patch-other::xinitrc.in +++ b/x11-wm/xfce/files/patch-other::xinitrc.in @@ -5,7 +5,7 @@ # Launch xscreensaver (if available) -xscreensaver -no-splash & -+XBINDIR=%%X11BASE%%/bin ++XBINDIR=%%LOCALBASE%%/bin +if [ -x $XBINDIR/xscreensaver ]; then + xscreensaver -no-splash & +fi diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 1fe7455..392ad280a 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.4.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -26,6 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes USE_XFCE= configenv libgui libmcs libutil mcsmanager +USE_XORG= x11 sm ice MAN1= xfce4-session.1 xfce4-session-logout.1 diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile index 505fd8a..651f6dc 100644 --- a/x11-wm/xmonad-contrib/Makefile +++ b/x11-wm/xmonad-contrib/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= xmonad:${PORTSDIR}/x11-wm/xmonad LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile index a5fd4b2..7a317d8 100644 --- a/x11-wm/xmonad/Makefile +++ b/x11-wm/xmonad/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ @@ -17,7 +18,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile index 2e01528..87c7a2d 100644 --- a/x11-wm/yawm/Makefile +++ b/x11-wm/yawm/Makefile @@ -7,7 +7,7 @@ PORTNAME= yawm PORTVERSION= 0.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.sai.msu.su/pub/X11/win_man/ DISTNAME= yawm-0.0.1-a4 @@ -18,7 +18,7 @@ COMMENT= Has title bars, iconizing, maximizing, taskbar, placement, clock GNU_CONFIGURE= yes PLIST= ${WRKDIR}/pkg-plist #USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 DOCS= AUTHORS COPYING ChangeLog DEPRECATED= project no longer exists diff --git a/x11/9box/Makefile b/x11/9box/Makefile index 6e97349..7374d81 100644 --- a/x11/9box/Makefile +++ b/x11/9box/Makefile @@ -7,7 +7,7 @@ PORTNAME= 9box PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= thierry @@ -16,15 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 9box can "pack" windows inside itself PLIST_FILES= bin/9box -USE_XLIB= yes -USE_X_PREFIX= yes USE_GMAKE= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xt BUILD_WRKSRC= ${WRKSRC}/src post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g; \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%CC%%|${CC}|g' \ ${WRKSRC}/src/Makefile diff --git a/x11/9box/files/patch-src::Makefile b/x11/9box/files/patch-src::Makefile index 68e2c34..654ee9c 100644 --- a/x11/9box/files/patch-src::Makefile +++ b/x11/9box/files/patch-src::Makefile @@ -2,8 +2,8 @@ +++ src/Makefile Wed Jul 23 21:35:39 2003 @@ -1,10 +1,14 @@ +CC= %%CC%% -+CFLAGS+= -g -I. -I%%X11BASE%%/include -+LIBS+= -L%%X11BASE%%/lib -lX11 ++CFLAGS+= -g -I. -I%%LOCALBASE%%/include ++LIBS+= -L%%LOCALBASE%%/lib -lX11 + all: 9box diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile index df8fafa..46c6cf6 100644 --- a/x11/9menu/Makefile +++ b/x11/9menu/Makefile @@ -32,6 +32,6 @@ MANCOMPRESSED= yes do-build: cd ${WRKSRC} && \ - ${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o 9menu 9menu.c + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o 9menu 9menu.c .include <bsd.port.mk> diff --git a/x11/9term/files/patch-ad b/x11/9term/files/patch-ad index 4a9f0f3..46e5a7b 100644 --- a/x11/9term/files/patch-ad +++ b/x11/9term/files/patch-ad @@ -20,7 +20,7 @@ -CFLAGS=-g $(OS) $(INCLUDES) -fno-builtin -D_LIBXG_EXTENSION -LDFLAGS=-g -R/usr/openwin/lib -L/usr/openwin/lib -R/usr/ucblib -L/usr/ucblib -CC=gcc -+INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${X11BASE}/include ++INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${LOCALBASE}/include +CFLAGS+= $(OS) $(INCLUDES) +LDFLAGS= +CC?=gcc @@ -31,8 +31,8 @@ -XLIBS=-lXt -lX11 - +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a -+XLIBS= -lXt -lX11 -L${X11BASE}/lib -+XLIBS+=-Wl,-rpath,$(X11BASE)/lib ++XLIBS= -lXt -lX11 -L${LOCALBASE}/lib ++XLIBS+=-Wl,-rpath,$(LOCALBASE)/lib OBJECTS=9term.o command.o display.o pty.o $(TARGET): $(OBJECTS) diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile index e1fa164..2cbf41a 100644 --- a/x11/accessx/Makefile +++ b/x11/accessx/Makefile @@ -25,8 +25,8 @@ PLIST_FILES= bin/ax bin/accessx post-patch: ${REINPLACE_CMD} \ -e "s@/usr/local@${PREFIX}@" \ - -e "s@/usr/X11R6/lib@${X11BASE}/lib@" \ - -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${X11BASE}/include@g" \ + -e "s@/usr/X11R6/lib@${LOCALBASE}/lib@" \ + -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${LOCALBASE}/include@g" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s@wish -f@${WISH} -f@g" ${WRKSRC}/accessx diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile index 252e0e6..a25eee7 100644 --- a/x11/alltray/Makefile +++ b/x11/alltray/Makefile @@ -9,16 +9,15 @@ PORTNAME= alltray PORTVERSION= 0.69 PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= acm@FreeBSD.org COMMENT= Dock any application with no native tray icon USE_GNOME= gtk20 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GCC= 3.4+ MAN1= alltray.1 diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile index 31a0f5f..ed7db46 100644 --- a/x11/apwal/Makefile +++ b/x11/apwal/Makefile @@ -7,7 +7,7 @@ PORTNAME= apwal PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://apwal.free.fr/download/ @@ -15,7 +15,6 @@ MAINTAINER= vs@FreeBSD.org COMMENT= Simple and powerful application launcher USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}/src diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 744be93..8439e4f 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -9,8 +9,7 @@ PORTNAME= aterm PORTVERSION= 1.0.1 PORTREVISION= 1 CATEGORIES+= x11 # `+=' is for slave ports -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= mich@FreeBSD.org COMMENT= A color vt102 terminal emulator with transparency support @@ -22,7 +21,7 @@ CONFIGURE_ARGS+= --enable-transparency \ --enable-fading --enable-utmp --enable-wtmp \ --without-afterstep-config -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_BACKGROUND_IMAGE) LIB_DEPENDS+= AfterImage.0:${PORTSDIR}/graphics/libafterimage diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile index 1e00081..d4a8d02 100644 --- a/x11/bbrun/Makefile +++ b/x11/bbrun/Makefile @@ -7,7 +7,7 @@ PORTNAME= bbrun PORTVERSION= 1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/ @@ -16,6 +16,7 @@ COMMENT= A Run box for Blackbox WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun +USE_XORG= xpm USE_GNOME= gtk20 USE_GMAKE= yes MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile index e5733a7..7040172 100644 --- a/x11/bbrun/files/patch-Makefile +++ b/x11/bbrun/files/patch-Makefile @@ -5,7 +5,7 @@ -LIBDIR = -L/usr/lib -L/usr/X11R6/lib -LIBS = -lXpm `pkg-config --libs gtk+-2.0` -CFLAGS = `pkg-config --cflags gtk+-2.0` -+LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm `pkg-config --libs gtk+-2.0` ${LDFLAGS} +CFLAGS += `pkg-config --cflags gtk+-2.0` diff --git a/x11/blast/Makefile b/x11/blast/Makefile index 925cf1a..b9a8669 100644 --- a/x11/blast/Makefile +++ b/x11/blast/Makefile @@ -22,7 +22,7 @@ MAN1= blast.1 PLIST_FILES= bin/blast do-build: - ${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${X11BASE}/include -L${X11BASE}/lib -lX11 -lXext -o ${WRKSRC}/blast + ${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXext -o ${WRKSRC}/blast do-install: ${INSTALL_PROGRAM} ${WRKSRC}/blast ${PREFIX}/bin/blast diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index d6be0fa..b2717a6 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -18,7 +18,7 @@ COMMENT= Quick start up utility for applications on an X display USE_IMAKE= yes USE_PERL5_BUILD=yes -USE_XPM= yes +USE_XORG= xpm MAN1= bricons.1 .include <bsd.port.pre.mk> diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile index c5d9151..821de054 100644 --- a/x11/brightside/Makefile +++ b/x11/brightside/Makefile @@ -7,7 +7,7 @@ PORTNAME= brightside PORTVERSION= 1.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://files.catmur.co.uk/brightside/ @@ -15,7 +15,7 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= A tool to add reactivity to the edges and corners of the GNOME desktop USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack libwnck libgnomeui diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile index 16cd712..d38b5a5 100644 --- a/x11/buttonbox/Makefile +++ b/x11/buttonbox/Makefile @@ -23,8 +23,8 @@ PLIST= ${WRKDIR}/pkg-plist USE_XORG= x11 xext do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${X11BASE}/lib \ - -I${X11BASE}/include -lX11 -lXext button.c configuration.c \ + cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${LOCALBASE}/lib \ + -I${LOCALBASE}/include -lX11 -lXext button.c configuration.c \ colour.c dispatcher.c main.c pre-install: @@ -39,8 +39,8 @@ pre-install: .endif do-install: - ${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${X11BASE}/lib/X11/app-defaults/ - ${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${X11BASE}/bin/ + ${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${LOCALBASE}/lib/X11/app-defaults/ + ${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${LOCALBASE}/bin/ .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/${DOCDIR} for i in ${DOCS}; \ diff --git a/x11/cnslock/files/patch-Makefile b/x11/cnslock/files/patch-Makefile index 3be3a2a..25a2547 100644 --- a/x11/cnslock/files/patch-Makefile +++ b/x11/cnslock/files/patch-Makefile @@ -19,7 +19,7 @@ kleds.o: kleds.c include/kleds.h include/defines.h - $(CC) -Wall -I/usr/X11R6/include -c kleds.c -o kleds.o -+ $(CC) -Wall -I$(X11BASE)/include -c kleds.c -o kleds.o ++ $(CC) -Wall -I$(LOCALBASE)/include -c kleds.c -o kleds.o cnslock: $(OBJS) $(CC) -o cnslock $(OBJS) $(LIBS) diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile index d0bbdf5..95599a5 100644 --- a/x11/decurs/Makefile +++ b/x11/decurs/Makefile @@ -7,7 +7,7 @@ PORTNAME= decurs PORTVERSION= 0.55.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= http://varg.dyndns.org/psi/files/ @@ -16,7 +16,7 @@ COMMENT= A GTK+ based program that lets you edit you XFree86 mouse cursors LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20 -USE_X_PREFIX= yes +USE_XORG= x11 USE_GNOME= gnometarget gtk20 GNU_CONFIGURE= yes diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile index e11e1fb..fc62165 100644 --- a/x11/deskmenu/Makefile +++ b/x11/deskmenu/Makefile @@ -20,6 +20,6 @@ USE_GNOME= gtk12 USE_GMAKE= yes post-install: - ${STRIP_CMD} ${X11BASE}/bin/deskmenu + ${STRIP_CMD} ${PREFIX}/bin/deskmenu .include <bsd.port.mk> diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile index 3f3804f..573a7cf 100644 --- a/x11/deskmenu/files/patch-Makefile +++ b/x11/deskmenu/files/patch-Makefile @@ -5,7 +5,7 @@ -CFLAGS = -g -O2 -Wall `gtk-config --cflags` -XROOT = /usr/X11 +CFLAGS = -g -O2 -Wall `gtk12-config --cflags` -+XROOT = ${X11BASE} ++XROOT = ${LOCALBASE} INCLUDES = -I$(XROOT)/include -LIBS = -lX11 `gtk-config --libs` +LIBS = -lX11 `gtk12-config --libs` diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk index fac9f79..b4f1c9a 100644 --- a/x11/dmenu/files/patch-config.mk +++ b/x11/dmenu/files/patch-config.mk @@ -11,8 +11,8 @@ -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib -+X11INC = $(X11BASE)/include -+X11LIB = $(X11BASE)/lib ++X11INC = $(LOCALBASE)/include ++X11LIB = $(LOCALBASE)/lib # includes and libs INCS = -I. -I/usr/include -I${X11INC} diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile index 569274e..4206e50 100644 --- a/x11/dxpc/Makefile +++ b/x11/dxpc/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE} -MAKE_ARGS= CPPFLAGS="-I. -I${X11BASE}/include" +MAKE_ARGS= CPPFLAGS="-I. -I${LOCALBASE}/include" MAN1= dxpc.1 PLIST_FILES= bin/dxpc diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile index 196d626..c464842 100644 --- a/x11/ebuttons/Makefile +++ b/x11/ebuttons/Makefile @@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}/E-buttons USE_GL= gl USE_EFL= imlib2 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS} do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o E-Buttons.epplet \ diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index 9dfd50b..fde64fd 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -34,8 +34,8 @@ USE_XORG= x11 xau xdmcp xext xi xrandr xv sm ice MAN1= electricsheep.1 .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LIBTOOLFILES= configure mpeg2dec/configure flam3/configure @@ -52,7 +52,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \ + 's|/usr/X11R6/lib/xscreensaver/config|${LOCALBASE}/share/xscreensaver/config|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ diff --git a/x11/emu/Makefile b/x11/emu/Makefile index 40801ef..5a9b2f8 100644 --- a/x11/emu/Makefile +++ b/x11/emu/Makefile @@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org COMMENT= A terminal emulator for the X Window System -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} -RUN_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb +RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb USE_IMAKE= yes USE_DISPLAY= yes diff --git a/x11/erun/Makefile b/x11/erun/Makefile index f923740..4108783 100644 --- a/x11/erun/Makefile +++ b/x11/erun/Makefile @@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= gl USE_EFL= imlib2 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS} do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \ diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 9a6fcea..5967243 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -9,8 +9,7 @@ PORTNAME= eterm PORTVERSION= 0.9.4 PORTREVISION= 4 CATEGORIES+= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= Eterm-${PORTVERSION} MAINTAINER?= olgeni@FreeBSD.org @@ -28,7 +27,7 @@ CONFIGURE_ARGS?=--enable-trans --enable-utmp \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= MMX "With MMX instruction set" off -USE_XLIB= yes +USE_XORG= x11 xt USE_ICONV= yes USE_EFL= imlib2 diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 9c96e26..4a37900 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -8,6 +8,7 @@ PORTNAME= fast-user-switch-applet PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,8 +16,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Fast user switching applet for GNOME +USE_XORG= x11 USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile index 4a8df93..ad2d4c8 100644 --- a/x11/fbpanel/Makefile +++ b/x11/fbpanel/Makefile @@ -7,15 +7,15 @@ PORTNAME= fbpanel PORTVERSION= 4.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@fsck.ch COMMENT= Desktop panel that includes a taskbar, pager, launchbar and more +USE_XORG= x11 xmu xpm USE_GNOME= gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile index 9d369e2..27946f3 100644 --- a/x11/fbsd-icons/Makefile +++ b/x11/fbsd-icons/Makefile @@ -20,7 +20,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes do-install: - ${MKDIR} ${X11BASE}/icons - ( cd ${X11BASE}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz ) + ${MKDIR} ${PREFIX}/icons + ( cd ${PREFIX}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz ) .include <bsd.port.mk> diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile index 0245b8b..9603aef 100644 --- a/x11/fireflies/Makefile +++ b/x11/fireflies/Makefile @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/GL" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/GL" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \ --with-confdir=${LOCALBASE}/share/xscreensaver/config PLIST_SUB= VERSION=${PORTVERSION} diff --git a/x11/fireflies/files/patch-Make.include.in b/x11/fireflies/files/patch-Make.include.in index 9369f93..0592784 100644 --- a/x11/fireflies/files/patch-Make.include.in +++ b/x11/fireflies/files/patch-Make.include.in @@ -6,8 +6,8 @@ -CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ -LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@ -+CFLAGS = -Wall -I$(X11BASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ -+LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(X11BASE)/lib $(GL_LIBS) @LIBS@ ++CFLAGS = -Wall -I$(LOCALBASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ ++LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib $(GL_LIBS) @LIBS@ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@ PROGRAM = @PROGRAM@ diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile index 3505498..7293fa1 100644 --- a/x11/fluxbg/Makefile +++ b/x11/fluxbg/Makefile @@ -9,8 +9,7 @@ PORTNAME= fluxbg PORTVERSION= 0.7 PORTREVISION= 7 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Background changer for fluxbox/blackbox @@ -22,14 +21,13 @@ USE_GNOME= gnomehack gnometarget .include <bsd.port.pre.mk> -.if !exists(${LOCALBASE}/bin/fbsetbg) && \ - !exists(${X11BASE}/bin/fbsetbg) +.if !exists(${LOCALBASE}/bin/fbsetbg) RUN_DEPENDS= fbsetbg:${PORTSDIR}/x11-wm/fluxbox .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/fluxbg_conf.cc + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/fluxbg_conf.cc post-install: @${CAT} ${PKGMESSAGE} diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile index 00ae77a..92115f9 100644 --- a/x11/gcursor/Makefile +++ b/x11/gcursor/Makefile @@ -26,8 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ DOCS= AUTHORS COPYING ChangeLog INSTALL TODO post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c .ifndef (NOPORTDOCS) post-install: diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c index 583eac0..5161e1e 100644 --- a/x11/gcursor/files/patch-src::gcursor.c +++ b/x11/gcursor/files/patch-src::gcursor.c @@ -10,7 +10,7 @@ - "/usr/local/share/icons/", - "/usr/share/icons/", + "%%LOCALBASE%%/lib/X11/icons/", -+ "%%X11BASE%%/lib/X11/icons/", ++ "%%LOCALBASE%%/lib/X11/icons/", "%s/.icons/", NULL }; diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index eb847c8..58a4db0 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-applets PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +27,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 52d1f30..8c70a9c 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-libs PORTVERSION= 1.4.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-libs/1.4 @@ -21,8 +21,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm ice x11 USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 890725c..1edd00a 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-panel PORTVERSION= 2.22.1.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,7 +25,6 @@ LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 602fca7..94fd144 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-screensaver PORTVERSION= 2.22.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +20,6 @@ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile index 1e01974..4f5f0fd 100644 --- a/x11/gnome-swallow/Makefile +++ b/x11/gnome-swallow/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnome-swallow PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= http://interreality.org/~tetron/technology/swallow/ MAINTAINER= marcus@FreeBSD.org COMMENT= Applet that swallows any X11 application into the GNOME 2 panel -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomepanel GNU_CONFIGURE= yes diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index deba710..09e7f75 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-terminal PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Terminal component for the GNOME 2 Desktop USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils GNU_CONFIGURE= yes diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile index b1c01a7..408d644 100644 --- a/x11/gpctool/Makefile +++ b/x11/gpctool/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gpc:${PORTSDIR}/devel/libgpc \ USE_ZIP= yes USE_GL= yes PLIST_FILES= bin/gpctool -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_CDROM= Can't be used for profit without permission MAKEFILE= ${FILESDIR}/BSDmakefile diff --git a/x11/gpctool/files/BSDmakefile b/x11/gpctool/files/BSDmakefile index 42365df..9578622 100644 --- a/x11/gpctool/files/BSDmakefile +++ b/x11/gpctool/files/BSDmakefile @@ -6,9 +6,9 @@ SRCS= gpctool.c main.c callbacks.c graphics.c psdump.c BINDIR= ${PREFIX}/bin WARNS?= 2 -CFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${X11BASE}/lib -lformsGL -lGLU +LDFLAGS+= -L${LOCALBASE}/lib -lformsGL -lGLU LDFLAGS+= -L${LOCALBASE}/lib -lgpc -lm .include <bsd.prog.mk> diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile index 6c0e09f..8e2c852 100644 --- a/x11/gsynaptics/Makefile +++ b/x11/gsynaptics/Makefile @@ -33,6 +33,6 @@ post-install: .include <bsd.port.pre.mk> -RUN_DEPENDS+= ${X11BASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics +RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics .include <bsd.port.post.mk> diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile index cf33fd9..0bf342e 100644 --- a/x11/gtk-themepreview/Makefile +++ b/x11/gtk-themepreview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-themepreview PORTVERSION= 2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_LOCAL} # http://www.users.monornet.hu/linux/files/ MASTER_SITE_SUBDIR= danfe @@ -17,7 +17,6 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= A small application for preview your theme widgets in one small window GNU_CONFIGURE= yes -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_AUTOTOOLS= automake:19:env diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile index 3201461..e4e5bd7 100644 --- a/x11/gtkchtheme/Makefile +++ b/x11/gtkchtheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkchtheme PORTVERSION= 0.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/ DISTNAME= gtk-chtheme-${PORTVERSION} @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2 theme changer USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gtk20 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 975b371..c07439e 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-baseapps/files/pkg-message.in b/x11/kde4-baseapps/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kde4-baseapps/files/pkg-message.in +++ b/x11/kde4-baseapps/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 975b371..c07439e 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-runtime/files/pkg-message.in b/x11/kde4-runtime/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kde4-runtime/files/pkg-message.in +++ b/x11/kde4-runtime/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 975b371..c07439e 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kde4-workspace/files/pkg-message.in +++ b/x11/kde4-workspace/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 975b371..c07439e 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase3/files/pkg-message.in b/x11/kdebase3/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kdebase3/files/pkg-message.in +++ b/x11/kdebase3/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 975b371..c07439e 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4-runtime/files/pkg-message.in b/x11/kdebase4-runtime/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kdebase4-runtime/files/pkg-message.in +++ b/x11/kdebase4-runtime/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 975b371..c07439e 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4-workspace/files/pkg-message.in b/x11/kdebase4-workspace/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kdebase4-workspace/files/pkg-message.in +++ b/x11/kdebase4-workspace/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 975b371..c07439e 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in index 34663a8..dfc3f83 100644 --- a/x11/kdebase4/files/pkg-message.in +++ b/x11/kdebase4/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c08c1a9..49baf9d 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" -FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index c08c1a9..49baf9d 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" -FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile index 55cfa13..4d40080 100644 --- a/x11/keylaunch/Makefile +++ b/x11/keylaunch/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 PKGMESSAGE= ${WRKSRC}/pkg-message post-patch: - @${PERL} -pi -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/Makefile + @${PERL} -pi -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/example_rc ${EXAMPLESDIR}/keylaunch.rc post-install: - @${SED} -e 's;/usr/X11R6;${PREFIX};g' < ${FILESDIR}/pkg-message.in > \ + @${SED} -e 's;/usr/X11R6;${LOCALBASE};g' < ${FILESDIR}/pkg-message.in > \ ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11/keylaunch/files/patch-Makefile b/x11/keylaunch/files/patch-Makefile index adbf494..eafcf1b 100644 --- a/x11/keylaunch/files/patch-Makefile +++ b/x11/keylaunch/files/patch-Makefile @@ -4,7 +4,7 @@ -CC = gcc -CFLAGS = -g -O2 -Wall -XROOT = /usr/X11 -+XROOT = %%X11BASE%% ++XROOT = %%LOCALBASE%% INCLUDES = -I$(XROOT)/include LIBS = -lX11 LDPATH = -L$(XROOT)/lib diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile index 97ed7b1..7d87bc7 100644 --- a/x11/kxgenerator/Makefile +++ b/x11/kxgenerator/Makefile @@ -23,7 +23,7 @@ INSTALLS_ICONS= yes pre-configure: .for i in properties.h main.cpp - @${REINPLACE_CMD} -e "s:/usr/lib/xorg:${X11BASE}/lib:g" \ + @${REINPLACE_CMD} -e "s:/usr/lib/xorg:${LOCALBASE}/lib:g" \ ${WRKSRC}/src/${i} .endfor diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index bb5baf6..03cfadb 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib .include <bsd.port.pre.mk> .if defined(WITH_XCB) -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb RUN_DEPENDS+= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --with-xcb=yes PLIST_SUB+= XCB="" diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile index 132bdd2..c7685dd 100644 --- a/x11/libXtrans/Makefile +++ b/x11/libXtrans/Makefile @@ -15,7 +15,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Network API translation layer for X applications and libraries USE_BZIP2= yes -PREFIX?= ${X11BASE} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile index c0e075a..885e902 100644 --- a/x11/libcapplet/Makefile +++ b/x11/libcapplet/Makefile @@ -19,7 +19,7 @@ COMMENT= A library for writing custom applets for GNOME Control Center USE_BZIP2= yes USE_GNOME= gnomelibs USE_LDCONFIG= yes -MAKE_ENV= X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}" .include <bsd.port.pre.mk> diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile index 72fec25..e3f3e1d7 100644 --- a/x11/libcapplet/files/patch-Makefile +++ b/x11/libcapplet/files/patch-Makefile @@ -1,19 +1,20 @@ ---- Makefile.orig Wed Jul 10 08:32:05 2002 -+++ Makefile Wed Oct 4 15:35:57 2006 +--- Makefile.orig 2002-07-10 14:32:05.000000000 +0200 ++++ Makefile 2008-04-12 14:10:37.000000000 +0200 @@ -7,14 +7,14 @@ SRCS= capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \ capplet-widget.h control-center-common.c control-center-skels.c \ control-center-stubs.c control-center.h -CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \ - -I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \ -+CFLAGS+=-I. -I${X11BASE}/include -I${LOCALBASE}/include/gtk12 \ ++CFLAGS+=-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/gtk12 \ + -I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \ -I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0 - LDADD+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \ +-LDADD+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \ - -lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \ - -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \ - -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl \ - -lesd -lgnugetopt -laudiofile ++LDADD+= -L${LOCALBASE}/lib -lORBitCosNaming -lORBit -lIIOP \ + -lORBitutil -lglib-12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \ + -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 \ + -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \ diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in index ee73029..b146abf 100644 --- a/x11/libcapplet/files/patch-cappletConf.sh.in +++ b/x11/libcapplet/files/patch-cappletConf.sh.in @@ -1,9 +1,10 @@ ---- cappletConf.sh.in.orig Wed Jul 10 08:42:31 2002 -+++ cappletConf.sh.in Sat Oct 7 15:03:42 2006 +--- cappletConf.sh.in.orig 2002-07-10 14:42:31.000000000 +0200 ++++ cappletConf.sh.in 2008-04-12 14:12:31.000000000 +0200 @@ -1,4 +1,4 @@ - CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib" +-CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib" -CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba" -CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12" ++CAPPLET_LIBDIR="-Wl,-E -L%%LOCALBASE%%/lib" +CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba" -+CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12" ++CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12" MODULE_VERSION="capplet-1.4.0.5" diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index b5acfcc..cf351e3 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdnd PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://leb.net/offix/ DISTNAME= dnd.${PORTVERSION} @@ -16,10 +16,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Drag and drop library -USE_XLIB= yes +USE_XORG= x11 xmu ice xaw USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/DND/DNDlib GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/" \ + LDFLAGS="-L${LOCALBASE}/lib/" post-install: .if !defined(NOPORTDOCS) diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab index 08ad036..550691b 100644 --- a/x11/libdnd/files/patch-ab +++ b/x11/libdnd/files/patch-ab @@ -4,7 +4,7 @@ RANLIB = @RANLIB@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@ -+LIBS+= -Wl,-rpath,$(X11BASE)/lib ++LIBS+= -Wl,-rpath,$(LOCALBASE)/lib +SHLDFLAGS= -shared -x -soname $@ +DNDLIB= libDnd.so.1 +DNDPLUSLIB= libDnd++.so.1 diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile index a9fb6b5..0c70609 100644 --- a/x11/libgnome-java/Makefile +++ b/x11/libgnome-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnome-java PORTVERSION= 2.12.7 +PORTREVISION= 1 CATEGORIES= x11 java MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/ RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile index 6c64242..880ea98 100644 --- a/x11/libgnomemm/Makefile +++ b/x11/libgnomemm/Makefile @@ -7,10 +7,9 @@ PORTNAME= libgnomemm PORTVERSION= 2.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -20,11 +19,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnome GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 7ea6c53..6660c19 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomemm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,9 +23,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomemm26 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= xext USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnome GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile index dbe0ac3..5d155a9 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -7,7 +7,7 @@ PORTNAME= libsx PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= libraries @@ -19,7 +19,7 @@ COMMENT= Simple X11 library LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_XORG= x11 +USE_XORG= x11 xext xmu xt ALL_TARGET= src freq do-install: diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa index 0183076..f412ab1 100644 --- a/x11/libsx/files/patch-aa +++ b/x11/libsx/files/patch-aa @@ -14,7 +14,7 @@ # CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT # -CFLAGS = -g -D_POSIX_SOURCE -+CFLAGS += -O -D_POSIX_SOURCE -I$(X11BASE)/include ++CFLAGS += -O -D_POSIX_SOURCE -I$(LOCALBASE)/include # # if you are on a System V (like the SGI) machine, just define RANLIB @@ -34,5 +34,5 @@ #LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 -LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 - -+LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib -+LIBS+= -Wl,-rpath,${X11BASE}/lib ++LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(LOCALBASE)/lib ++LIBS+= -Wl,-rpath,${LOCALBASE}/lib diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile index 4f3b352..d93afa6 100644 --- a/x11/libsynaptics/Makefile +++ b/x11/libsynaptics/Makefile @@ -16,12 +16,12 @@ MAINTAINER= markus@FreeBSD.org COMMENT= Library to access the Xorg/XFree86 Synaptics TouchPad Driver USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/g' \ diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 060c203..42874b5 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -8,9 +8,10 @@ PORTNAME= libxklavier PORTVERSION= 3.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org @@ -18,7 +19,7 @@ COMMENT= An utility library to make XKB stuff easier RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp -USE_XLIB= yes +USE_XORG= x11 xkbfile USE_GMAKE= yes USE_GNOME= gnometarget gnomehack libxml2 glib20 USE_LDCONFIG= yes diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile index bae9faa..5b60f1b 100644 --- a/x11/linux-f10-xorg-libs/Makefile +++ b/x11/linux-f10-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile index bae9faa..5b60f1b 100644 --- a/x11/linux-f8-xorg-libs/Makefile +++ b/x11/linux-f8-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile index bae9faa..5b60f1b 100644 --- a/x11/linux-xorg-libs/Makefile +++ b/x11/linux-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile index aa877d5..01c30c8 100644 --- a/x11/lxpanel/Makefile +++ b/x11/lxpanel/Makefile @@ -7,19 +7,20 @@ PORTNAME= lxpanel PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= lxde MAINTAINER= b89605222@ntu.edu.tw COMMENT= LXPanel is a lightweight X11 desktop panel +USE_XORG= x11 xmu USE_GNOME= gtk20 gnomelibs gnomedesktop GNU_CONFIGURE= yes USE_AUTOTOOLS= automake:19 CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib" CFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" CFLAGS+= -I${WRKSRC} USE_GMAKE= yes diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile index 849979a..b6bfe1f 100644 --- a/x11/metisse/Makefile +++ b/x11/metisse/Makefile @@ -17,7 +17,7 @@ COMMENT= An innovative X-based window system CONFLICTS= fvwm-1.* fvwm-2.5.* LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo -RUN_DEPENDS= ${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts +RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts BROKEN= Does not compile @@ -26,7 +26,7 @@ PATCH_STRIP= -p1 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-fontdir=${X11BASE}/lib/X11/fonts +CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}" USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile index 7561e9a..27b983b 100644 --- a/x11/mrxvt-devel/Makefile +++ b/x11/mrxvt-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= mrxvt-devel PORTVERSION= 0.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF MASTER_SITE_SUBDIR= materm @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --enable-xim --enable-cjk --with-encoding=eucj .endif .if defined(WITH_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG+= xft CONFIGURE_ARGS+= --enable-xft .endif @@ -113,8 +113,8 @@ CONFIGURE_ARGS+= --with-atab-extra=${EXTRA_ATAB_HEIGHT:M[0-9]*} CONFIGURE_ARGS+= --with-tab-radius=${TAB_RADIUS:M[0-9]*} .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="${LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LIBS="${LIBS} -L${LOCALBASE}/lib" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index 18018c1..c73e21c 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -17,7 +17,7 @@ COMMENT= A multi terminal based on aterm USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --with-xpm=${X11BASE} + --with-xpm=${LOCALBASE} DOCS= AUTHORS ChangeLog INSTALL TODO MAN1= multi-aterm.1 diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile index e4213ee..435a05d 100644 --- a/x11/numlockx/Makefile +++ b/x11/numlockx/Makefile @@ -21,6 +21,6 @@ USE_XORG= x11 xext PLIST_FILES= bin/numlockx # Needed for the "configure" program to find XTest and XKB header files -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" .include <bsd.port.mk> diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index fdd8a52..94d37ec 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -129,7 +129,7 @@ post-patch: .SILENT pre-su-install: # XXX This port silently assumes PREFIX == X11BASE XXX @${MKDIR} ${PREFIX}/${MODULESDIR}/drivers -# xorg-server-1.4 installs its own ${X11BASE}/lib/xorg/modules/libwfb.so, +# xorg-server-1.4 installs its own ${LOCALBASE}/lib/xorg/modules/libwfb.so, # so back it up so it can be later restored similarly to what NVidia does: .if ${NVVERSION} >= 974600 @${MV} -f ${PREFIX}/${MODULESDIR}/libwfb.so \ diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/patch-lib::Makefile index 453550e..35cd61c 100644 --- a/x11/nvidia-driver/files/patch-lib::Makefile +++ b/x11/nvidia-driver/files/patch-lib::Makefile @@ -2,7 +2,7 @@ +++ lib/Makefile Wed Jun 22 19:12:16 2005 @@ -6,7 +6,7 @@ FIND_DIRS= /usr/lib \ - ${X11BASE}/lib + ${LOCALBASE}/lib -.if exists(/compat/linux) +.if exists(/compat/linux) && !defined(WITHOUT_LINUX) diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile index 718424d..fae698c 100644 --- a/x11/nvidia-settings/Makefile +++ b/x11/nvidia-settings/Makefile @@ -7,7 +7,7 @@ PORTNAME= nvidia-settings PORTVERSION= 1.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \ ${MASTER_SITE_LOCAL:S,$,bland/,} @@ -15,23 +15,23 @@ MASTER_SITES= ${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \ MAINTAINER= bland@FreeBSD.org COMMENT= Display Control Panel for X NVidia driver -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_GL= gl +USE_XORG= xv PLIST_FILES= bin/nvidia-settings MAN1= nvidia-settings.1 MAKE_ENV= ROOT=${PREFIX} \ CC=${CC} \ - X11R6_LIB_DIR=${X11BASE}/lib \ - X11R6_INC_DIR=${X11BASE}/include \ + X11R6_LIB_DIR=${LOCALBASE}/lib \ + X11R6_INC_DIR=${LOCALBASE}/include \ LDFLAGS="${PTHREAD_LIBS}" pre-build: cd ${WRKSRC}/src/libXNVCtrl; \ - ${CC} -c -I${X11BASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \ + ${CC} -c -I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \ -DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \ ${RM} -f libXNVCtrl.a; \ ar clq libXNVCtrl.a NVCtrl.o; \ diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile index 620098a..3ea01d5 100644 --- a/x11/p5-X11-GUITest/Makefile +++ b/x11/p5-X11-GUITest/Makefile @@ -8,7 +8,7 @@ PORTNAME= X11-GUITest PORTVERSION= 0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} @@ -20,11 +20,11 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf MAINTAINER= ports@FreeBSD.org COMMENT= Provides GUI testing/interaction facilities -USE_XLIB= yes +USE_XORG= x11 xt xext xtst PERL_CONFIGURE= 5.8.0+ MAN3= X11::GUITest.3 post-patch: - @${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile index a23175e..05faeee 100644 --- a/x11/p5-X11-IdleTime/Makefile +++ b/x11/p5-X11-IdleTime/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline \ ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version RUN_DEPENDS= ${BUILD_DEPENDS} -USE_XLIB= yes +USE_XORG= x11 xscrnsaver PERL_CONFIGURE= 5.8.0+ MANPREFIX= ${SITE_PERL} @@ -26,7 +26,7 @@ MAN3= X11::IdleTime.3 post-patch: .for i in IdleTime.pm - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${i} + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${i} @${PERL} -pi -e "s,[\d\.]+,${PORTVERSION:C/0./0.0/}, if m{VERSION}" ${WRKSRC}/${i} .endfor diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile index c647ce8..10ce75a 100644 --- a/x11/padkey/Makefile +++ b/x11/padkey/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/padkey PORTDOCS= CREDITS README post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/padkey ${PREFIX}/bin/padkey diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile index 589e756..1a93349 100644 --- a/x11/portoseguro/Makefile +++ b/x11/portoseguro/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} do-install: .for i in portoseguro portoseguro.conf - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/x11/props/Makefile b/x11/props/Makefile index 06e4d83..8ca2581 100644 --- a/x11/props/Makefile +++ b/x11/props/Makefile @@ -22,7 +22,7 @@ USE_IMAKE= yes MAKE_ARGS= INFOFILES="" post-install: - ${MKDIR} ${X11BASE}/lib/X11/locale/C/props; \ - ${INSTALL_DATA} ${WRKSRC}/C/* ${X11BASE}/lib/X11/locale/C/props + ${MKDIR} ${PREFIX}/lib/X11/locale/C/props; \ + ${INSTALL_DATA} ${WRKSRC}/C/* ${PREFIX}/lib/X11/locale/C/props .include <bsd.port.mk> diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile index b7d67d9..bcc3af6 100644 --- a/x11/qrash/Makefile +++ b/x11/qrash/Makefile @@ -7,7 +7,7 @@ PORTNAME= qrash PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://qmg.org/files/demos/qmg/ \ ftp://qmg.org/pub/demos/qmg/ \ @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 USE_GCC= 2.95 USE_GMAKE= yes USE_PERL5= yes # XXX -USE_X_PREFIX= yes +USE_XORG= x11 ALL_TARGET= qrash diff --git a/x11/qrash/files/patch-ae b/x11/qrash/files/patch-ae index 8fbb3aa..7c956d6 100644 --- a/x11/qrash/files/patch-ae +++ b/x11/qrash/files/patch-ae @@ -3,7 +3,7 @@ @@ -1,10 +1,10 @@ # Maximum optimization -CXXFLAGS += -O6 -ffast-math -funroll-loops -w -+CXXFLAGS += -I$(X11BASE)/include -ffast-math -funroll-loops ++CXXFLAGS += -I$(LOCALBASE)/include -ffast-math -funroll-loops # Debugging options #CXXFLAGS += -g diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 8acef76..03c8e78 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -8,7 +8,7 @@ PORTNAME= opengl PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES?= x11 MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -25,8 +25,8 @@ QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_GL= yes -USE_XLIB= yes +USE_GL= glu +USE_XORG= x11 ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index f15c330..e669ed3 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp --enable-languages \ --with-xpm --enable-xpm-background --enable-transparency \ --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= rxvt.1 diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 6f21e23..ba80b7e 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -19,14 +19,12 @@ COMMENT= A clone of the terminal emulator rxvt modified to support Unicode PATCH_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/p5-Encode-HanExtra \ ${SITE_PERL}/${PERL_ARCH}/Encode/JIS2K.pm:${PORTSDIR}/converters/p5-Encode-JIS2K .endif -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config -USE_XORG= xpm +USE_GNOME= pkgconfig +USE_XORG= xpm xft GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" -CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_BZIP2= yes diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index a9d596e..5398d12 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -21,8 +21,8 @@ USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp \ --with-xpm --enable-xpm-background --enable-transparency \ - --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=${LOCALBASE}/include/X11 \ + --with-xpm-library=${LOCALBASE}/lib MAN1= rxvt.1 PLIST_FILES= bin/rxvt diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile index de42453..1a4548f 100644 --- a/x11/setxkbmap/Makefile +++ b/x11/setxkbmap/Makefile @@ -15,7 +15,7 @@ COMMENT= Set the keyboard using the X Keyboard Extension XORG_CAT= app USE_XORG= xkbfile x11 -CONFIGURE_ARGS= --with-xkb-config-root=${X11BASE}/share/X11/xkb +CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb PLIST_FILES= bin/setxkbmap diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile index 45d9f90..d0e12913 100644 --- a/x11/sisctrl/Makefile +++ b/x11/sisctrl/Makefile @@ -7,21 +7,20 @@ PORTNAME= sisctrl PORTVERSION= 0.0.20051202 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.winischhofer.net/sis/ MAINTAINER= bland@FreeBSD.org COMMENT= Display Control Panel for XFree86/X.org SiS driver -USE_X_PREFIX= yes +USE_XORG= x11 ice xxf86vm xinerama xv xrandr USE_GNOME= gtk20 USE_GMAKE= yes -USE_GCC= 3.4+ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xv-path=${X11BASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= bin/sisctrl MAN1= sisctrl.1x diff --git a/x11/slock/Makefile b/x11/slock/Makefile index 815c5bd..b3f74c1 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://www.suckless.org/download/ CENKES MAINTAINER= infofarmer@FreeBSD.org COMMENT= Simple X screen locker -MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \ - X11INC="${X11BASE}/include" CC="${CC}" \ +MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ + X11INC="${LOCALBASE}/include" CC="${CC}" \ MANPREFIX="${MANPREFIX}/man" PLIST_FILES= bin/slock -USE_XLIB= yes +USE_XORG= x11 xt post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\ diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 85b7948..721176f 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -7,7 +7,7 @@ PORTNAME= startup-notification PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.freedesktop.org/software/startup-notification/releases/ @@ -18,8 +18,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library that supports startup notification spec from freedesktop.org USE_BZIP2= yes +USE_XORG= x11 USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile index 565157f..2d74cac 100644 --- a/x11/swarp/Makefile +++ b/x11/swarp/Makefile @@ -15,8 +15,8 @@ MASTER_SITES= http://www.suckless.org/download/ \ MAINTAINER= daniel@roe.ch COMMENT= X11 generic pointer warping utility -MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lX11" \ - CFLAGS="${CFLAGS} -I${X11BASE}/include \ +MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lX11" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include \ -DVERSION=\\\"${PORTVERSION}\\\"" \ LD=${CC} diff --git a/x11/temperature.app/files/patch-Makefile b/x11/temperature.app/files/patch-Makefile index f1e9803..1a2df17 100644 --- a/x11/temperature.app/files/patch-Makefile +++ b/x11/temperature.app/files/patch-Makefile @@ -6,14 +6,14 @@ DESTDIR = -GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Temperature.app -X11_BINDIR = /usr/X11R6/bin -+GNUSTEP_BINDIR = $(X11BASE)/GNUstep/Apps/Temperature.app -+X11_BINDIR = $(X11BASE)/bin ++GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app ++X11_BINDIR = $(LOCALBASE)/bin CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 -+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(X11BASE)/include -+LDFLAGS += -L$(X11BASE)/lib -lXpm -lXext -lX11 ++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include ++LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11 OBJECTS = Main.o Temperature.o Xpm.o diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile index 30ddc77..5eb7d4d 100644 --- a/x11/tkXwin/Makefile +++ b/x11/tkXwin/Makefile @@ -7,17 +7,16 @@ PORTNAME= tkXwin PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITES_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session GNU_CONFIGURE= yes -USE_X_PREFIX= yes +USE_XORG= xt xscrnsaver USE_LDCONFIG= yes USE_TK= 84+ diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile index 097c255c..3536348 100644 --- a/x11/trayer/Makefile +++ b/x11/trayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= trayer PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/t/trayer @@ -18,9 +18,9 @@ COMMENT= Lightweight GTK2-based systray for UNIX desktop USE_GNOME= gtk20 glib20 pango atk USE_ICONV= yes - +USE_XORG= xmu USE_GMAKE= yes -MAKE_ARGS= "PREFIX=${X11BASE}" +MAKE_ARGS= "PREFIX=${PREFIX}" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if !defined(NOPORTDOCS) diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile index 5e0d52c..4cec927 100644 --- a/x11/tycoon/Makefile +++ b/x11/tycoon/Makefile @@ -18,7 +18,7 @@ COMMENT= A nifty set of desktop apps, including floating buttons LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm REINPLACE_ARGS= -i "" post-patch: diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 49b88b8..2dd8776 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -40,8 +40,8 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-Logo=beastie.xpm \ --with-gfx-incs=${LOCALBASE}/include \ --with-gfx-libs=${LOCALBASE}/lib \ - --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \ - --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \ + --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \ + --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm MAN1= wdm.1 wdmLogin.1 @@ -49,8 +49,8 @@ MAN1= wdm.1 wdmLogin.1 CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT LDFLAGS= -L${LOCALBASE}/lib -lintl -DEF_SERVER?= ${X11BASE}/bin/X -XRDB_PATH?= ${X11BASE}/bin/xrdb +DEF_SERVER?= ${LOCALBASE}/bin/X +XRDB_PATH?= ${LOCALBASE}/bin/xrdb WDMDIR= ${PREFIX}/lib/X11/wdm diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile index 27dd0ea..7bcce6f 100644 --- a/x11/wmbutton/Makefile +++ b/x11/wmbutton/Makefile @@ -20,9 +20,9 @@ SUB_FILES= pkg-message do-build: cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} \ - -I${X11BASE}/include/X11 -I${X11BASE}/include \ + -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \ wmb_libs.c wmbutton.c -o wmbutton \ - -L${X11BASE}/lib -lXpm -lXext -lX11 + -L${LOCALBASE}/lib -lXpm -lXext -lX11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmbutton ${PREFIX}/bin/wmbutton diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile index 30efd09..bd43bb9 100644 --- a/x11/wmdrawer/Makefile +++ b/x11/wmdrawer/Makefile @@ -36,7 +36,7 @@ post-patch: s,LDFLAGS =,LDFLAGS+=,g; s,PREFIX =,#PREFIX =,g; \ s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g; \ s,CC =,#CC =,g; \ - s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile + s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile post-install: @${MKDIR} ${DATADIR} diff --git a/x11/wmfstatus/files/patch-Makefile b/x11/wmfstatus/files/patch-Makefile index 1c6d893a..c0855d4 100644 --- a/x11/wmfstatus/files/patch-Makefile +++ b/x11/wmfstatus/files/patch-Makefile @@ -2,7 +2,7 @@ +++ Makefile Thu Dec 27 18:35:43 2001 @@ -1,6 +1,6 @@ -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -FLAGS = -O2 +FLAGS = ${CFLAGS} @@ -14,7 +14,7 @@ .c.o: - cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o -+ ${CC} -I${X11BASE}/include $(FLAGS) -c -Wall $< -o $*.o ++ ${CC} -I${LOCALBASE}/include $(FLAGS) -c -Wall $< -o $*.o wmfstatus: $(OBJS) - cc $(FLAGS) -o wmfstatus $^ -lXext $(LIBDIR) $(LIBS) diff --git a/x11/wmmatrix/files/patch-aa b/x11/wmmatrix/files/patch-aa index 8a0f151..15e9328 100644 --- a/x11/wmmatrix/files/patch-aa +++ b/x11/wmmatrix/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -Wall -+INCDIR = -I${X11BASE}/include -+DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++DESTDIR= ${LOCALBASE} ++LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext diff --git a/x11/wmmenu/files/patch-Makefile b/x11/wmmenu/files/patch-Makefile index f73cdcb..fb20c04 100644 --- a/x11/wmmenu/files/patch-Makefile +++ b/x11/wmmenu/files/patch-Makefile @@ -11,7 +11,7 @@ -XROOT = /usr/X11R6 -DAROOT = /usr/local -+XROOT = $(X11BASE) ++XROOT = $(LOCALBASE) +DAROOT = $(LOCALBASE) # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command diff --git a/x11/wmxss/files/patch-Src::Makefile b/x11/wmxss/files/patch-Src::Makefile index b6bbfcd..c5f1a18 100644 --- a/x11/wmxss/files/patch-Src::Makefile +++ b/x11/wmxss/files/patch-Src::Makefile @@ -20,9 +20,9 @@ -OBJS = wmxss.o \ - xutils.o -+CFLAGS+= -I${X11BASE}/include -O2 -Wall ++CFLAGS+= -I${LOCALBASE}/include -O2 -Wall +LDADD+= -lXpm -lX11 -lXext -+LDADD+= -L${X11BASE}/lib ++LDADD+= -L${LOCALBASE}/lib +NOMAN= diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index de799d9..90176ad 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -7,7 +7,7 @@ PORTNAME= workrave PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -17,9 +17,9 @@ COMMENT= A Gnome RSI prevention tool OPTIONS= GNOME "Build with Gnome support" on \ NETWORK "Build with network support" on +USE_XORG= x11 xmu USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool -USE_GCC= 3.4+ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-gconf diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 4ae5cb3..cbf5fea 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -21,7 +21,7 @@ USE_XORG= x11 .include <bsd.port.pre.mk> -XSERVER= -DXSERVER_PATH=\"${X11BASE}/bin/Xorg\" +XSERVER= -DXSERVER_PATH=\"${LOCALBASE}/bin/Xorg\" PKGNAMEPREFIX= xorg- COMMENT= Wrapper for X.org X11 server diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index 0b36db0..8c91821 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -9,13 +9,12 @@ PORTNAME= wterm PORTVERSION= 6.2.9 PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= adam-ports@blacktabby.org COMMENT= A color vt102 terminal emulator with transparency support -BUILD_DEPENDS= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker +BUILD_DEPENDS= ${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker USE_XORG= xpm GNU_CONFIGURE= yes @@ -23,8 +22,8 @@ CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \ --disable-delete-key --disable-backspace-key \ --enable-next-scrollbar --enable-utmp --enable-wtmp \ --enable-menubar --enable-graphics --with-term=xterm-color \ - --with-xpm-includes=${X11BASE} --with-xpm-library=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/WINGs" + --with-xpm-includes=${LOCALBASE} --with-xpm-library=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs" MAN1= wterm.1 PLIST_FILES= bin/wterm diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 7410e68..ae6f413 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -7,15 +7,17 @@ PORTNAME= x3270 PORTVERSION= 3.3.7 +PORTREVISION= 1 CATEGORIES= x11 net -MASTER_SITES= SFE +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= 3270 Terminal emulator -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile index da1f81c..47fd711 100644 --- a/x11/xballoon/Makefile +++ b/x11/xballoon/Makefile @@ -21,7 +21,7 @@ MAN1= xballoon.1 PLIST_FILES= bin/xballoon post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index 93fccde..0d8170b 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -19,7 +19,7 @@ COMMENT= Make your XDM login screen look beautiful USE_XORG= xpm x11 post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/xres.c ${WRKSRC}/samples/XBanner.ad post-install: diff --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-aa index ec58823..291e999 100644 --- a/x11/xbanner/files/patch-aa +++ b/x11/xbanner/files/patch-aa @@ -40,10 +40,10 @@ ! BINDIR =$(PREFIX)/bin # Library directories for Linux -! XLIBDIR =$(X11BASE)/lib +! XLIBDIR =$(LOCALBASE)/lib # Include directory for gcc (if you get X11/Xlib.h: file not found) -! INCDIR =-I$(X11BASE)/include +! INCDIR =-I$(LOCALBASE)/include # Library directories for the Ultrix (probably most Unixes) #XLIBDIR =/usr/lib/X11 diff --git a/x11/xbanner/files/patch-ac b/x11/xbanner/files/patch-ac index 511a613..e6ff71c 100644 --- a/x11/xbanner/files/patch-ac +++ b/x11/xbanner/files/patch-ac @@ -24,7 +24,7 @@ #ifndef vms ! # if (defined(BSD) && (BSD >= 199306)) -! strcpy(line,"%%X11BASE%%/lib/X11/app-defaults/"); +! strcpy(line,"%%LOCALBASE%%/lib/X11/app-defaults/"); ! # else ! strcpy(line,"/usr/lib/X11/app-defaults/"); ! # endif diff --git a/x11/xbanner/files/patch-ae b/x11/xbanner/files/patch-ae index bcb35f5..8363c17 100644 --- a/x11/xbanner/files/patch-ae +++ b/x11/xbanner/files/patch-ae @@ -13,7 +13,7 @@ XBanner.BarSize: 12 ! Name of the pixmap file to tile over the root window -! !XBanner.BgPixFile: %%X11BASE%%/include/X11/pixmaps/xdm_bg.xpm +! !XBanner.BgPixFile: %%LOCALBASE%%/include/X11/pixmaps/xdm_bg.xpm ! The number of ripples for the Ripples BG style XBanner.Ripples: 3 diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index bd2adb7..a21aea4 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -15,7 +15,6 @@ COMMENT= The X protocol C-language Binding (XCB) protocol BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2 -PREFIX?= ${X11BASE} USE_BZIP2= yes USE_GNOME= gnomehack GNU_CONFIGURE= yes diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile index b35f863..10065ca 100644 --- a/x11/xclick/Makefile +++ b/x11/xclick/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= bin/${PORTNAME} do-build: @cd ${WRKSRC} && \ - ${CC} -L${X11BASE}/lib -I${X11BASE}/include click.c \ + ${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include click.c \ -lX11 -lXtst -o ${PORTNAME} do-install: diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index c707e6c..e9f25c7 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -18,13 +18,13 @@ COMMENT= X utility to translate rgb values into X color names LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -WRKSRC= $(WRKDIR)/xcolorsel +WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xcolorsel.1 post-patch: - @${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad + @${ECHO_CMD} "*.file: ${LOCALBASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad @${REINPLACE_CMD} -e 's|#include <malloc.h>||g' \ -e 's|/Xaw/|/Xaw3d/|g' ${WRKSRC}/*.[ch] @${REINPLACE_CMD} -e 's|app2head|./app2head|g' \ diff --git a/x11/xcut/files/patch-aa b/x11/xcut/files/patch-aa index 1ddcfd6..1ac717a 100644 --- a/x11/xcut/files/patch-aa +++ b/x11/xcut/files/patch-aa @@ -6,8 +6,8 @@ -BINDIR=/usr/local/bin -MANPATH=/usr/local/man -+BINDIR=${X11BASE}/bin -+MANPATH=${X11BASE}${MAN1PREFIX}/man ++BINDIR=${LOCALBASE}/bin ++MANPATH=${LOCALBASE}${MAN1PREFIX}/man MANSUFFIX=1 XCOMM Build xcut and manpage diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile index d1206dc..36f90dc 100644 --- a/x11/xdotool/Makefile +++ b/x11/xdotool/Makefile @@ -7,6 +7,7 @@ PORTNAME= xdotool DISTVERSION= 20070903 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.semicomplete.com/files/xdotool/ \ http://www.atarininja.org/~wxs/distfiles/ @@ -15,7 +16,7 @@ MAINTAINER= wxs@FreeBSD.org COMMENT= Programatically simulate keyboard input or mouse activity USE_GNOME= pkgconfig -USE_XLIB= yes +USE_XORG= x11 xtst ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/xdotool diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile index 56a6677..ee2d2ff 100644 --- a/x11/xdtm/Makefile +++ b/x11/xdtm/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A graphical shell for the X Window System USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/xdtm MAN1= xdtm.1 diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile index 25583b8..59a3572 100644 --- a/x11/xfce4-taskmanager/Makefile +++ b/x11/xfce4-taskmanager/Makefile @@ -16,8 +16,6 @@ DIST_SUBDIR= xfce4 MAINTAINER= miwi@FreeBSD.org COMMENT= A task manager for XFCE -CONFIGURE_ENV= PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig - GNU_CONFIGURE= yes USE_BZIP= yes USE_GETTEXT= yes diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile index 0757c79..e3c2255 100644 --- a/x11/xfree86_xkb_xml/Makefile +++ b/x11/xfree86_xkb_xml/Makefile @@ -7,9 +7,9 @@ PORTNAME= xfree86_xkb_xml PORTVERSION= 0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org @@ -17,12 +17,12 @@ COMMENT= A little set of XML files useful for dealing with XKB rules USE_ICONV= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnometarget USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb +CONFIGURE_ARGS= --with-xkb-base=${LOCALBASE}/lib/X11/xkb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index 75041ae..fd65ecf 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -7,7 +7,7 @@ PORTNAME= xgrab PORTVERSION= 2.41 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications @@ -17,9 +17,9 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= jmz@FreeBSD.org COMMENT= An X11 image grabber -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb -USE_X_PREFIX= yes +USE_XORG= x11 USE_IMAKE= yes USE_DISPLAY= yes diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile index 00396752..2229b54 100644 --- a/x11/xidle/Makefile +++ b/x11/xidle/Makefile @@ -16,8 +16,8 @@ MAINTAINER= novel@FreeBSD.org COMMENT= Run a program on X inactivity USE_BZIP2= yes -CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -D__dead=static -MAKE_ARGS+= X11LIBDIR="${X11BASE}/lib" \ +CFLAGS+= -I${LOCALBASE}/include -D__dead=static +MAKE_ARGS+= X11LIBDIR="${LOCALBASE}/lib" \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" USE_XORG= x11 xscrnsaver diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index b270df2..f6c0f55 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -18,7 +18,7 @@ MAN1= xkbset.1 USE_XORG= x11 USE_PERL5_BUILD= yes -MAKE_ARGS= X11BASE="${X11BASE}" X11PREFIX="${PREFIX}" \ +MAKE_ARGS= X11BASE="${LOCALBASE}" X11PREFIX="${PREFIX}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 843c15b..4e91d24 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -16,9 +16,6 @@ COMMENT= X Keyboard Configuration Database BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp -# XXX - sigh -PREFIX= ${X11BASE} - USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile index ca088c0..e58293a 100644 --- a/x11/xkeywrap/Makefile +++ b/x11/xkeywrap/Makefile @@ -7,14 +7,14 @@ PORTNAME= xkeywrap PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ MAINTAINER= ports@FreeBSD.org COMMENT= Record, repeat, and play key sequence from keyboard -USE_X_PREFIX= yes +USE_XORG= x11 xt MAN1= xkeywrap.1 MANCOMPRESSED= yes PORTSDOCDIR= ${PREFIX}/share/doc/xkeywrap diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 5a58229..e31d85b 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -7,7 +7,7 @@ VERSION= 4.1 REVISION= 16 -PORTREVISION= 1 +PORTREVISION= 2 PORTNAME= xloadimage PORTVERSION= ${VERSION}.${REVISION} @@ -24,7 +24,7 @@ COMMENT= X11 Image Loading Utility PATCH_STRIP= -p1 EXTRA_PATCHES= ${WRKSRC}/debian/patches/*.dpatch -USE_XLIB= yes +USE_XORG= x11 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile index 26fd0d8..8a07f3b 100644 --- a/x11/xlupe/Makefile +++ b/x11/xlupe/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Magnifying glass for X. like xmag but with continously updates USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm PLIST_FILES= bin/xlupe diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile index 6101d03..901d6dc 100644 --- a/x11/xmangekyou/Makefile +++ b/x11/xmangekyou/Makefile @@ -29,8 +29,8 @@ post-patch: @${REINPLACE_CMD} -e 's|= /usr/X11R6|= $${PREFIX}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g ; \ - s|-I/usr/X11R6/|-I$${X11BASE}/|g ; \ - s|-L/usr/X11R6/|-L$${X11BASE}/|g' ${WRKSRC}/Makefile + s|-I/usr/X11R6/|-I$${LOCALBASE}/|g ; \ + s|-L/usr/X11R6/|-L$${LOCALBASE}/|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmangekyou ${PREFIX}/bin diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile index 8e19697..e5ac66a 100644 --- a/x11/xmotd/Makefile +++ b/x11/xmotd/Makefile @@ -37,7 +37,7 @@ USE_MOTIF= yes .endif .if defined(WITH_XPM) -USE_XPM= yes +USE_XORG= xpm .endif post-extract: @@ -59,7 +59,7 @@ post-patch: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${X11BASE}/bin/xmotd + ${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${LOCALBASE}/bin/xmotd ${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${MANPREFIX}/man/man8 .include <bsd.port.post.mk> diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile index 2e027bd..dfac0b2 100644 --- a/x11/xmx/Makefile +++ b/x11/xmx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmx PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/ EXTRACT_SUFX= .tar.Z @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ob@breuninger.org COMMENT= An X protocol multiplexor -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= xmx.1 PLIST_FILES= bin/xmx diff --git a/x11/xmx/files/patch-aa b/x11/xmx/files/patch-aa index e9bee16..d8ac3b0 100644 --- a/x11/xmx/files/patch-aa +++ b/x11/xmx/files/patch-aa @@ -29,8 +29,8 @@ - -$(XMX): $(OFILES) - cc $(CFLAGS) -o $(XMX) $(OFILES) $(LIB) -+LIBPATH = -L${X11BASE}/lib -+INCPATH = -I${X11BASE}/include ++LIBPATH = -L${LOCALBASE}/lib ++INCPATH = -I${LOCALBASE}/include -debug: - make xmxd CFLAGS="$(DBGFG)" LIB="$(DEBUGLIB)" diff --git a/x11/xnodecor/files/Makefile b/x11/xnodecor/files/Makefile index 36716bb..be49a44 100644 --- a/x11/xnodecor/files/Makefile +++ b/x11/xnodecor/files/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CFLAGS= -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib LIBS= -lX11 all: xnodecor @@ -9,7 +9,7 @@ xnodecor: $(CC) -o xnodecor xnodecor.c $(CFLAGS) $(LDFLAGS) $(LIBS) install: - ${BSD_INSTALL_PROGRAM} xnodecor ${X11BASE}/bin + ${BSD_INSTALL_PROGRAM} xnodecor ${LOCALBASE}/bin clean: rm -f *.rej a.out core xnodecor diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index d40fe7d..ec91aac 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -15,8 +15,6 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org apps meta-port -PREFIX?= ${X11BASE} - RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index cbdeee5..d791a81 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libraries PORTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -18,51 +18,49 @@ COMMENT= X.org libraries meta-port NO_BUILD= yes -PREFIX?= ${X11BASE} - -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ - ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ - ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ - ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ - ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ - ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ - ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ - ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ - ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ - ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \ - ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \ - ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ - ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \ - ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ - ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ - ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ - ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ - ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ - ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ - ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ - ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ - ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ - ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ - ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ - ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ - ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ - ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ - ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ - ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ - ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ - ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ - ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ - ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ - ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ - ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ - ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ - ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ - ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ - ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ - ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ - ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ + ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ + ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ + ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ + ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ + ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ + ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ + ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ + ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \ + ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \ + ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ + ${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \ + ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ + ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ + ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ + ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ + ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ + ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ + ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ + ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ + ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ + ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ + ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ + ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ + ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ + ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ + ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ + ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ + ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ + ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ + ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ + ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ + ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ + ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ + ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ + ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ + ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ + ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ + ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6) pre-everything:: @@ -78,7 +76,7 @@ pre-everything:: fi .elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK) pre-install:: - ${LN} -s ${X11BASE} /usr/X11R6 || ${TRUE} + ${LN} -s ${LOCALBASE} /usr/X11R6 || ${TRUE} .endif do-install: diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile index 23671b6..9cd01dc 100644 --- a/x11/xorg-protos/Makefile +++ b/x11/xorg-protos/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-protos PORTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -16,8 +16,6 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org protos meta-port -USE_X_PREFIX= yes - BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \ ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \ ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \ diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index f02f5f3..b070ca9 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -17,23 +17,22 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org complete distribution metaport NO_BUILD= yes -PREFIX?= ${X11BASE} -RUN_DEPENDS+= ${X11BASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri +RUN_DEPENDS+= ${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri # data -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ - ${X11BASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ + ${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes # doc -RUN_DEPENDS+= ${X11BASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs +RUN_DEPENDS+= ${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs # app, lib, font, driver, proto -RUN_DEPENDS+= ${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ - ${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \ - ${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ - ${X11BASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \ - ${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos +RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ + ${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \ + ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ + ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \ + ${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos .if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \ @@ -59,7 +58,7 @@ DEPENDS_TARGET="package" .endif .if ${ARCH} != "alpha" && ${ARCH} != "ia64" -RUN_DEPENDS+= ${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server +RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server .endif .include <bsd.port.post.mk> diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile index 1c97386..607f4a6 100644 --- a/x11/xrestop/Makefile +++ b/x11/xrestop/Makefile @@ -7,20 +7,21 @@ PORTNAME= xrestop PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/sources/${PORTNAME}/ MAINTAINER= bland@FreeBSD.org COMMENT= X11 server side resource usage statistics monitor -USE_X_PREFIX= yes +USE_XORG= x11 xext xrender xt xres xproto USE_GMAKE= yes -USE_GNOME= gnometarget +USE_GNOME= gnometarget pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS=-I${X11BASE}/include \ - LDFLAGS=-L${X11BASE}/lib +CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib \ + XLIBS="-L${LOCALBASE}/lib -lX11" MAN1= xrestop.1 PLIST_FILES= bin/xrestop diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile index 5dd59e9..eba30e1 100644 --- a/x11/xrootconsole/Makefile +++ b/x11/xrootconsole/Makefile @@ -9,13 +9,12 @@ PORTNAME= xrootconsole PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Writes any log live onto the background -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes MAN1= xrootconsole.1 @@ -24,7 +23,7 @@ PLIST_FILES= bin/xrootconsole post-patch: @${REINPLACE_CMD} -e 's|^CC =|CC ?=|g ; \ s|^CFLAGS = -O2|CFLAGS +=|g ; \ - s|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/Makefile + s|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrootconsole ${PREFIX}/bin diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile index ac5d043..4292587 100644 --- a/x11/xrsi/Makefile +++ b/x11/xrsi/Makefile @@ -9,8 +9,7 @@ PORTNAME= xrsi PORTVERSION= 0.9 PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xrsi +MASTER_SITES= SF MAINTAINER= carpetsmoker@xs4all.nl COMMENT= A minimalist break enforcer for linux/unix for the prevention of RSI @@ -20,7 +19,7 @@ PLIST_FILES= bin/xrsi PORTDOCS= Readme Licence do-build: - ${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrsi ${PREFIX}/bin/ diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 12ae2dc..b987c27 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -8,7 +8,7 @@ PORTNAME?= xscreensaver-gnome PORTVERSION= 4.24 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= x11 gnome MASTER_SITES= http://www.jwz.org/xscreensaver/ DISTNAME= xscreensaver-${PORTVERSION} @@ -20,9 +20,8 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]* -USE_XLIB= yes -USE_XPM= yes -USE_GL= yes +USE_XORG= x11 xpm +USE_GL= gl USE_GMAKE= yes USE_PERL5_RUN= yes USE_GNOME= gnomehier libglade2 gnomehack diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile index f851a84..adafe25 100644 --- a/x11/xscreensaver.app/Makefile +++ b/x11/xscreensaver.app/Makefile @@ -9,8 +9,7 @@ PORTNAME= XScreenSaver.App PORTVERSION= 2.3 PORTREVISION= 3 CATEGORIES= x11 windowmaker -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xscreensaverapp +MASTER_SITES= SF/xscreensaverapp MAINTAINER= hemi@puresimplicity.net COMMENT= WindowMaker dockapp to control XScreenSaver @@ -19,9 +18,9 @@ LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp PLIST_FILES= bin/XScreenSaver.App GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib" \ - CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" -MAKE_ARGS= "LDFLAGS+=-L${X11BASE}/lib" +MAKE_ARGS= "LDFLAGS+=-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 3b7f1da..498485e 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ xml2.5:${PORTSDIR}/textproc/libxml2 \ glade-2.0.0:${PORTSDIR}/devel/libglade2 -USE_XPM= yes +USE_XORG= xpm USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile index 201fedf..74f6bd6 100644 --- a/x11/xsnow/Makefile +++ b/x11/xsnow/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= Create a snowy and Santa-y desktop USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN6= xsnow.6 PLIST_FILES= bin/xsnow diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile index 945d939..a90a8d1 100644 --- a/x11/xstarroll/Makefile +++ b/x11/xstarroll/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstarroll PORTVERSION= 1.1b -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ @@ -17,15 +17,14 @@ COMMENT= Letters fly to far, far, far away WRKSRC= ${WRKDIR}/${PORTNAME}-1.1 -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xt xaw ALL_TARGET= xstarroll MAN1= xstarroll.1 PLIST_FILES= bin/xstarroll post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 0f37829..24b937c 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstroke PORTVERSION= 0.5.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \ http://www.handhelds.org/download/projects/xstroke/release-0.5/ @@ -15,9 +15,8 @@ MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Fullscreen gesture recognition -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - USE_BISON= build +USE_XORG= xft x11 USE_IMAKE= yes CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS= -I${LOCALBASE}/include -I. diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index cedbf79..7d7492c 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -20,8 +20,8 @@ BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit USE_XORG= xaw xft GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--enable-wide-chars --enable-luit --with-utempter \ --enable-narrowproto diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile index cb4f931..5d48461 100644 --- a/x11/xtermcontrol/Makefile +++ b/x11/xtermcontrol/Makefile @@ -19,8 +19,8 @@ RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" PLIST_FILES= bin/xtermcontrol MAN1= ${PORTNAME}.1 diff --git a/x11/xtrlock/files/Makefile b/x11/xtrlock/files/Makefile index e0e02fe..26334d7 100644 --- a/x11/xtrlock/files/Makefile +++ b/x11/xtrlock/files/Makefile @@ -18,7 +18,7 @@ LDLIBS=-lX11 -lcrypt CC?=gcc -CFLAGS+=-I${X11BASE}/include -L${X11BASE}/lib +CFLAGS+=-I${LOCALBASE}/include -L${LOCALBASE}/lib INSTALL=install -c INSTALL_PROGRAM = ${INSTALL} INSTPGMFLAGS = -s -o root -m4111 diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 3c699cb..7c2f327 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -8,7 +8,7 @@ PORTNAME= xvattr PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -17,6 +17,7 @@ COMMENT= Getting and setting Xv attributes USE_PERL5_BUILD= yes USE_GNOME= gtk12 +USE_XORG= x11 xv GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index 3757ddbd..788cd3e 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -25,7 +25,7 @@ USE_IMAKE= yes .include <bsd.port.pre.mk> .if defined(WITH_XAW3D) -BUILD_DEPENDS= ${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d +BUILD_DEPENDS= ${LOCALBASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d .endif .if defined(WITH_XAW3D) diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile index 17917fd..f5b2d6e 100644 --- a/x11/xxkb/Makefile +++ b/x11/xxkb/Makefile @@ -8,15 +8,14 @@ PORTNAME= xxkb PORTVERSION= 1.11 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xxkb +MASTER_SITES= SF/xxkb DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= alexander.pohoyda@gmx.net COMMENT= An XKB keyboard layout switcher and indicator WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes MAN1= xxkb.1 |
