summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2004-12-31 18:24:10 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2004-12-31 18:24:10 +0000
commit64cf27c85d89298041b8c8dc2fd090181e6d10d8 (patch)
tree11668b893f94453b0262a155d53e6eac8dd4a6f5 /accessibility
parent- Chase libxine update (diff)
Say hello to the linux mega patch, it consolidates our linux bits a
little bit and allows to proceed to a more recent linux_base from a stable (read as: the major bugs should be ironed out or identified and most linux ports build just fine) source. It also allows to ship 4.11 with a working linuxolator (the EOLed linux_base is marked forbidden because of a security hole). This is a major update, please read UPDATING (and CHANGES if you develop linux ports). Changes: - change the default linux_base from v7 to v8 - add a newer freetype to linux_base-8 for nicer fonts display [1] - don't let cpio use hardlinks in the linux_base-8 port to quiet some warnings in some cases [2] - fix a cut&past error in the linux_base-8 pkg-install script [3] - convert the binary knob "USE_LINUX" to a version specifier, e.g. USE_LINUX=<value> specifies a dependency upon emulators/linux_base-<value>, exceptions are a value of "7" (which does what you want and adds a dependency to linux_base) and any value without a corresponding port in PORTSDIR/emulators/linux_base-<value> (which adds a dependency to the default linux_base) - don't implicitly add USE_LINUX with the USE_LINUX_PREFIX knob, this allows us to use the USE_LINUX_PREFIX knob for linux_base and paves the way for splitting up future linux base ports into individual pieces - remove RESTRICTED from some GPL licensed ports, even when we only distribute binaries, we get them from official linux sites, so anyone can grab them there if he needs to - add a dependency upon the linux X11 bits where necessary (based upon guesswork) - don't use USE_X_PREFIX in some linux ports since it adds a dependency to the FreeBSD X11 libs, as a workaround use PREFIX?= (the clean solution would be to remove the implicit USE_XLIB from USE_X_PREFIX) - bump the portrevision of the linux ports ("better safe than sorry" algorithm) - pass maintainership of the important linux infrastructure to a mailinglist, hijack freebsd-emulation@ for this purpose (if somebody doesn't like this: tell us your bikeshed color at freebsd-emulation@, my color would be "linuxolator@" in case someone cares...) - add a pkg-install script for linux-fontconfig, but don't use it; everything should work without it (the FreeBSD fc-cache program should do all the work), but in case we need it we just need to decomment the pkg-install part in the Makefile - fix some dependencies - fix some bugs - add some static plists - unbreak the ports with dependecies to more than one linux_base This also fixes some ports which are marked BROKEN because of dependencies to v7 and v8 of linux_base at the same time. Known bugs: - the linux-mesa and linux-devtools ports install libGL*.so symlinks - some "minor" plist bugs (e.g. ld.so.{conf,cache} are modified by the linux X11 port, so linx_Base-8 moans at deinstall time) Future work (interested souls should coordinate with freebsd-emulation@): - add some kind of USE_LINUX_X11 knob to streamline the X11 dependencies, or modify the behavior of USE_XLIB in the USE_LINUX case AFAIK trevor has some patches. - make USE_XLIB and USE_X_PREFIX orthogonal to be able to get rid of the PREFIX?= workaround in some linux ports Should be discussed/coordinated on/with x11@. - move the RPM bits from x11-toolkits/linux-gtk/Makefile to PORTSDIR/Mk/ - update to a more recent linux base PR: 69997, 70539 (and maybe others) Discussed with/on: java@, x11@, trevor, portmgr Tested by: mezz, portmgr, pointyhat RPM hunted down by: Joseph Gelinas <scirocco@tasam.com> [1] Requested by: portmgr [2] Submitted by: kris [3] Approved by: portmgr
Notes
Notes: svn path=/head/; revision=125613
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/linux-atk/Makefile16
-rw-r--r--accessibility/linux-atk/pkg-plist22
-rw-r--r--accessibility/linux-f10-atk/Makefile16
-rw-r--r--accessibility/linux-f10-atk/pkg-plist22
-rw-r--r--accessibility/linux-f8-atk/Makefile16
-rw-r--r--accessibility/linux-f8-atk/pkg-plist22
6 files changed, 78 insertions, 36 deletions
diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index a4b3a4ef210c..740828e66c7b 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,26 +7,18 @@
PORTNAME= atk
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
-PLIST= ${WRKDIR}/plist
-RESTRICTED= "binary under GNU LGPL without accompanying source"
+PLIST= ${PKGDIR}/pkg-plist
RPM_SET= atk-1.2.0-2.i386.rpm
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/accessibility/linux-atk/pkg-plist b/accessibility/linux-atk/pkg-plist
new file mode 100644
index 000000000000..238c70c0c2d2
--- /dev/null
+++ b/accessibility/linux-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index a4b3a4ef210c..740828e66c7b 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -7,26 +7,18 @@
PORTNAME= atk
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
-PLIST= ${WRKDIR}/plist
-RESTRICTED= "binary under GNU LGPL without accompanying source"
+PLIST= ${PKGDIR}/pkg-plist
RPM_SET= atk-1.2.0-2.i386.rpm
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/accessibility/linux-f10-atk/pkg-plist b/accessibility/linux-f10-atk/pkg-plist
new file mode 100644
index 000000000000..238c70c0c2d2
--- /dev/null
+++ b/accessibility/linux-f10-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index a4b3a4ef210c..740828e66c7b 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,26 +7,18 @@
PORTNAME= atk
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
-PLIST= ${WRKDIR}/plist
-RESTRICTED= "binary under GNU LGPL without accompanying source"
+PLIST= ${PKGDIR}/pkg-plist
RPM_SET= atk-1.2.0-2.i386.rpm
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/accessibility/linux-f8-atk/pkg-plist b/accessibility/linux-f8-atk/pkg-plist
new file mode 100644
index 000000000000..238c70c0c2d2
--- /dev/null
+++ b/accessibility/linux-f8-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0