Browse Source

- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.
main
Florent Thoumie 15 years ago
parent
commit
d4f0d0048a
  1. 8
      MOVED
  2. 118
      Mk/bsd.port.mk
  3. 262
      Mk/bsd.xorg.mk
  4. 156
      Tools/scripts/mergebase.sh
  5. 103
      UPDATING
  6. 1
      accessibility/at-poke/Makefile
  7. 2
      accessibility/at-spi/Makefile
  8. 36
      accessibility/at-spi/pkg-plist
  9. 2
      accessibility/atk/Makefile
  10. 40
      accessibility/atk/pkg-plist
  11. 1
      accessibility/dasher/Makefile
  12. 38
      accessibility/dasher/pkg-plist
  13. 2
      accessibility/gail/Makefile
  14. 38
      accessibility/gail/pkg-plist
  15. 1
      accessibility/gnome-mag/Makefile
  16. 38
      accessibility/gnome-mag/pkg-plist
  17. 2
      accessibility/gnopernicus/Makefile
  18. 32
      accessibility/gnopernicus/pkg-plist
  19. 1
      accessibility/gok/Makefile
  20. 34
      accessibility/gok/pkg-plist
  21. 2
      accessibility/java-access-bridge/Makefile
  22. 1
      accessibility/kaccessible/Makefile
  23. 1
      accessibility/kdeaccessibility/Makefile
  24. 1
      accessibility/kdeaccessibility4/Makefile
  25. 1
      accessibility/kmag/Makefile
  26. 1
      accessibility/kmousetool/Makefile
  27. 1
      accessibility/kmouth/Makefile
  28. 1
      accessibility/orca/Makefile
  29. 28
      accessibility/orca/pkg-plist
  30. 2
      accessibility/qt4-accessible/Makefile
  31. 1
      arabic/ae_fonts_mono/Makefile
  32. 1
      arabic/ae_fonts_ttf/Makefile
  33. 1
      arabic/arabtex/Makefile
  34. 1
      arabic/kacst_fonts/Makefile
  35. 2
      arabic/katoob/Makefile
  36. 2
      arabic/katoob/pkg-plist
  37. 1
      arabic/kde3-i18n/Makefile
  38. 1
      arabic/kde4-l10n/Makefile
  39. 1
      arabic/khotot/Makefile
  40. 1
      arabic/koffice-i18n/Makefile
  41. 1
      archivers/ark/Makefile
  42. 2
      archivers/deepforest/Makefile
  43. 1
      archivers/dpkg/Makefile
  44. 2
      archivers/dpkg/pkg-plist
  45. 1
      archivers/file-roller/Makefile
  46. 38
      archivers/file-roller/pkg-plist
  47. 1
      archivers/freetar/Makefile
  48. 1
      archivers/jzip.org/Makefile
  49. 1
      archivers/jzlib/Makefile
  50. 1
      archivers/kbackup/Makefile
  51. 1
      archivers/kio_p7zip/Makefile
  52. 1
      archivers/ocaml-zip/Makefile
  53. 1
      archivers/rox-archive/Makefile
  54. 2
      archivers/rpm4/Makefile
  55. 2
      archivers/rpm5/Makefile
  56. 1
      archivers/xarchive/Makefile
  57. 1
      archivers/zipper/Makefile
  58. 2
      astro/boinc-einsteinathome/Makefile
  59. 1
      astro/boinc-setiathome-enhanced/Makefile
  60. 2
      astro/celestia/Makefile
  61. 7
      astro/celestia/pkg-plist
  62. 2
      astro/gaia/Makefile
  63. 2
      astro/gkrellmoon/Makefile
  64. 2
      astro/gkrellmoon2/Makefile
  65. 2
      astro/gkrellsun/Makefile
  66. 2
      astro/glunarclock/Makefile
  67. 12
      astro/glunarclock/pkg-plist
  68. 2
      astro/gpsdrive/Makefile
  69. 1
      astro/gpsman/Makefile
  70. 2
      astro/nightfall/Makefile
  71. 2
      astro/nova/Makefile
  72. 2
      astro/openmap/Makefile
  73. 2
      astro/openuniverse/Makefile
  74. 2
      astro/orsa/Makefile
  75. 2
      astro/planets/Makefile
  76. 1
      astro/position/Makefile
  77. 1
      astro/pp3/Makefile
  78. 1
      astro/ptiger/Makefile
  79. 2
      astro/rmap/Makefile
  80. 2
      astro/roadmap/Makefile
  81. 1
      astro/saoimage/Makefile
  82. 1
      astro/sattrack/Makefile
  83. 2
      astro/spacechart/Makefile
  84. 1
      astro/starplot/Makefile
  85. 1
      astro/stars/Makefile
  86. 1
      astro/stellarium/Makefile
  87. 26
      astro/stellarium/pkg-plist
  88. 1
      astro/sunclock/Makefile
  89. 1
      astro/tkgeomap/Makefile
  90. 2
      astro/wmglobe/Makefile
  91. 2
      astro/wmjupiter/Makefile
  92. 2
      astro/wmmoonclock/Makefile
  93. 2
      astro/wmsolar/Makefile
  94. 2
      astro/wmspaceweather/Makefile
  95. 1
      astro/wmsun/Makefile
  96. 1
      astro/xearth/Makefile
  97. 1
      astro/xeartk/Makefile
  98. 1
      astro/xephem/Makefile
  99. 2
      astro/xglobe/Makefile
  100. 1
      astro/xmoontool/Makefile

