From 8d63fa8ce3e1cb7a464d405732fcf971c5848297 Mon Sep 17 00:00:00 2001 From: netchild Date: Fri, 17 Jun 2005 22:59:29 +0000 Subject: 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 pre-install: -.if exists(${STRIP_CMD}) @${STRIP_CMD} ${WRKSRC}/${BINARY_NAME} -.endif @${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} .include diff --git a/misc/linux-edonkey-tool-recovermet/Makefile b/misc/linux-edonkey-tool-recovermet/Makefile index 35befd2aae5a..06eb58419530 100644 --- a/misc/linux-edonkey-tool-recovermet/Makefile +++ b/misc/linux-edonkey-tool-recovermet/Makefile @@ -20,19 +20,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool that tries to re-create x.part.met files compromised due to crash ONLY_FOR_ARCHS= i386 -USE_LINUX?= yes +USE_LINUX= yes NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/edonkey-tool-recovermet -STRIP= - -STRIP_CMD= ${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?= /usr/bin/brandelf -.else -BRANDELF?= brandelf -.endif BINARY_NAME= ${PORTNAME}${PKGNAMESUFFIX} diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile index 9a0914c8731e..7745b417dec5 100644 --- a/misc/linux-opengroupware/Makefile +++ b/misc/linux-opengroupware/Makefile @@ -6,7 +6,7 @@ PORTNAME= opengroupware PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc www linux MASTER_SITES= http://download.opengroupware.org/packages/freebsd/linux-opengroupware/RPMS/:ogo \ http://download.opengroupware.org/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \ @@ -22,11 +22,12 @@ MAINTAINER= frank@opengroupware.org COMMENT= Groupware package including mail, calendar, palm sync and much more EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm -INSTALL_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ - ${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \ +RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \ ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake +USE_PGSQL= yes + #BEGINSET1 SET1= opengroupware-core-4.2-ogo107.i386.rpm:ogo \ @@ -105,7 +106,7 @@ SET3= postgresql-libs-7.2.4-5.80.i386.rpm \ NGOBJWEB_ADAPTOR= opengroupware.org-mod_ngobjweb-200407092000.tar.gz PATCHDIR?= ${MASTERDIR}/files -USE_LINUX?= yes +USE_LINUX= yes USE_GMAKE= yes MAKEFILE= ${WRKSRC}/opengroupware.org-mod_ngobjweb/GNUmakefile BUILD_WRKSRC?= ${WRKSRC}/opengroupware.org-mod_ngobjweb diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile index adaac7516ee6..6318e9302045 100644 --- a/misc/opencyc/Makefile +++ b/misc/opencyc/Makefile @@ -7,7 +7,7 @@ PORTNAME= opencyc PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc linux MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,8 +16,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= alexs@snark.rinet.ru COMMENT= General knowledge base and commonsense reasoning engine -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - +USE_LINUX= yes +USE_X_PREFIX= yes NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" -- cgit