diff options
author | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
---|---|---|
committer | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
commit | 23b3bc4b0d01608d37199d39bb546c6c9d6a8b1d (patch) | |
tree | fa03305e656151ebe33c7e94eacc947b13d1c273 /graphics/linux-tiff/Makefile | |
parent | update to 2.1.1 (diff) |
Mega-patch to cleanup the ports infrastructure regarding our linux bits:
- USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
tools to strip binaries anymore, so it's not neccesary anymore to override
STRIP and STRIP_CMD.
- USE_LINUX_PREFIX implies NO_MTREE now.
- In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
instead upon the native FreeBSD libraries.
- The variable LINUX_BASE_PORT contains a string which is suitable as an
item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
instead of a hardcoded reference.
- Change all ports to comply to the "new world order".
- The Ports Collection now allows to override the default linux_base port.
Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
- If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
be marked as IGNORE. [1]
- Readd USE_LINUX knobs into several ports and make several uses of a
conditional dependency ("USE_LINUX?=") into an unconditional one
("USE_LINUX=") which where removed/changed by Trevor to allow the use of
alternative linux_base ports. While this is a nice goal, the implementation
resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
in this commit is supposed to fix the problem while keeping the feature.
Basicaly this includes a backout of Trevor's commit, to prevent confusion
I mention it here explicitely.
- Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
Chase dependencies for this.
- Changes to make linux_devtools installable on amd64, remove some stray
device nodes (they don't work on recent OS versions and aren't really
needed).
- Make linux_base-8 PREFIX clean and remove some stray device nodes.
Additionally tell a little bit more about how to setup NIS/YP [2].
- Update the PGSQL dependency in the linux-opengroupware port to a recent
version (the old one isn't available anymore), I don't know if this
works (at least it isn't more broken than before).
- Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
ports, the former path exists already and gets populated by other
packages too (PREFIX=LINUXPREFIX!).
- Fix some obvious (non-linuxolator) bugs in some linux ports while being
there.
- Bump PORTREVISION where neccesary.
Requested by: portmgr (linimon) [1]
Submittted by: Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by: portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on: ports cluster (kris)
Reviewed by: silence on emulation@
Superseedes PR: 69997
Maintainer approval from:
chris@chrisburkert.de
cracauer@cons.org
des
girgen
jamie@bishopston.net
mezz
mi
nivit@users.sf.net
pat
simond@irrelevant.org
riggs@rrr.de
Udo.Schweigert@Siemens.com
Diffstat (limited to 'graphics/linux-tiff/Makefile')
-rw-r--r-- | graphics/linux-tiff/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile index 613aa8b6b490..b1514ecacddd 100644 --- a/graphics/linux-tiff/Makefile +++ b/graphics/linux-tiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= tiff PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_SUSE} MASTER_SITE_SUBDIR= i386/update/9.2/rpm/i586 @@ -23,15 +23,14 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm DIST_SUBDIR= rpm/i386/suse/9.2 DOCDIRS= usr/share/doc/libtiff-3.6.1 -NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= amd64 i386 PLIST= ${WRKDIR}/plist PLIST_DIRS= usr/share/doc/packages/libtiff usr/share/doc/packages PLIST_FILES= usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \ usr/share/doc/packages/libtiff/COPYRIGHT \ usr/share/doc/packages/libtiff/README -PREFIX= ${LINUXBASE} -USE_LINUX?= yes +USE_LINUX= yes +USE_LINUX_PREFIX=yes # dummy target so rpm can be in BUILD_DEPENDS do-build: @@ -40,13 +39,10 @@ do-build: do-install: ${MKDIR} ${WRKSRC} @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ - --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + --nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ || ${TRUE} post-install: - @${RM} -f ${LINUXBASE}/etc/ld.so.cache - @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ - > ${LINUXBASE}/etc/ld.so.conf @chroot ${LINUXBASE} sbin/ldconfig .include <bsd.port.mk> |