8
MOVED

@ -941,7 +941,6 @@ devel/ulex|devel/ocaml-ulex|2004-03-19|port renamed
textproc/yaxi|textproc/ocaml-yaxi|2004-03-19|port renamed
devel/camomile|devel/ocaml-camomile|2004-03-19|port renamed
archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed
devel/imake|devel/imake-4|2004-03-19|removed, obsoleted by imake-4 long ago
net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category
multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better
editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
@ -2952,3 +2951,10 @@ dns/dnscap||2007-05-03|Removed on authors request until it has reached stability
net-im/libgaim|net-im/libpurple|2007-05-03|Project renamed
net-im/gaim-devel|net-im/pidgin|2007-05-03|Project renamed
net-im/gaim-consoleui-devel|net-im/finch|2007-05-03|Project renamed
devel/imake-6|devel/imake|2007-05-19|Remove hardcoded version from portname
x11-fonts/xorg-fonts-encodings|x11-fonts/encodings|2007-05-19|Encoding fonts are now distributed separately
x11/xorg-documents|x11/xorg-docs|2007-05-19|X.org documentation now has its own distfile, rename accordingly
x11/xorg-manpages|||X.org manual pages are now installed with every single port
x11/xorg-clients|x11/xorg-apps|2007-05-19|Rename to new xorg-apps meta-port
x11/libXfont|x11-fonts/libXfont|2007-05-19|Move to the x11-fonts category
x11-servers/xorg-fontserver|x11-fonts/xfs|2007-05-19|Rename to follow X.org name

118
Mk/bsd.port.mk

