diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
| commit | 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch) | |
| tree | 17937489af4c767844fc63b684ae3e7b31948812 /www | |
| parent | e959473966b963953d63d5f00fae8751f2decf0f (diff) | |
| download | freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'www')
56 files changed, 433 insertions, 149 deletions
diff --git a/www/adblock/Makefile b/www/adblock/Makefile index 12b2dc219122..1403cc14f5b5 100644 --- a/www/adblock/Makefile +++ b/www/adblock/Makefile @@ -7,7 +7,7 @@ PORTNAME= adblock DISTVERSION= 0.5-dev -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= thierry @@ -16,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= A content filtering plug-in for ${GECKO} -USE_X_PREFIX= yes - PLIST_FILES= %%MOZDIR%%/chrome/adblock.jar .include <bsd.port.pre.mk> diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 543f55c0b1ba..b7add880c6bd 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -3,11 +3,12 @@ # Whom: Koop Mast <einekoai@chello.nl> # # $FreeBSD$ -# $MCom: ports-stable/www/bluefish/Makefile,v 1.2 2005/08/21 20:03:36 kwm Exp $ +# $MCom: ports/www/bluefish/Makefile,v 1.1 2006/09/30 03:21:27 ahze Exp $ # PORTNAME= bluefish PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= www editors MASTER_SITES= http://pkedu.fbt.wur.nl/~olivier/${DOWNLOAD}/ \ http://bluefish.mrball.net/${DOWNLOAD}/ \ @@ -30,9 +31,9 @@ RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy DOWNLOAD= downloads USE_BZIP2= yes +USE_GETTEXT= yes USE_GNOME= gnomehier gtk20 gnomevfs2 WANT_GNOME= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist index 98753d37e35f..47400723d38b 100644 --- a/www/bluefish/pkg-plist +++ b/www/bluefish/pkg-plist @@ -54,3 +54,21 @@ share/mime/packages/bluefish.xml @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile index 24431a38dff3..97cde4c64093 100644 --- a/www/bugmenot/Makefile +++ b/www/bugmenot/Makefile @@ -7,6 +7,7 @@ PORTNAME= bugmenot PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://extensions.roachfiend.com/ DISTNAME= ${PORTNAME} @@ -15,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${PORTREVISION} MAINTAINER= thierry@FreeBSD.org COMMENT= ${GECKO} extension to bypass compulsory web registration -USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>. - PLIST_FILES= %%MOZDIR%%/chrome/bugmenot.jar .include <bsd.port.pre.mk> diff --git a/www/bugmenot/distinfo b/www/bugmenot/distinfo index 4b6d6cdca957..b5874e6ad0a2 100644 --- a/www/bugmenot/distinfo +++ b/www/bugmenot/distinfo @@ -1,3 +1,3 @@ -MD5 (bugmenot-1.3_0/bugmenot.xpi) = f446463062b623004db61563eab815c2 -SHA256 (bugmenot-1.3_0/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18 -SIZE (bugmenot-1.3_0/bugmenot.xpi) = 19249 +MD5 (bugmenot-1.3_1/bugmenot.xpi) = f446463062b623004db61563eab815c2 +SHA256 (bugmenot-1.3_1/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18 +SIZE (bugmenot-1.3_1/bugmenot.xpi) = 19249 diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 7aba8c75f6db..88cdf524b8de 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= -devel MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -84,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox-devel/files/patch-nothreads-sqlite3 b/www/firefox-devel/files/patch-nothreads-sqlite index 1b1bbbcbda15..1b1bbbcbda15 100644 --- a/www/firefox-devel/files/patch-nothreads-sqlite3 +++ b/www/firefox-devel/files/patch-nothreads-sqlite diff --git a/www/firefox-remote/Makefile b/www/firefox-remote/Makefile index ce55b553ee5b..e580beba8bf8 100644 --- a/www/firefox-remote/Makefile +++ b/www/firefox-remote/Makefile @@ -7,6 +7,7 @@ PORTNAME= firefox PORTVERSION= 20040803 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.webonaut.com/distfiles/${PORTNAME}${PKGNAMESUFFIX}/ PKGNAMESUFFIX= -remote @@ -16,15 +17,14 @@ MAINTAINER= klammer@webonaut.com COMMENT= Wrapper scripts for firefox web browser USE_BZIP2= yes -USE_X_PREFIX= yes UTF8_HACK= no FIREFOX_REMOTE= ${PORTNAME}${PKGNAMESUFFIX} THUNDERBIRD_REMOTE= thunderbird${PKGNAMESUFFIX} OPTIONS=UTF8_LOCALE "Use UTF8 locale (read Makefile for details)" off \ - MENU_FIREFOX "Add GNOME menu entry for firefox" off \ - MENU_THUNDERBIRD "Add GNOME menu entry for thunderbird" off + MENU_FIREFOX "Add menu entry for firefox" off \ + MENU_THUNDERBIRD "Add menu entry for thunderbird" off .include <bsd.port.pre.mk> @@ -62,15 +62,15 @@ do-install: ${PREFIX}/bin/${THUNDERBIRD_REMOTE} .if defined (WITH_MENU_FIREFOX) ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \ - ${X11BASE}/share/gnome/applications/ + ${X11BASE}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \ - ${X11BASE}/share/gnome/pixmaps/ + ${X11BASE}/share/pixmaps/ .endif .if defined (WITH_MENU_THUNDERBIRD) ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \ - ${X11BASE}/share/gnome/applications/ + ${X11BASE}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \ - ${X11BASE}/share/gnome/pixmaps/ + ${X11BASE}/share/pixmaps/ .endif ${CAT} ${PKGMESSAGE} diff --git a/www/firefox-remote/pkg-plist b/www/firefox-remote/pkg-plist index 6898e0e433c2..fa3626ff6426 100644 --- a/www/firefox-remote/pkg-plist +++ b/www/firefox-remote/pkg-plist @@ -1,6 +1,7 @@ bin/firefox-remote bin/thunderbird-remote -%%MENU_FIREFOX%%share/gnome/applications/mozilla_firefox.desktop -%%MENU_THUNDERBIRD%%share/gnome/applications/mozilla_thunderbird.desktop -%%MENU_FIREFOX%%share/gnome/pixmaps/mozilla_firefox.png -%%MENU_THUNDERBIRD%%share/gnome/pixmaps/mozilla_thunderbird.png +%%MENU_FIREFOX%%share/applications/mozilla_firefox.desktop +%%MENU_THUNDERBIRD%%share/applications/mozilla_thunderbird.desktop +%%MENU_FIREFOX%%share/pixmaps/mozilla_firefox.png +%%MENU_THUNDERBIRD%%share/pixmaps/mozilla_thunderbird.png +@dirrmtry share/applications diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 7aba8c75f6db..88cdf524b8de 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= -devel MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -84,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox3-devel/files/patch-nothreads-sqlite3 b/www/firefox3-devel/files/patch-nothreads-sqlite index 1b1bbbcbda15..1b1bbbcbda15 100644 --- a/www/firefox3-devel/files/patch-nothreads-sqlite3 +++ b/www/firefox3-devel/files/patch-nothreads-sqlite diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index 7aba8c75f6db..88cdf524b8de 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= -devel MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -84,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox35/files/patch-nothreads-sqlite3 b/www/firefox35/files/patch-nothreads-sqlite index 1b1bbbcbda15..1b1bbbcbda15 100644 --- a/www/firefox35/files/patch-nothreads-sqlite3 +++ b/www/firefox35/files/patch-nothreads-sqlite diff --git a/www/flock/Makefile b/www/flock/Makefile index 701b3236aa53..376b5a3381ea 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ +# $MCom: ports/www/flock/Makefile,v 1.2 2006/10/05 21:37:18 mezz Exp $ # PORTNAME= flock DISTVERSION= 0.7 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} # http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock @@ -23,7 +24,6 @@ LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ MOZILLA_NAME= Flock CLUCENE_WRKSRC= ${WRKDIR}/clucene -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -52,10 +52,6 @@ OPTIONS= SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" -BROKEN= Does not build on amd64 -.endif - .if ${ARCH}=="alpha" || ${ARCH}=="ia64" IGNORE= core dumps on ${ARCH} .endif @@ -89,6 +85,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ @@ -108,5 +105,5 @@ post-install: ${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/share/pixmaps/${FLOCK_ICON} -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include <bsd.port.post.mk> diff --git a/www/galeon/Makefile b/www/galeon/Makefile index be224b724f2b..3ba83e11a968 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/galeon/Makefile,v 1.7 2005/11/28 17:45:54 ahze Exp $ +# $MCom: ports/www/galeon/Makefile,v 1.9 2006/07/27 18:09:47 mezz Exp $ # PORTNAME= galeon PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://osdn.dl.sourceforge.net/sourceforge/galeon/ @@ -19,7 +20,7 @@ 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_X_PREFIX= yes +USE_XLIB= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ gnomedesktop @@ -54,7 +55,7 @@ post-patch: 's|malloc\.h|stdlib.h|g' @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \ ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in - @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${X11BASE}/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \ + @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \ ${WRKSRC}/mozilla/mozilla-embed-shell.cpp .include <bsd.port.post.mk> diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist index ec5501e7ebee..bdd8285031b2 100644 --- a/www/galeon/pkg-plist +++ b/www/galeon/pkg-plist @@ -218,10 +218,6 @@ share/locale/wa/LC_MESSAGES/galeon-2.0.mo share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrm share/gnome/sounds/galeon @dirrm share/gnome/omf/galeon @dirrm share/gnome/help/galeon/es/figures @@ -235,3 +231,43 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo @dirrm share/gnome/galeon @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile index ebc6a1e2a114..242a3a4c0a3e 100644 --- a/www/glibwww/Makefile +++ b/www/glibwww/Makefile @@ -7,7 +7,7 @@ PORTNAME= glibwww PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/glibwww/0.2 @@ -17,11 +17,10 @@ COMMENT= A library for people wanting to use libwww with gtk/gnome LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomelibs GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile index 8594ff3e50b1..6d0214a61d58 100644 --- a/www/gnome-web-photo/Makefile +++ b/www/gnome-web-photo/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-web-photo/Makefile,v 1.1 2005/12/01 06:25:42 ahze Exp $ +# $MCom: ports/www/gnome-web-photo/Makefile,v 1.3 2006/08/20 01:51:48 mezz Exp $ # PORTNAME= gnome-web-photo PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 @@ -20,8 +21,8 @@ USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gecko=${GECKO} USE_GMAKE= yes -USE_X_PREFIX= yes -USE_GNOME= gnomevfs2 gnomehack +USE_XLIB= yes +USE_GNOME= gnomevfs2 gnomehack gnomeprefix GCONF_SCHEMAS= thumbnailer.schemas .include <bsd.port.pre.mk> diff --git a/www/gnome-web-photo/pkg-plist b/www/gnome-web-photo/pkg-plist index a24099dfbeaf..816a430a88e0 100644 --- a/www/gnome-web-photo/pkg-plist +++ b/www/gnome-web-photo/pkg-plist @@ -1,6 +1,6 @@ bin/gnome-web-photo bin/gnome-web-print bin/gnome-web-thumbnail -%%DATADIR%%/prefs.js -%%DATADIR%%/style.css -@dirrm %%DATADIR%% +share/gnome/gnome-web-photo/prefs.js +share/gnome/gnome-web-photo/style.css +@dirrm share/gnome/gnome-web-photo diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 783d3f2c934e..cfec1ebda39c 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml PORTVERSION= 1.1.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 @@ -19,11 +19,11 @@ COMMENT= Lightweight HTML rendering/printing/editing engine LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal USE_GETTEXT= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh index 4f45451884d8..4dc806a68c1b 100644 --- a/www/gtkhtml/files/gtkhtmlConf.sh +++ b/www/gtkhtml/files/gtkhtmlConf.sh @@ -1,5 +1,5 @@ GTKHTML_LIBDIR="-L%%PREFIX%%/lib" GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" -GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%X11BASE%%/include/gdk-pixbuf-1.0 -I%%X11BASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%X11BASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%X11BASE%%/include/libglade-1.0 -I%%X11BASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" +GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" GTKHTML_DATADIR="%%PREFIX%%/share/gnome" MODULE_VERSION="%%VERSION%%" diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist index 4eae08527c73..43c5598eeee2 100644 --- a/www/gtkhtml/pkg-plist +++ b/www/gtkhtml/pkg-plist @@ -202,3 +202,33 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo @dirrm %%DOCSDIR%% @dirrm include/gtkhtml-1.1/gtkhtml @dirrm include/gtkhtml-1.1 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 4a027c033473..6286b38a095d 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.10.3 +PORTVERSION= 3.12.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,11 +21,11 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ libgnomeprintui ltverhack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 88125d5b0785..f4e41067dd8b 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.10.3.tar.bz2) = 90b1807db0ef0e5d69442e1f85610ec4 -SHA256 (gnome2/gtkhtml-3.10.3.tar.bz2) = 182eac40325c7d279a3b48bbc53ed8299d97e5d75479ca553a62e2200a9eab27 -SIZE (gnome2/gtkhtml-3.10.3.tar.bz2) = 1269807 +MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa +SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f +SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 9bb8dfce8c6f..b8be05dbf59f 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -89,6 +89,7 @@ share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -119,14 +120,17 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -149,12 +153,60 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz @dirrm share/gnome/gtkhtml-%%VERSION%%/icons @dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml @dirrm include/libgtkhtml-%%VERSION%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 4a027c033473..6286b38a095d 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.10.3 +PORTVERSION= 3.12.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,11 +21,11 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ libgnomeprintui ltverhack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 88125d5b0785..f4e41067dd8b 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.10.3.tar.bz2) = 90b1807db0ef0e5d69442e1f85610ec4 -SHA256 (gnome2/gtkhtml-3.10.3.tar.bz2) = 182eac40325c7d279a3b48bbc53ed8299d97e5d75479ca553a62e2200a9eab27 -SIZE (gnome2/gtkhtml-3.10.3.tar.bz2) = 1269807 +MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa +SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f +SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075 diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index 9bb8dfce8c6f..b8be05dbf59f 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -89,6 +89,7 @@ share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -119,14 +120,17 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -149,12 +153,60 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz @dirrm share/gnome/gtkhtml-%%VERSION%%/icons @dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml @dirrm include/libgtkhtml-%%VERSION%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile index 767996edfc03..d356e0f13757 100644 --- a/www/kompozer/Makefile +++ b/www/kompozer/Makefile @@ -3,12 +3,11 @@ # Whom: Thierry Thomas <thierry@pompo.net> # # $FreeBSD$ -# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $ -# +# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $ PORTNAME= nvu DISTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://cvs.nvu.com/download/ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources @@ -16,7 +15,6 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources MAINTAINER= gnome@FreeBSD.org COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage -USE_X_PREFIX= yes USE_BZIP2= yes WANT_GNOME= yes USE_GMAKE= yes @@ -27,7 +25,7 @@ PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux CFLAGS+= -I${X11BASE}/include .include <bsd.port.pre.mk> -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${ARCH} == "ia64" BROKEN= does not build diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 8d4fdf387621..64796c8b248e 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/libgtkhtml/Makefile,v 1.36 2005/10/14 20:39:58 adamw Exp $ +# $MCom: ports/www/libgtkhtml/Makefile,v 1.39 2006/09/10 00:51:14 mezz Exp $ # PORTNAME= libgtkhtml PORTVERSION= 2.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11 @@ -18,10 +18,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/mozex/Makefile b/www/mozex/Makefile index 8bac7822c053..fb274c784eb7 100644 --- a/www/mozex/Makefile +++ b/www/mozex/Makefile @@ -3,11 +3,12 @@ # Whom: Thierry Thomas (<thierry@pompo.net>) # # $FreeBSD$ +# $MCom: ports/www/mozex/Makefile,v 1.2 2006/09/22 19:52:59 mezz Exp $ # PORTNAME= mozex PORTVERSION= 1.07 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www mail news ftp MASTER_SITES= ${MASTER_SITE_MOZDEV} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,8 +16,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Mozex allows users of ${GEKO} to use external programs for mail, news, etc. -USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>. - SUB_FILES= pkg-message SUB_LIST= GECKO=${GECKO} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi index 2ad122c92d2f..434c9d0eb4ce 100644 --- a/www/mozex/Makefile.xpi +++ b/www/mozex/Makefile.xpi @@ -16,7 +16,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${PKGINSTALL} MOZLDIR= lib/${GECKO} -MOZDIR= ${X11BASE}/${MOZLDIR} +MOZDIR= ${LOCALBASE}/${MOZLDIR} PLIST_SUB= MOZDIR=${MOZLDIR} pre-configure: @@ -25,9 +25,9 @@ pre-configure: > ${PKGINSTALL} pre-install: -.if ${PREFIX} != ${X11BASE} +.if ${PREFIX} != ${LOCALBASE} @${ECHO_MSG} "" - @${ECHO_MSG} "${PREFIX} invalid - must be installed under ${X11BASE}." + @${ECHO_MSG} "${PREFIX} invalid - must be installed under ${LOCALBASE}." @${ECHO_MSG} "" @${FALSE} .else diff --git a/www/mozex/pkg-install.xpi b/www/mozex/pkg-install.xpi index 2315d7a8490d..511847138987 100644 --- a/www/mozex/pkg-install.xpi +++ b/www/mozex/pkg-install.xpi @@ -13,7 +13,7 @@ PATH=/bin:/usr/bin [ "x$2" = "xPRE-INSTALL" ] && exit 0 [ "x$2" = "xDEINSTALL" ] && exit 0 -PREFIX=${PKG_PREFIX:-/usr/X11R6} +PREFIX=${PKG_PREFIX:-/usr/local} PKG_NAME=${1%%-[0-9._]*} diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index b73fb9346220..43ff04711727 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= mplayerplug-in PORTVERSION= 3.31 +PORTREVISION= 1 CATEGORIES= www multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mplayerplug-in @@ -17,7 +18,6 @@ COMMENT= A Mozilla plugin for the MPlayer media player RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GECKO= firefox mozilla seamonkey diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist index 6622d496f65e..5af28f14081c 100644 --- a/www/mplayer-plugin/pkg-plist +++ b/www/mplayer-plugin/pkg-plist @@ -28,8 +28,12 @@ share/locale/pl/LC_MESSAGES/mplayerplug-in.mo share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo share/locale/ru/LC_MESSAGES/mplayerplug-in.mo share/locale/se/LC_MESSAGES/mplayerplug-in.mo -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US +@dirrmtry lib/browser_plugins @dirrmtry share/locale/se/LC_MESSAGES @dirrmtry share/locale/se -@dirrmtry lib/browser_plugins +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US diff --git a/www/nscache/Makefile b/www/nscache/Makefile index 0c2680e9a1cd..14c9b0c3218f 100644 --- a/www/nscache/Makefile +++ b/www/nscache/Makefile @@ -3,11 +3,11 @@ # Whom: Kris Kennaway <kris@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/www/nscache/Makefile,v 1.1 2006/10/04 11:49:18 ahze Exp $ PORTNAME= nscache PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.idata.sk/~ondrej/sw/ @@ -17,7 +17,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Netscape cache browser -USE_X_PREFIX= yes USE_GNOME= gnomehier gtk12 USE_GETOPT_LONG= yes USE_GMAKE= yes diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist index c67f02bef6d8..50d9f91a1031 100644 --- a/www/nscache/pkg-plist +++ b/www/nscache/pkg-plist @@ -9,3 +9,5 @@ share/locale/sk/LC_MESSAGES/nscache.mo share/locale/tr/LC_MESSAGES/nscache.mo share/gnome/apps/Internet/nscache.desktop share/gnome/pixmaps/nscache.xpm +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk diff --git a/www/nvu/Makefile b/www/nvu/Makefile index 767996edfc03..d356e0f13757 100644 --- a/www/nvu/Makefile +++ b/www/nvu/Makefile @@ -3,12 +3,11 @@ # Whom: Thierry Thomas <thierry@pompo.net> # # $FreeBSD$ -# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $ -# +# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $ PORTNAME= nvu DISTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://cvs.nvu.com/download/ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources @@ -16,7 +15,6 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources MAINTAINER= gnome@FreeBSD.org COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage -USE_X_PREFIX= yes USE_BZIP2= yes WANT_GNOME= yes USE_GMAKE= yes @@ -27,7 +25,7 @@ PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux CFLAGS+= -I${X11BASE}/include .include <bsd.port.pre.mk> -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${ARCH} == "ia64" BROKEN= does not build diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index c410e680c8b7..94590321b1ea 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= openvrml PORTVERSION= 0.15.10 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,23 +15,22 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= VRML97 runtime and browser ("lookat") -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \ +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \ ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla USE_GL= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gtk20 USE_SDL= sdl USE_GCC= 3.4 USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \ - XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla" + LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${LOCALBASE}/lib/mozilla -L${X11BASE}/lib -lXext" \ + XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/www/openvrml/files/lookat.sh.in b/www/openvrml/files/lookat.sh.in index 163a887c2561..0f3d2f823315 100644 --- a/www/openvrml/files/lookat.sh.in +++ b/www/openvrml/files/lookat.sh.in @@ -1,4 +1,4 @@ #! /bin/sh # $FreeBSD$ -LD_LIBRARY_PATH=%%X11BASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1 +LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1 diff --git a/www/openvrml/files/patch-030_freetype_prototypes b/www/openvrml/files/patch-030_freetype_prototypes new file mode 100644 index 000000000000..5f6dc6700380 --- /dev/null +++ b/www/openvrml/files/patch-030_freetype_prototypes @@ -0,0 +1,50 @@ +Index: openvrml-0.15.10/src/libopenvrml/openvrml/vrml97node.cpp +=================================================================== +--- src/libopenvrml/openvrml/vrml97node.cpp.orig 2006-06-11 14:23:00.000000000 +0200 ++++ src/libopenvrml/openvrml/vrml97node.cpp 2006-06-11 15:12:02.000000000 +0200 +@@ -16604,7 +16604,7 @@ + + const float stepSize_ = 0.2; + +- int moveTo_(FT_Vector * const to, void * const user) throw () ++ int moveTo_(const FT_Vector * to, void * user) + { + using std::vector; + assert(user); +@@ -16620,7 +16620,7 @@ + return 0; + } + +- int lineTo_(FT_Vector * const to, void * const user) throw () ++ int lineTo_(const FT_Vector * to, void * user) + { + assert(user); + GlyphContours_ & c = *static_cast<GlyphContours_ *>(user); +@@ -16682,10 +16682,9 @@ + } + } + +- int conicTo_(FT_Vector * const control, +- FT_Vector * const to, ++ int conicTo_(const FT_Vector * control, ++ const FT_Vector * to, + void * const user) +- throw () + { + using std::vector; + +@@ -16716,11 +16715,10 @@ + return 0; + } + +- int cubicTo_(FT_Vector * const control1, +- FT_Vector * const control2, +- FT_Vector * const to, ++ int cubicTo_(const FT_Vector * control1, ++ const FT_Vector * control2, ++ const FT_Vector * to, + void * const user) +- throw () + { + using std::vector; + diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist index ca4e10060b88..ac860cb3607b 100644 --- a/www/openvrml/pkg-plist +++ b/www/openvrml/pkg-plist @@ -59,3 +59,4 @@ lib/mozilla/plugins/openvrml.xpt @dirrmtry share/gtk-doc/html/gtkglext @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc +@dirrmtry share/pixmaps diff --git a/www/plugger-plugins-hubbe/Makefile b/www/plugger-plugins-hubbe/Makefile index eee9dc85b0f7..88f9d82212d8 100644 --- a/www/plugger-plugins-hubbe/Makefile +++ b/www/plugger-plugins-hubbe/Makefile @@ -7,7 +7,7 @@ PORTNAME= plugger-plugins-hubbe PORTVERSION= 5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www multimedia audio graphics print editors MASTER_SITES= # empty DISTFILES= # empty @@ -29,7 +29,7 @@ RUN_DEPENDS= sidplay:${PORTSDIR}/audio/sidplay \ plugger-controller:${PORTSDIR}/www/plugger \ gv:${PORTSDIR}/print/gv \ xmp:${PORTSDIR}/audio/xmp \ - ${X11BASE}/bin/xscreensaver-hacks/molecule:${PORTSDIR}/x11/xscreensaver-gnome \ + ${LOCALBASE}/bin/xscreensaver-hacks/molecule:${PORTSDIR}/x11/xscreensaver-gnome \ mplayer:${PORTSDIR}/multimedia/mplayer \ gnumeric:${PORTSDIR}/math/gnumeric \ abiword:${PORTSDIR}/editors/abiword \ diff --git a/www/plugger/Makefile b/www/plugger/Makefile index ad6de8985fc3..fa02ac1445ac 100644 --- a/www/plugger/Makefile +++ b/www/plugger/Makefile @@ -7,7 +7,7 @@ PORTNAME= plugger PORTVERSION= 5.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www audio graphics multimedia MASTER_SITES= http://fredrik.hubbe.net/plugger/ @@ -24,7 +24,7 @@ PKGDEINSTALL= ${PKGINSTALL} post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/X11R6/lib/xscreensaver|${X11BASE}/bin/xscreensaver-hacks|g ; \ + 's|/usr/X11R6/lib/xscreensaver|${LOCALBASE}/bin/xscreensaver-hacks|g ; \ s|acroread|acroread7|g ; s|+useFrontEndProgram||g' \ ${WRKSRC}/pluggerrc diff --git a/www/preferential/Makefile b/www/preferential/Makefile index eaece5814d54..43f1565d6a78 100644 --- a/www/preferential/Makefile +++ b/www/preferential/Makefile @@ -7,7 +7,7 @@ PORTNAME= preferential PORTVERSION= 0.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZDEV} MASTER_SITE_SUBDIR= ${PORTNAME}/versions @@ -16,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GUI interface to view & edit all ${GECKO} prefs -USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>. - PLIST_FILES= %%MOZDIR%%/chrome/preferential.jar .include <bsd.port.pre.mk> diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile index b9ee5b4c4e4d..5b3668020c82 100644 --- a/www/ruby-gtkmozembed/Makefile +++ b/www/ruby-gtkmozembed/Makefile @@ -3,11 +3,12 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/ruby-gtkmozembed/Makefile,v 1.2 2005/10/17 07:05:42 mezz Exp $ +# $MCom: ports/www/ruby-gtkmozembed/Makefile,v 1.4 2006/08/01 04:53:58 mezz Exp $ # PORTNAME= gtkmozembed PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= www ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} @@ -36,7 +37,7 @@ DOCS= COPYING.LIB ChangeLog README post-patch: @${REINPLACE_CMD} -e 's|xulrunner-|${GECKO}-|g ; \ - s|%%GECKO_PATH%%|${X11BASE}/lib/${GECKO}|g' \ + s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \ ${WRKSRC}/extconf.rb post-install: diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 6ee69795b7b3..551d4616db4b 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= screem PORTVERSION= 0.16.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -33,7 +33,7 @@ GCONF_SCHEMAS= screem.schemas .if defined(WITHOUT_DBUS) CONFIGURE_ARGS+= --disable-dbus .else -LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+= --enable-dbus .endif diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist index b78d729b40d9..a51df3a2b1fb 100644 --- a/www/screem-devel/pkg-plist +++ b/www/screem-devel/pkg-plist @@ -247,5 +247,21 @@ share/mime/packages/screem.xml @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/www/screem/Makefile b/www/screem/Makefile index 6ee69795b7b3..551d4616db4b 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -7,7 +7,7 @@ PORTNAME= screem PORTVERSION= 0.16.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -33,7 +33,7 @@ GCONF_SCHEMAS= screem.schemas .if defined(WITHOUT_DBUS) CONFIGURE_ARGS+= --disable-dbus .else -LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+= --enable-dbus .endif diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist index b78d729b40d9..a51df3a2b1fb 100644 --- a/www/screem/pkg-plist +++ b/www/screem/pkg-plist @@ -247,5 +247,21 @@ share/mime/packages/screem.xml @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 160536861e4b..a09312b5ddbc 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,11 +3,12 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports-stable/www/seamonkey/Makefile,v 1.1 2006/03/09 21:26:46 ahze Exp $ +# $MCom: ports/www/seamonkey/Makefile,v 1.40 2006/09/15 16:11:00 ahze Exp $ # PORTNAME= seamonkey DISTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} @@ -21,7 +22,6 @@ USE_GMAKE= yes WANT_GNOME= yes HAS_CONFIGURE= yes ALL_TARGET= default -USE_X_PREFIX= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" @@ -57,9 +57,8 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz IGNORE= core dumps on ${ARCH} during post-build .endif -.if ${ARCH}=="sparc64" # && ${OSVERSION} < 601101 -#IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -BROKEN= regchrome core dumps in sparc64 +.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 +IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 .endif .if ${OSVERSION} < 500000 @@ -132,5 +131,5 @@ do-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include <bsd.port.post.mk> diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 160536861e4b..a09312b5ddbc 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -3,11 +3,12 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports-stable/www/seamonkey/Makefile,v 1.1 2006/03/09 21:26:46 ahze Exp $ +# $MCom: ports/www/seamonkey/Makefile,v 1.40 2006/09/15 16:11:00 ahze Exp $ # PORTNAME= seamonkey DISTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} @@ -21,7 +22,6 @@ USE_GMAKE= yes WANT_GNOME= yes HAS_CONFIGURE= yes ALL_TARGET= default -USE_X_PREFIX= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" @@ -57,9 +57,8 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz IGNORE= core dumps on ${ARCH} during post-build .endif -.if ${ARCH}=="sparc64" # && ${OSVERSION} < 601101 -#IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -BROKEN= regchrome core dumps in sparc64 +.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 +IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 .endif .if ${OSVERSION} < 500000 @@ -132,5 +131,5 @@ do-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include <bsd.port.post.mk> diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index 17dfd288ee30..c96f33368583 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= swfdec-plugin PORTVERSION= 0.3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.schleef.org/swfdec/download/ DISTNAME= swfdec-${PORTVERSION} @@ -17,18 +17,17 @@ COMMENT= Flash rendering plugin LIB_DEPENDS= swfdec-0.3.0:${PORTSDIR}/graphics/swfdec .if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox .else -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} .endif BROKEN= Does not compile DEPRECATED= ${BROKEN} EXPIRATION_DATE=2006-12-01 -USE_X_PREFIX= yes USE_SDL= sdl USE_GNOME= gnomehack gtk20 libartlgpl2 USE_GSTREAMER80= gconf @@ -38,9 +37,9 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -CONFIGURE_ENV+= MOZILLA_CONFIG="${X11BASE}/bin/firefox-config" +CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/firefox-config" .else -CONFIGURE_ENV+= MOZILLA_CONFIG="${X11BASE}/lib/mozilla/mozilla-config" +CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/lib/mozilla/mozilla-config" .endif INSTALLS_SHLIB= yes diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile index 0e53a57c581d..9722d9de2875 100644 --- a/www/syndigator/Makefile +++ b/www/syndigator/Makefile @@ -4,9 +4,11 @@ # Whom: ijliao # # $FreeBSD$ +# $MCom: ports/www/syndigator/Makefile,v 1.1 2006/09/30 18:31:24 ahze Exp $ PORTNAME= syndigator PORTVERSION= 0.15.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,7 +26,7 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-T ${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \ ${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2 -USE_X_PREFIX= yes +USE_X_LIB= yes USE_GNOME= gnomehier USE_PERL5= yes NO_BUILD= yes diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index cfdd31b60342..f809c09324d6 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.6 2006/02/26 16:58:29 ahze Exp $ +# $MCom: ports/www/xulrunner/Makefile,v 1.13 2006/10/12 12:22:03 ahze Exp $ PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 1 +PORTREVISION?= 4 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ @@ -16,7 +16,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER?= gnome@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default HAS_CONFIGURE= yes @@ -25,12 +24,14 @@ USE_GMAKE= yes USE_GCC= 3.4+ PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --disable-javaxpcom +MOZ_OPTIONS?= --disable-javaxpcom --enable-canvas \ + --enable-system-cairo MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS +USE_GECKO_OPTIONS= java debug logging optimized_cflags .include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${OSVERSION} < 500000 BROKEN= does not build diff --git a/www/xulrunner/files/patch-xulrunner_app_mozilla.in b/www/xulrunner/files/patch-xulrunner_app_mozilla.in new file mode 100644 index 000000000000..1839a79d7d0a --- /dev/null +++ b/www/xulrunner/files/patch-xulrunner_app_mozilla.in @@ -0,0 +1,18 @@ +--- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006 ++++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006 +@@ -193,12 +193,12 @@ + done #others arg + + #???: needs check if othersopt begin with -* ? +-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then ++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then + # Last argument seems to be a local file/directory + # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) + # If it is just "relatively" (./file) specified, make it absolutely +- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" +-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... ++ [ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" ++elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before... + _NEW_WINDOW=1 + fi + |