diff options
Diffstat (limited to 'www')
63 files changed, 108 insertions, 119 deletions
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/ |