@ -373,8 +373,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# case the linux X libraries are referenced.
#
# USE_FREETYPE - If set, this port uses the freetype print libraries.
# USE_GL - If set, this port uses libGL (not needed with XFree86 4.x
# which already includes this functionality).
# USE_GL - A list of Mesa or GL related dependencies needed by the port.
# Supported components are: glut, glu, glw, gl and linux.
# If set to "yes", this is equivalent to "glu". Note that
# glut depends on glu, glw and glu depend on gl.
# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XPM.
# NO_OPENMOTIF - If set, this port uses a custom Motif toolkit
# instead of Openmotif.
@ -470,6 +472,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_LINUX_RPM - Set to yes to pull in variables and targets useful to Linux
# RPM ports.
# Implies inclusion of bsd.linux-rpm.mk.
#
# USE_XORG - Set to a list of X.org module dependencies.
# Implies inclusion of bsd.xorg.mk.
#
# AUTOMATIC_PLIST
# - Set to yes to enable automatic packing list generation.
# Currently has no effect unless USE_LINUX_RPM is set.
@ -530,9 +536,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# Default: not set (means /)
#
# X11BASE - Where X11 ports install things.
# Default: ${DESTDIR}/usr/X11R6
# Default: ${DESTDIR}/${LOCALBASE}
# X11BASE_REL - Same as X11BASE, but relative to DESTDIR
# Default: /usr/X11R6
# Default: ${LOCALBASE}
# LOCALBASE - Where non-X11 ports install things.
# Default: ${DESTDIR}/usr/local
# LOCALBASE_REL - Same as LOCALBASE, but relative to DESTDIR
@ -886,8 +892,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# NO_MTREE - If set, will not invoke mtree from bsd.port.mk from
# the "install" target.
# MTREE_FILE - The name of the mtree file.
# Default: /etc/mtree/BSD.x11.dist if USE_X_PREFIX is set,
# /etc/mtree/BSD.local.dist otherwise.
# Default: ${PORTSDIR}/Templates/BSD.local.dist or
# /etc/mtree/BSD.usr.dist if ${PREFIX} == "/usr".
# PLIST_DIRS - Directories to be added to packing list
# PLIST_FILES - Files and symbolic links to be added to packing list
#
@ -1357,7 +1363,7 @@ DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSI
# by individual Makefiles or local system make configuration.
PORTSDIR?= /usr/ports
LOCALBASE?= /usr/local
X11BASE?= /usr/X11R6
X11BASE?= ${LOCALBASE}
LINUXBASE?= /compat/linux
LOCALBASE_REL:= ${LOCALBASE}
X11BASE_REL:= ${X11BASE}
@ -1376,6 +1382,27 @@ TARGETDIR:= ${DESTDIR}${PREFIX}
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
.if ${OSVERSION} >= 502123
X_WINDOW_SYSTEM ?= xorg
.else
X_WINDOW_SYSTEM ?= xfree86-4
.endif
.if ${OSVERSION} < 602000
.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE)
.BEGIN:
@${ECHO_MSG} "On FreeBSD before 6.2 ports system unfortunately can not set default X11BASE by itself so please help it a bit by setting X11BASE=\$${LOCALBASE} in make.conf."
@${ECHO_MSG} "On the other hand, if you do wish to use non-default X11BASE, please set variable USE_NONDEFAULT_X11BASE."
@${FALSE}
.endif
.endif
.if defined(USE_XORG) || defined(XORG_CAT)
. if ${X_WINDOW_SYSTEM} == "xorg"
.include "${PORTSDIR}/Mk/bsd.xorg.mk"
. endif
.endif
.if defined(USE_BZIP2)
EXTRACT_SUFX?= .tar.bz2
.elif defined(USE_ZIP)
@ -1843,22 +1870,22 @@ LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype
.endif
.if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg
X_IMAKE_PORT= ${PORTSDIR}/devel/imake-6
X_IMAKE_PORT= ${PORTSDIR}/devel/imake
X_LIBRARIES_PORT= ${PORTSDIR}/x11/xorg-libraries
X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-clients
X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-apps
X_SERVER_PORT= ${PORTSDIR}/x11-servers/xorg-server
X_FONTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-fontserver
X_FONTSERVER_PORT= ${PORTSDIR}/x11-fonts/xfs
X_PRINTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-printserver
X_VFBSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-vfbserver
X_NESTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-nestserver
X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-encodings
X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/encodings
X_FONTS_MISC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
X_FONTS_100DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-100dpi
X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-75dpi
X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic
X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-truetype
X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1
X_MANUALS_PORT= ${PORTSDIR}/x11/xorg-manpages
X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias
.elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-4
X_IMAKE_PORT= ${PORTSDIR}/devel/imake-4
X_LIBRARIES_PORT= ${PORTSDIR}/x11/XFree86-4-libraries
@ -1875,7 +1902,6 @@ X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-font75dpi
X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
X_MANUALS_PORT= ${PORTSDIR}/x11/XFree86-4-manuals
.else
IGNORE= cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg'
.endif
@ -1884,19 +1910,63 @@ IGNORE= cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4
BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
.endif
.if defined(USE_XPM) || defined(USE_GL)
.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
.endif
.if ${X_WINDOW_SYSTEM:L} == xfree86-4
.if defined(USE_XPM)
USE_XLIB= yes
.endif
.if ${X_WINDOW_SYSTEM:L} == xorg
XAWVER= 8
.else
XAWVER= 7
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
.else
.if defined(USE_XPM)
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/x11/libXpm
# XXX - At some point we'll have to fix ports to use USE_XORG to
# the right value and remove both USE_XPM and USE_XLIB. Hopefully
# XFree86-4 will be gone in the meantime.
USE_XLIB= yes
.endif
XAWVER= 8
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
.endif
PLIST_SUB+= XAWVER=${XAWVER}
_GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL
_GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU
_GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw
_GL_glut_LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
_GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
.if defined(USE_GL)
. if ${X_WINDOW_SYSTEM:L} == xfree86-4
USE_XLIB= yes
. else
. if ${USE_GL:L} == "yes"
USE_GL= glu
. endif
. for _component in ${USE_GL}
. if !defined(_GL_${_component}_LIB_DEPENDS) && \
!defined(_GL_${_component}_RUN_DEPENDS)
IGNORE= uses unknown GL component
. else
LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS}
RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS}
. endif
. endfor
. endif
.endif
.if defined(USE_BISON)
BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
.endif
@ -2208,14 +2278,10 @@ EXTRACT_CMD?= ${GZIP_CMD}
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX)
# User may have specified non-standard PREFIX for installing a port that
# uses X
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.elif ${PREFIX} == /usr
.if ${PREFIX} == /usr
MTREE_FILE= /etc/mtree/BSD.usr.dist
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist
.endif
.endif
MTREE_CMD?= /usr/sbin/mtree
@ -2774,8 +2840,8 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
tcl tcl80 tcl82 tcl83 tcl84 textproc \
tk tk80 tk82 tk83 tk84 tkstep80 \
ukrainian vietnamese windowmaker www \
x11 x11-clocks x11-fm x11-fonts x11-servers x11-themes x11-toolkits \
x11-wm xfce zope
x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers x11-themes \
x11-toolkits x11-wm xfce zope
check-categories:
.for cat in ${CATEGORIES}
@ -3828,7 +3894,7 @@ install-mtree:
exit 1; \
else \
${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \
if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
if [ ${PREFIX} = ${LOCALBASE_REL} ]; then \
cd ${TARGETDIR}/share/nls; \
${LN} -shf C POSIX; \
${LN} -shf C en_US.US-ASCII; \

262
Mk/bsd.xorg.mk

@ -0,0 +1,262 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
# bsd.xorg.mk - Support for USE_XORG variable. (XXX - this comment sucks)
#
# Created by: Florent Thoumie <flz@FreeBSD.org>
#
# Complete list of dependencies for xorg ports can be found at :
# http://people.freebsd.org/~flz/local/xorg/xorg-dep-list
#
# RSS feed for X.org individual releases can be found at :
# http://feed.xbsd.org/xorg/
#
# !!! Here be dragons !!! (yeah, here as well...)
#
# $FreeBSD$
#
XORG_Include_MAINTAINER= x11@FreeBSD.org
# Some notes:
#
# app - requires pkgconfig, don't install shared libraries (I guess)
# data - nothing I could factorize
# doc - no particular notes
# driver - input depends on inputproto/randrproto at least
# video depends on randrproto/renderproto at least
# font - don't install .pc file
# lib - various dependencies, install .pc file
# proto - install .pc file, no dependencies, needed only at build time for most of them
# xserver - there's only one atm, I guess everything can fit into the port itself
.if defined(XORG_CAT)
# Default variables, common to all new modular xorg ports.
.if !defined(USE_TGZ)
USE_BZIP2= yes
.endif
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
DIST_SUBDIR= xorg/${XORG_CAT}
MASTER_SITES?= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR?= individual/${XORG_CAT}
CONFIGURE_ARGS+= --mandir="${PREFIX}/man/"
. if ${XORG_CAT} == "app"
USE_GNOME+= pkgconfig
. endif
. if ${XORG_CAT} == "data"
# Nothing at the moment.
. endif
. if ${XORG_CAT} == "driver"
USE_GNOME+= pkgconfig
USE_XORG+= xorg-server xproto randrproto
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
. if ${PORTNAME:M*input*}x != x
USE_XORG+= inputproto
. elif ${PORTNAME:M*video*}x != x
USE_XORG+= fontsproto renderproto
. else
IGNORE= doesn't contain either "driver" or "input"
. endif
. if ${PORTNAME:M*-sun*}x != x && ${ARCH} != sparc64
IGNORE= is for sparc64 only
. endif
. endif
. if ${XORG_CAT} == "font"
FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
NEED_MKFONTFOO= yes
. if ${PORTNAME:M*type1*}x != x
INSTALLS_TTF?= yes
. elif ${PORTNAME:M*ttf*}x != x
INSTALLS_TTF?= yes
. elif ${PORTNAME:M*encodings*}x != x
# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
NEED_MKFONTFOO= no
BUILD_DEPENDS+= ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
INSTALLS_TTF?= no
. else
INSTALLS_TTF?= no
. endif
. if ${PORTNAME:M*font-util*}x != x
USE_GNOME+= gnomehack
NEED_MKFONTFOO= no
. elif ${INSTALLS_TTF} == "yes"
USE_GNOME+= pkgconfig
BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
. else
BUILD_DEPENDS+= ${X11BASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
. endif
. if ${NEED_MKFONTFOO} == "yes"
BUILD_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
RUN_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
. endif
post-install:
. if ${INSTALLS_TTF} == "yes"
. for _fontdir in ${FONTDIR}
@${ECHO_CMD} "@exec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
. endfor
. endif
. for _fontdir in ${FONTDIR}
. if ${NEED_MKFONTFOO} == "yes"
@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
. endif
@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
. endfor
. endif
. if ${XORG_CAT} == "lib"
USE_GNOME+= gnomehack pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
. if ${XORG_CAT} == "proto"
USE_GNOME+= gnomehack
. endif
. if ${XORG_CAT} == "xserver"
DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2
WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION}
USE_GNOME+= gnomehack
CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/share/X11/xkb
. endif
.endif
# Might not be useful, need to check this later.
.if defined(USE_XORG)
USE_GNOME+= pkgconfig
.endif
# Register all xorg .pc files here.
# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
bigreqsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
compositeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
damageproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto
dmx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
dmxproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
evieproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
fixesproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
fontcacheproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
fontenc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc
fontsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto
fontutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util
glproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto
ice_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
inputproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto
kbproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto
libfs_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS
oldx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
printproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
randrproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
recordproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
renderproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto
resourceproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto
scrnsaverproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto
sm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM
trapproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto
videoproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto
x11_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
xau_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
xaw_LIB_PC_DEPENDS= ${xaw${XAWVER}_LIB_PC_DEPENDS}
xaw6_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw
xaw7_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw
xaw8_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw
xbitmaps_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
xcmiscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
xcomposite_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
xcursor_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor
xdamage_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage
xdmcp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
xevie_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie
xext_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
xextproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto
xf86bigfontproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto
xf86dgaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto
xf86driproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto
xf86miscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto
xf86rushproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto
xf86vidmodeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto
xfixes_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
xfont_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont
xfontcache_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache
xft_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft
xi_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi
xinerama_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama
xineramaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto
xkbfile_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
xkbui_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui
xmu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu
xmuu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu
xorg-server_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server
xp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp
xpm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
xprintapputil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil
xprintutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil
xproto_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
xproxymngproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol
xrandr_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr
xrender_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
xres_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
xscrnsaver_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
xt_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
xtrans_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
xtrap_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
xtst_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst
xv_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv
xvmc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC
xxf86dga_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga
xxf86misc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc
xxf86vm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
.for _module in ${USE_XORG:M*\:both:C/\:.*//g}
. if ${XORG_MODULES:M${_module}} == ""
IGNORE= requires unknown xorg module (${_module})
. endif
RUN_DEPENDS+= ${${_module}_BUILD_DEPENDS}
.endfor
.for _module in ${USE_XORG:C/\:.*//g}
. if ${XORG_MODULES:M${_module}} == ""
IGNORE= requires unknown xorg module (${_module})
. endif
LIB_PC_DEPENDS+= ${${_module}_LIB_PC_DEPENDS}
BUILD_DEPENDS+= ${${_module}_BUILD_DEPENDS}
.endfor
RUN_DEPENDS+= ${LIB_PC_DEPENDS}
BUILD_DEPENDS+= ${LIB_PC_DEPENDS}
.if !target(check-latest)
check-latest:
@AVAIL_VER=`fetch -qo - http://xorg.freedesktop.org/releases/individual/${XORG_CAT}/ | sed -ne 's/.*${PORTNAME}-\(.*\).tar.bz2\".*/\1/p'` && \
${ECHO_CMD} "Available versions for ${PORTNAME} are: $${AVAIL_VER}." && \
for ver in $${AVAIL_VER}; do \
if [ `pkg_version -t $$ver ${PORTVERSION}` = ">" ]; then \
${ECHO_CMD} "${PORTNAME} $$ver is newer than current version."; \
fi; \
done
.endif

156
Tools/scripts/mergebase.sh

@ -0,0 +1,156 @@
#!/bin/sh
# rev 6
# $FreeBSD$
#
X11BASE="/usr/X11R6"
LOCALBASE="/usr/local"
BACKUPDIR="/usr/tmp/mergebase"
BACKUPFILE="oldx11base.`date -j +%Y%m%d.%H%M%S`.tar"
echo "This script will attempt to backup ${X11BASE} into"
echo "${BACKUPDIR}/${BACKUPFILE} and then move the"
echo "contents onto ${LOCALBASE}. It will then replace ${X11BASE}"
echo "with a symbolic link, pointing to ${LOCALBASE}. After that,"
echo "the script will attempt to change some settings in /etc"
echo "that by default point to both ${X11BASE} and ${LOCALBASE}"
echo "to remove references to ${X11BASE}; specifically, the files"
echo "that could get altered are /etc/periodic.conf"
echo "/etc/manpath.config /etc/rc.conf."
echo
echo "Be advised that this script expects default environment,"
echo "notably it assumes that you have not changed \$X11BASE and"
echo "\$LOCALBASE variables from their default values and that"
echo "${X11BASE} is regular directory and not separate mount."
echo
echo "If these assumptions are not correct, either edit this script"
echo "to change \$X11BASE \$LOCALBASE and/or \$BACKUPDIR values or"
echo "do the merge by hand (perhaps using this script as a rough guide)."
echo
read -p "Enter 'yes' to continue, anything else will exit script: " answer
if [ "${answer}x" != "yesx" ]; then
echo "Aborted."
exit 1
fi
mrg_done=0
mpath_done=0
ppath_done=0
rcconf_done=0
if [ -d ${X11BASE} -a ! -L ${X11BASE} ]; then
lbase_list=`mktemp -t mergebase` || exit 1
xbase_list=`mktemp -t mergebase` || exit 1
common_list=`mktemp -t mergebase` || exit 1
(cd ${LOCALBASE} && find . ! -type d | sort >${lbase_list})
(cd ${X11BASE} && find . ! -type d | sort >${xbase_list})
comm -1 -2 ${lbase_list} ${xbase_list} >${common_list}
if [ -s ${common_list} ]; then
echo "CONFLICTING FILES:"
cat ${common_list}
echo
echo -n "Files that exist both in ${LOCALBASE} and ${X11BASE} "
echo -n "have been found as shown above. Merging will not "
echo "continue."
echo -n "While some such files are safe to remove as they "
echo -n "will be regenerated (like ${X11BASE}/man/whatis), "
echo -n "some you might want to move away somewhere safe, "
echo "and some might point to conflicts in ports."
echo -n "For this script to continue, you need to either "
echo -n "move these files away from ${X11BASE} or delete them. "
echo -n "If you don't know what to do about a particular file, "
echo "ask on x11@FreeBSD.org mailing list."
echo "The list is saved in ${common_list}."
rm ${lbase_list} ${xbase_list}
exit 1
fi
rm ${lbase_list} ${xbase_list} ${common_list}
echo "==> Creating backup of X11BASE in ${BACKUPDIR}..."
mkdir -p ${BACKUPDIR}
tar -cvf ${BACKUPDIR}/${BACKUPFILE} -C ${X11BASE} .
if [ $? -ne 0 ]; then
echo "Backup failed."
exit 1
fi
echo "==> Merging X11BASE into LOCALBASE..."
errfile=`mktemp -t mergebase` || exit 1
tar -xpkf ${BACKUPDIR}/${BACKUPFILE} -C ${LOCALBASE} 2>${errfile}
if [ `grep -Ev 'File exists$|Error exit delayed from previous errors' ${errfile} | wc -c` -ne 0 ]; then
echo "Merge failed. See ${errfile} for more information."
exit 1
fi
rm ${errfile}
echo "==> Creating compatibility symlink ${X11BASE} -> ${LOCALBASE}..."
rm -rf ${X11BASE}
ln -s ${LOCALBASE} ${X11BASE}
mrg_done=1
fi
# periodic.conf
local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
for lp in ${local_periodic}; do
if (expr ${lp} : "^${X11BASE}" >/dev/null); then
continue
else
new_periodic="${new_periodic} ${lp}"
fi
done
if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
echo "==> Removing ${X11BASE}/etc/periodic from periodic setup..."
echo "# added by mergebase.sh" >> /etc/periodic.conf
echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
ppath_done=1
fi
# manpath.config
if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${X11BASE}");then
echo "==> Removing ${X11BASE}/man from MANPATH..."
sed -i ".bak.mergebase" -e "s,^[^#]*${X11BASE}.*$,#&," \
/etc/manpath.config
mpath_done=1
fi
# rc.conf
rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
for rd in ${rcdirs}; do
if (expr ${rd} : "${X11BASE}" >/dev/null); then
continue
else
new_rcdirs="${new_rcdirs} ${rd}"
fi
done
if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
echo "==> Removing ${X11BASE} from rc sequence..."
echo "# added by mergebase.sh" >> /etc/rc.conf
echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
rcconf_done=1
fi
if [ ${mrg_done} -eq 1 ]; then
echo
echo "The contents of ${X11BASE} has been backed up in ${BACKUPDIR}."
echo "Remove it once you are sure nothing has been lost in merge."
fi
if [ ${ppath_done} -eq 1 ]; then
echo
echo "${X11BASE} has been removed from periodic setup. You might"
echo "want to review /etc/periodic.conf for changes."
fi
if [ ${mpath_done} -eq 1 ]; then
echo
echo "${X11BASE} has been commented out in /etc/manpath.config."
echo "You might want to review the changes there."
fi
if [ ${rcconf_done} -eq 1 ]; then
echo
echo "${X11BASE} has been removed from system initialization (rc)."
echo "You might want to check /etc/rc.conf changes."
fi
echo "Done."

103
UPDATING

@ -6,6 +6,109 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
20070519:
AFFECTS: users of x11/xorg
AUTHOR: kris@FreeBSD.org
Welcome, fearless user! You are about to embark upon a mystical
journey to the world of xorg 7.2.
This upgrade procedure is for users of portupgrade. Users of other
upgrade tools should contact the author for the corresponding upgrade
method for that tool.
It is recommended that you run the xorg 7.2 upgrade inside a script(1)
session. This way, if something goes wrong, you will have hopefully
have saved enough information for the developers to debug the problem.
Make sure you choose a filesystem with lots of space for the script
output.
# script xorg-upgrade
You may wish to set BATCH=yes in the environment to avoid interactive
dialogue boxes.
You may want to consider using portupgrade-devel, which fixes some
annoying bugs that cause upgrades to incorrectly be marked as failed
when they actually completed successfully. To switch to
portupgrade-devel:
# portupgrade -f -o ports-mgmt/portupgrade-devel portupgrade
# rm -f /usr/ports/INDEX*.db /var/db/pkg/pkgdb.db
# pkgdb -fu
# portsdb -fu
If you are an upgrade-test user (big wave!) you were instructed
to created a separate tree for the test. You shouldn't forgot
to set your PORTSDIR variable to it, and to create INDEXes:
# setenv PORTSDIR `realpath .` <- csh-like users
# export PORTSDIR=`realpath .` <- sh-like users
# portsdb -u
It is necessary to set the XORG_UPGRADE environment variable while
updating from xorg 6.9 to 7.2. Once the upgrade is complete this
is no longer be required.
For users of csh-like shells:
# setenv XORG_UPGRADE yes
For users of sh-like shells:
# export XORG_UPGRADE=yes
Unfortunately portupgrade (nor portupgrade-devel) cannot yet handle
the rigors of the xorg upgrade without a small bit of help:
# portupgrade -Rf libXft
Now you are ready to upgrade everything:
# portupgrade -a
When packages are available (wait for the announcement on ports@), you
may prefer to use precompiled packages to speed up the process:
# portupgrade -aP
Once the upgrade completes successfully, you can delete the
xorg-manpages package, which is now orphaned.
# pkg_delete xorg-manpages\*
The final step is to merge remaining files from /usr/X11R6 into
/usr/local (/usr/X11R6 is no longer used with xorg 7.2) and replace
/usr/X11R6 with a symlink.
A script is provided for your convenience (or you may choose to do
this by hand): it will first attempt to back up your /usr/X11R6 into
/usr/tmp/mergebase in case something goes wrong, then look for
conflicts (files in /usr/X11R6 that would overwrite files in
/usr/local). Depending on your system configuration you may have to
resolve some of these conflicts by hand first (if in doubt, ask for
help on freebsd-x11@FreeBSD.org). You may also need to edit the
script if the default locations are not correct on your system.
# sh /usr/ports/Tools/scripts/mergebase.sh
When the merge operation completes successfully, the /usr/X11R6
directory hierarchy will be removed and replaced by a symlink to
/usr/local. This symlink is necessary because some binary ports (and
some remaining source ports) have hard-coded references to /usr/X11R6.
Congratulations, you are done!
# exit
IF YOU RUN INTO PROBLEMS:
# uname -a
# ls -l /var/db/pkg
# exit
and send an email to freebsd-x11@FreeBSD.org with a full description
of the problem. Do not include the above typescript in your email,
but bzip2 it and make it available to the developers (e.g. put it
online or send it by private email upon request).
20070428:
AFFECTS: users of print/ghostscript-gnu-{commfont,jpnfont,korfont}
AUTHOR: hrs@FreeBSD.org

1
accessibility/at-poke/Makefile

@ -7,6 +7,7 @@
PORTNAME= at-poke
PORTVERSION= 0.2.3
PORTREVISION= 1
CATEGORIES= accessibility gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

2
accessibility/at-spi/Makefile

@ -8,7 +8,7 @@
PORTNAME= at-spi
PORTVERSION= 1.18.1
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

36
accessibility/at-spi/pkg-plist

@ -151,53 +151,17 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrm include/at-spi-1.0/libspi
@dirrm include/at-spi-1.0/cspi
@dirrm include/at-spi-1.0
@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/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@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/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/be/LC_MESSAGES
@dirrmtry share/locale/be

2
accessibility/atk/Makefile

@ -8,7 +8,7 @@
PORTNAME= atk
PORTVERSION= 1.18.0
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= accessibility devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

40
accessibility/atk/pkg-plist

@ -117,71 +117,31 @@ share/locale/zh_HK/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
@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/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/tk/LC_MESSAGES
@dirrmtry share/locale/tk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@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/li/LC_MESSAGES
@dirrmtry share/locale/li
@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@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as

1
accessibility/dasher/Makefile

@ -8,6 +8,7 @@
PORTNAME= dasher
PORTVERSION= 4.4.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}

38
accessibility/dasher/pkg-plist

@ -314,36 +314,12 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
@dirrm share/gnome/help/dasher/C
@dirrm share/gnome/help/dasher
@dirrm share/gnome/dasher
@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/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/tk/LC_MESSAGES
@dirrmtry share/locale/tk
@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
@ -352,21 +328,7 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
@dirrmtry share/locale/ky
@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

2
accessibility/gail/Makefile

@ -8,7 +8,7 @@
PORTNAME= gail
PORTVERSION= 1.18.0
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

38
accessibility/gail/pkg-plist

@ -87,61 +87,23 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrm include/gail-1.0/gail
@dirrm include/gail-1.0/libgail-util
@dirrm include/gail-1.0
@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/tk/LC_MESSAGES
@dirrmtry share/locale/tk
@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/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@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@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as

1
accessibility/gnome-mag/Makefile

@ -8,6 +8,7 @@
PORTNAME= gnome-mag
PORTVERSION= 0.14.3
PORTREVISION= 1
CATEGORIES= accessibility gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

38
accessibility/gnome-mag/pkg-plist

@ -305,38 +305,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@dirrm %%DOCSDIR%%
@dirrm include/gnome-mag-1.0/magnifier
@dirrm include/gnome-mag-1.0
@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/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/tk/LC_MESSAGES
@dirrmtry share/locale/tk
@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/si/LC_MESSAGES
@dirrmtry share/locale/si
@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/mi/LC_MESSAGES
@ -347,24 +323,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@dirrmtry share/locale/ky
@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
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrmtry share/locale/ang/LC_MESSAGES

2
accessibility/gnopernicus/Makefile

@ -8,7 +8,7 @@
PORTNAME= gnopernicus
PORTVERSION= 1.1.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

32
accessibility/gnopernicus/pkg-plist

@ -188,47 +188,15 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
@dirrm include/gnopernicus-1.0
@dirrm etc/gnopernicus-1.0/translation_tables
@dirrm etc/gnopernicus-1.0
@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/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
@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/ne/LC_MESSAGES
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@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

1
accessibility/gok/Makefile

@ -8,6 +8,7 @@
PORTNAME= gok
PORTVERSION= 1.2.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}

34
accessibility/gok/pkg-plist

@ -908,51 +908,17 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/am
@dirrm share/gnome/gok
@dirrm %%DOCSDIR%%
@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/ne/LC_MESSAGES
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@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
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang

2
accessibility/java-access-bridge/Makefile

@ -7,7 +7,7 @@
PORTNAME= java-access-bridge
PORTVERSION= 1.18.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= accessibility java gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2

1
accessibility/kaccessible/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/kdeaccessibility/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/kdeaccessibility4/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/kmag/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/kmousetool/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/kmouth/Makefile

@ -7,6 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

1
accessibility/orca/Makefile

@ -8,6 +8,7 @@
PORTNAME= orca
PORTVERSION= 2.18.1
PORTREVISION= 1
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

28
accessibility/orca/pkg-plist

@ -270,41 +270,13 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrm share/gnome/orca
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
@dirrm %%PYTHON_SITELIBDIR%%/orca
@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/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@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

2
accessibility/qt4-accessible/Makefile

@ -8,7 +8,7 @@
PORTNAME= accessible
PORTVERSION= 4.2.3
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES?= accessibility
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-

1
arabic/ae_fonts_mono/Makefile

@ -7,6 +7,7 @@
PORTNAME= ae_fonts_mono
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= arabic
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arabeyes

1
arabic/ae_fonts_ttf/Makefile

@ -7,6 +7,7 @@
PORTNAME= ae_fonts1_ttf
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= arabic x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arabeyes

1
arabic/arabtex/Makefile

@ -7,6 +7,7 @@
PORTNAME= arabtex
PORTVERSION= 3.11
PORTREVISION= 1
CATEGORIES= arabic print
MASTER_SITES= ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/
DISTNAME= arab${PORTVERSION:S/.//}

1
arabic/kacst_fonts/Makefile

@ -7,6 +7,7 @@
PORTNAME= kacst_fonts
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= arabic
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arabeyes

2
arabic/katoob/Makefile