aboutsummaryrefslogtreecommitdiff
path: root/textproc
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 /textproc
parent440d8863c8d496b982754e2a71867892213a902b (diff)
downloadports-64cf27c85d89298041b8c8dc2fd090181e6d10d8.tar.gz
ports-64cf27c85d89298041b8c8dc2fd090181e6d10d8.zip
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 'textproc')
-rw-r--r--textproc/linux-aspell/Makefile4
-rw-r--r--textproc/linux-expat/Makefile6
-rw-r--r--textproc/linux-f10-aspell/Makefile4
-rw-r--r--textproc/linux-f10-expat/Makefile6
-rw-r--r--textproc/linux-f10-libxml/Makefile4
-rw-r--r--textproc/linux-f10-libxml2/Makefile4
-rw-r--r--textproc/linux-f8-aspell/Makefile4
-rw-r--r--textproc/linux-f8-expat/Makefile6
-rw-r--r--textproc/linux-f8-libxml/Makefile4
-rw-r--r--textproc/linux-f8-libxml2/Makefile4
-rw-r--r--textproc/linux-libxml/Makefile4
-rw-r--r--textproc/linux-libxml2/Makefile4
-rw-r--r--textproc/pocketreader/Makefile1
13 files changed, 34 insertions, 21 deletions
diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile
index 6ed5368ccd39..6856235c3f10 100644
--- a/textproc/linux-aspell/Makefile
+++ b/textproc/linux-aspell/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aspell
PORTVERSION= 0.50.4.1
+PORTREVISION= 1
CATEGORIES= textproc linux
MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/ximian/ximian-evolution/redhat-80-i386/ \
ftp://ftp.ntua.gr/pub/X11/ximian/ximian-evolution/redhat-80-i386/ \
@@ -22,12 +23,13 @@ COMMENT= Spelling checker with better logic than ispell (linux version)
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \
bzip2:${PORTSDIR}/archivers/bzip2
-RUN_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
NO_BUILD= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
+USE_LINUX= yes
+USE_GMAKE= yes
NO_FILTER_SHLIBS= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index 2b1b5d631f65..121986b7794a 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -7,12 +7,14 @@
PORTNAME= expat
PORTVERSION= 1.95.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
+RUN_DEPENDS=
+
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
PLIST= ${WRKDIR}/plist
diff --git a/textproc/linux-f10-aspell/Makefile b/textproc/linux-f10-aspell/Makefile
index 6ed5368ccd39..6856235c3f10 100644
--- a/textproc/linux-f10-aspell/Makefile
+++ b/textproc/linux-f10-aspell/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aspell
PORTVERSION= 0.50.4.1
+PORTREVISION= 1
CATEGORIES= textproc linux
MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/ximian/ximian-evolution/redhat-80-i386/ \
ftp://ftp.ntua.gr/pub/X11/ximian/ximian-evolution/redhat-80-i386/ \
@@ -22,12 +23,13 @@ COMMENT= Spelling checker with better logic than ispell (linux version)
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \
bzip2:${PORTSDIR}/archivers/bzip2
-RUN_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
NO_BUILD= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
+USE_LINUX= yes
+USE_GMAKE= yes
NO_FILTER_SHLIBS= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index 2b1b5d631f65..121986b7794a 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -7,12 +7,14 @@
PORTNAME= expat
PORTVERSION= 1.95.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
+RUN_DEPENDS=
+
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
PLIST= ${WRKDIR}/plist
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/linux-f8-aspell/Makefile b/textproc/linux-f8-aspell/Makefile
index 6ed5368ccd39..6856235c3f10 100644
--- a/textproc/linux-f8-aspell/Makefile
+++ b/textproc/linux-f8-aspell/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aspell
PORTVERSION= 0.50.4.1
+PORTREVISION= 1
CATEGORIES= textproc linux
MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/ximian/ximian-evolution/redhat-80-i386/ \
ftp://ftp.ntua.gr/pub/X11/ximian/ximian-evolution/redhat-80-i386/ \
@@ -22,12 +23,13 @@ COMMENT= Spelling checker with better logic than ispell (linux version)
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \
bzip2:${PORTSDIR}/archivers/bzip2
-RUN_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
NO_BUILD= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
+USE_LINUX= yes
+USE_GMAKE= yes
NO_FILTER_SHLIBS= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index 2b1b5d631f65..121986b7794a 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -7,12 +7,14 @@
PORTNAME= expat
PORTVERSION= 1.95.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= trevor@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
+RUN_DEPENDS=
+
BASEVERSION= 9
ONLY_FOR_ARCHS= i386
PLIST= ${WRKDIR}/plist
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 5c312dcc6201..c9590a2f6ffe 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -7,10 +7,10 @@
PORTNAME= libxml
PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
diff --git a/textproc/pocketreader/Makefile b/textproc/pocketreader/Makefile
index 08e78952954a..afacd275bf28 100644
--- a/textproc/pocketreader/Makefile
+++ b/textproc/pocketreader/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pocketreader
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= textproc linux
MASTER_SITES= http://www.pocketreader.com/download/software/
DISTNAME= linux-bin