Date: Mon, 11 Apr 2005 17:57:36 +0200 From: Alexander Leidinger <Alexander@Leidinger.net> To: alexs@snark.rinet.ru, apeiron@coitusmentis.info, arundel@h3c.de, asa@gascom.ru, benlutz@datacomm.ch, blackend@FreeBSD.org, bms@FreeBSD.org, brett@peloton.runet.edu, cartola@openit.com.br, chris@chrisburkert.de, cjh@kr.freebsd.org, cracauer@cons.org, cyrille.lefevre@laposte.net, danfe@FreeBSD.org, darius@dons.net.au, des@FreeBSD.org, dyeske@yahoo.com, ebert@informatik.unibw-muenchen.de, frank@opengroupware.org, freebsd-emulation@FreeBSD.org, girgen@FreeBSD.org, glewis@FreeBSD.org, hido@coreblack.com, holger@e-gitt.net, ip@doom.homeunix.org, jamie@bishopston.net, janos.mohacsi@bsd.hu, java@FreeBSD.org, jylefort@brutele.be, kiesel@schlund.de, kris@FreeBSD.org, lioux@FreeBSD.org, maho@FreeBSD.org, matt@peterson.org, matusita@FreeBSD.org, mb@imp.ch, mbr@FreeBSD.org, mezz@FreeBSD.org, mi@aldan.algebra.com, mranner@inode.at, nik@FreeBSD.org, nivit@users.sourceforge.net, orlando@break.net, pat@FreeBSD.org, pav@FreeBSD.org, ports@brandon.dvalentine.com, riggs@rrr.de, rjoseph@mammalia.org, roam@FreeBSD.org, ryan@sasknow.com, se@FreeBSD.org, sethk@meowfishies.com, sime@logos.hr, simond@irrelevant.org, sr-13@mail.ru, trevor@FreeBSD.org, tux@pinguru.net, udo.schweigert@siemens.com, user@unknown.nu, voisine@gmail.FreeBSD.ORG Subject: RFC: cleanup of linux ports Message-ID: <20050411175736.mabpo9me4g4cwc4g@netchild.homeip.net>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Dear maintainers,
attached is a patch to cleanup some issues in our linux ports. Additionally
to the changes described in $PORTSDIR/CHANGES and $PORTSDIR/UPDATING (after
patching off-course :-) ) and corresponding changes in the ports there are
also some cleanups related to the (mis(?)-)use of PREFIX and some cleanups
related to superflous variable definitions.
Please apply the patch (cd into $PORTSDIR and run "patch --quiet -p1
</path/to/wip-patch") and have a look at the ports you maintain ("grep ^diff
/path/to/wip-patch | cut -d ' ' -f 11" prints out a list of affected files).
Feel free to suggest improvements or point out deficits of the patch.
Since the patch also contains some bsd.port.mk bits, I will not commit
anything of this before portmgr tested and committed the bsd.port.mk part. I
don't expect this to happen this week, but please regard this mail as a
request for approval. If you don't answer I will commit this with an
approval by maintainer timeout, so if you want a little bit more time just
tell me how long you need.
Bye,
Alexander.
--
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
"Drawing on my fine command of language, I said nothing."
[-- Attachment #2 --]
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/CHANGES devel_ports/CHANGES
--- ports/CHANGES Sat Mar 26 18:33:15 2005
+++ devel_ports/CHANGES Sun Apr 10 16:16:00 2005
@@ -10,6 +10,19 @@
All ports committers are allowed to commit to this file.
+2005XXYY:
+AUTHOR: netchild@FreeBSD.org
+ - 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 DEFAULT_LINUX_BASE 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, ${DEFAULT_LINUX_BASE} should be used+
+ instead of a hardcoded reference.
+
20050325:
AUTHOR: jdp@FreeBSD.org
The CVSup port has been upgraded with a patch to correct the
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/Mk/bsd.port.mk devel_ports/Mk/bsd.port.mk
--- ports/Mk/bsd.port.mk Fri Mar 18 00:22:07 2005
+++ devel_ports/Mk/bsd.port.mk Sun Apr 10 16:19:08 2005
@@ -280,7 +280,8 @@
# XMKMF - Set to path of `xmkmf' if not in $PATH
# Default: xmkmf -a
# USE_X_PREFIX - If set, this port installs in ${X11BASE}. Implies USE_XLIB.
-# USE_XLIB - If set, this port uses the X libraries.
+# USE_XLIB - If set, this port uses the X libraries. In the USE_LINUX
+# 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
@@ -347,8 +348,15 @@
# USE_LINUX - Set to yes to say the port needs emulators/linux_base-8.
# Set to value <X>, if the port needs emulators/linux_base-<X>.
# If set to "7", a dependency is registered to emulators/linux_base.
+# Implies appropriate settings for NO_FILTER_SHLIBS,
+# STRIP and STRIP_CMD.
# USE_LINUX_PREFIX
-# - controls the action of PREFIX (see above).
+# - controls the action of PREFIX (see above). Only use this
+# if the port is a linux infrastructure port (e.g. contains libs
+# or a sound server which supports the FreeBSD native one),
+# use the default or the X11 prefix if it's a leaf port
+# (e.g. a game or program).
+# Implies NO_MTREE=yes.
##
# USE_MYSQL - Add MySQL client dependency.
# If no version is given (by the maintainer via the port or
@@ -1500,15 +1508,35 @@
.endif
.if defined(USE_LINUX)
+
+# install(1) also does a brandelf on strip, so don't strip with FreeBSD tools.
+STRIP=
+. if exists(${LINUXBASE}/usr/bin/strip)
+STRIP_CMD= ${LINUXBASE}/usr/bin/strip
+. else
+STRIP_CMD= ${TRUE}
+. endif
+
+NO_FILTER_SHLIBS= yes
+
+# Allow the user to specify another linux_base version.
+. if defined(OVERRIDE_DEFAULT_LINUX_BASE)
+. if ${USE_LINUX} == yes
+USE_LINUX= ${OVERRIDE_DEFAULT_LINUX_BASE}
+. endif
+. endif
+
. if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX})
-RUN_DEPENDS+= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
+DEFAULT_LINUX_BASE= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
. else
. if ${USE_LINUX} == "7"
-RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
+DEFAULT_LINUX_BASE= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
. else
-RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
+DEFAULT_LINUX_BASE= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
. endif
. endif
+
+RUN_DEPENDS+= ${DEFAULT_LINUX_BASE}
.endif
.if defined(USE_MOTIF)
@@ -1775,7 +1803,11 @@
.endif
.if defined(USE_XLIB)
+. if defined(USE_LINUX)
+RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+. else
LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT}
+. endif
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/UPDATING devel_ports/UPDATING
--- ports/UPDATING Mon Apr 11 10:14:22 2005
+++ devel_ports/UPDATING Mon Apr 11 14:19:55 2005
@@ -15,6 +15,15 @@
gdm_enable="YES"
+2005XXYY:
+ AFFECTS: users of alternate linux_base ports
+ AUTHOR: netchild@FreeBSD.org
+
+ The Ports Collection now allows to override the default linux_base port.
+ Specify e.g. OVERRIDE_DEFAULT_LINUX_BASE=rh-9 in /etc/make.conf to use
+ ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
+ ${PORTSDIR}/emulators/linux_base-${OVERRIDE_DEFAULT_LINUX_BASE}).
+
20050406:
AFFECTS: users of databases/mysql50-server
AUTHOR: ale@FreeBSD.org
@@ -41,7 +50,7 @@
11.x to 12.x.
20050324:
- AFFECTS: users of net/mDNSResponder,
+ AFFECTS: users of net/mDNSResponder
AUTHOR: brooks@FreeBSD.org
In mDNSResponder 98_1, mdnsd is no longer started by default due to a
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/archivers/stuffit/Makefile devel_ports/archivers/stuffit/Makefile
--- ports/archivers/stuffit/Makefile Tue Mar 1 22:51:24 2005
+++ devel_ports/archivers/stuffit/Makefile Thu Apr 7 16:34:24 2005
@@ -20,8 +20,7 @@
ONLY_FOR_ARCHS= i386 amd64
-USE_LINUX?= yes
-STRIP= # empty: do not strip linux binary during INSTALL_PROGRAM
+USE_LINUX= yes
NO_WRKSUBDIR= yes
STUFFIT_FILES= bin/unstuff bin/stuff
STUFFIT_MAN= man/man1/stuff.1 man/man1/unstuff.1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/astro/linux-setiathome/Makefile devel_ports/astro/linux-setiathome/Makefile
--- ports/astro/linux-setiathome/Makefile Tue Mar 1 22:51:24 2005
+++ devel_ports/astro/linux-setiathome/Makefile Thu Apr 7 15:01:20 2005
@@ -16,7 +16,7 @@
#
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
# Local variables
#
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/baudline/Makefile devel_ports/audio/baudline/Makefile
--- ports/audio/baudline/Makefile Tue Mar 1 22:51:25 2005
+++ devel_ports/audio/baudline/Makefile Thu Apr 7 16:34:41 2005
@@ -16,15 +16,14 @@
MAINTAINER= dyeske@yahoo.com
COMMENT= A real-time signal analysis tool and an offline time-frequency browser
-RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
BROKEN= Unfetchable
USE_X_PREFIX= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
-STRIP=
# Linux binary should not be stripped by INSTALL_PROGRAM
# because as a side effect it brands the binary as FreeBSD.
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/linux-arts/Makefile devel_ports/audio/linux-arts/Makefile
--- ports/audio/linux-arts/Makefile Mon Apr 11 10:01:27 2005
+++ devel_ports/audio/linux-arts/Makefile Mon Apr 11 15:27:32 2005
@@ -21,15 +21,13 @@
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-USE_LINUX?= yes
-PREFIX?= ${LINUXBASE}
-NO_MTREE= yes
+USE_LINUX= yes
+USE_LINUX_PREFIX= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
ONLY_FOR_ARCHS= i386
DIST_SUBDIR= rpm
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
PLIST= ${MASTERDIR}/pkg-plist.${ARCH}
MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/linux-mbrola/Makefile devel_ports/audio/linux-mbrola/Makefile
--- ports/audio/linux-mbrola/Makefile Tue Mar 1 22:51:25 2005
+++ devel_ports/audio/linux-mbrola/Makefile Thu Apr 7 15:16:18 2005
@@ -19,7 +19,7 @@
MASTERDIR= ${PORTSDIR}/audio/mbrola
MD5_FILE= ${.CURDIR}/distinfo
ONLY_FOR_ARCHS= alpha i386 ppc sparc64
-USE_LINUX?= y
+USE_LINUX= yes
USE_ZIP= y
MASTERDIR= ${.CURDIR}/../mbrola
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/linux-vsound/Makefile devel_ports/audio/linux-vsound/Makefile
--- ports/audio/linux-vsound/Makefile Tue Mar 1 22:51:25 2005
+++ devel_ports/audio/linux-vsound/Makefile Thu Apr 7 15:14:18 2005
@@ -19,7 +19,7 @@
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox/
-USE_LINUX?= yes
+USE_LINUX= yes
NO_BUILD= yes
do-install:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/teamspeak_client/Makefile devel_ports/audio/teamspeak_client/Makefile
--- ports/audio/teamspeak_client/Makefile Wed Mar 2 06:42:43 2005
+++ devel_ports/audio/teamspeak_client/Makefile Thu Apr 7 16:22:17 2005
@@ -21,8 +21,8 @@
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
+USE_LINUX= yes
NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
do-install:
${MKDIR} ${PREFIX}/lib/teamspeak_client
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/audio/teamspeak_server/Makefile devel_ports/audio/teamspeak_server/Makefile
--- ports/audio/teamspeak_server/Makefile Tue Mar 1 22:51:26 2005
+++ devel_ports/audio/teamspeak_server/Makefile Thu Apr 7 16:22:24 2005
@@ -20,8 +20,7 @@
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
NO_BUILD= yes
-USE_LINUX?= yes
-NO_FILTER_SHLIBS=yes
+USE_LINUX= yes
do-install:
@ ${SETENV} PKG_PREFIX=${PREFIX} \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/cad/linux-eagle/Makefile devel_ports/cad/linux-eagle/Makefile
--- ports/cad/linux-eagle/Makefile Tue Mar 1 22:51:26 2005
+++ devel_ports/cad/linux-eagle/Makefile Thu Apr 7 15:01:14 2005
@@ -28,7 +28,7 @@
RESTRICTED= "Usage permitted for non-commercial purposes only"
NO_CDROM= "Sale for profit is not permitted"
-USE_LINUX?= yes
+USE_LINUX= yes
NO_BUILD= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/databases/sybase_ase/Makefile devel_ports/databases/sybase_ase/Makefile
--- ports/databases/sybase_ase/Makefile Tue Mar 1 22:51:26 2005
+++ devel_ports/databases/sybase_ase/Makefile Mon Apr 11 15:28:26 2005
@@ -22,7 +22,7 @@
NO_INSTALL_MANPAGES= yes
PKGDEINSTALL= ${PKGDIR}/pkg-install
-USE_LINUX?= yes
+USE_LINUX= yes
pre-install:
@${ECHO_MSG} "---> Creating sybase user and group"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux-allegro/Makefile devel_ports/devel/linux-allegro/Makefile
--- ports/devel/linux-allegro/Makefile Mon Apr 11 10:01:46 2005
+++ devel_ports/devel/linux-allegro/Makefile Mon Apr 11 14:19:58 2005
@@ -18,14 +18,13 @@
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform game programming library (linux version)
-USE_LINUX?= yes
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
ONLY_FOR_ARCHS= i386
DIST_SUBDIR= rpm
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
DBPATH= /var/lib/rpm
RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux-runrev/Makefile devel_ports/devel/linux-runrev/Makefile
--- ports/devel/linux-runrev/Makefile Tue Mar 1 22:51:26 2005
+++ devel_ports/devel/linux-runrev/Makefile Thu Apr 7 16:40:05 2005
@@ -19,23 +19,18 @@
MAINTAINER= blackend@FreeBSD.org
COMMENT= Revolution is a rapid application development environment
-RUN_DEPENDS= xanim:${PORTSDIR}/multimedia/xanim \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+RUN_DEPENDS= xanim:${PORTSDIR}/multimedia/xanim
NO_CDROM= "Sale for profit is not permitted"
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/Revolution-${PORTVERSION}
DATADIR= ${PREFIX}/share/Revolution-${PORTVERSION}
-BRANDELF?= /usr/bin/brandelf
-# do not strip linux binaries
-STRIP=
-# try using the Linux strip command
-STRIP_CMD= ${LINUXBASE}/usr/bin/strip
-
BIN_FILES= revolution
LIB_DIRS= Databases components components/assistants \
components/help components/help/Appendixes \
@@ -99,9 +94,7 @@
.endfor
# binaries
.for file in ${BIN_FILES}
-. if exists(${STRIP_CMD})
@${STRIP_CMD} ${WRKSRC}/${file}
-. endif
@${BRANDELF} -t Linux ${WRKSRC}/${file}
@${INSTALL_PROGRAM} ${WRKSRC}/${file} ${DATADIR}/${file}
.endfor
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux-understand_ada/Makefile devel_ports/devel/linux-understand_ada/Makefile
--- ports/devel/linux-understand_ada/Makefile Fri Apr 1 03:27:54 2005
+++ devel_ports/devel/linux-understand_ada/Makefile Mon Apr 11 15:30:58 2005
@@ -17,8 +17,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Understand can parse a Ada project helping reverse engineer it
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
IGNORE= "is unfetchable and outdated and new version requires support contract"
DEPRECATED= ${IGNORE}
EXPIRATION_DATE= 2005-05-01
@@ -27,11 +25,10 @@
ONLY_FOR_ARCHS= i386
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
PREFIX_LINUX?= ${LINUXBASE}
-STRIP= ${LINUXBASE}/usr/bin/strip
-BRANDELF?= /usr/bin/brandelf
-FMT?= /usr/bin/fmt
INSTALL_DATA_DIR?= ${INSTALL} -d -o ${SHAREOWN} \
-g ${SHAREGRP} -m 755
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux-understand_c/Makefile devel_ports/devel/linux-understand_c/Makefile
--- ports/devel/linux-understand_c/Makefile Fri Apr 1 03:27:54 2005
+++ devel_ports/devel/linux-understand_c/Makefile Mon Apr 11 15:31:26 2005
@@ -18,8 +18,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Understand can parse a C/C++ project helping reverse engineer it
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
IGNORE= "is unfetchable and outdated and new version requires support contract"
DEPRECATED= ${IGNORE}
EXPIRATION_DATE= 2005-05-01
@@ -28,11 +26,10 @@
ONLY_FOR_ARCHS= i386
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
PREFIX_LINUX?= ${LINUXBASE}
-STRIP= ${LINUXBASE}/usr/bin/strip
-BRANDELF?= /usr/bin/brandelf
-FMT?= /usr/bin/fmt
CONF_DIRS= compilers configs fonts license
CONF_FILES= compilers/aix.cfg compilers/alpha.cfg \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux-understand_java/Makefile devel_ports/devel/linux-understand_java/Makefile
--- ports/devel/linux-understand_java/Makefile Fri Apr 1 03:27:54 2005
+++ devel_ports/devel/linux-understand_java/Makefile Mon Apr 11 15:32:00 2005
@@ -17,8 +17,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Understand can parse a Java project helping reverse engineer it
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
IGNORE= "is unfetchable and outdated and new version requires support contract"
DEPRECATED= ${IGNORE}
EXPIRATION_DATE= 2005-05-01
@@ -27,11 +25,10 @@
ONLY_FOR_ARCHS= i386
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
PREFIX_LINUX?= ${LINUXBASE}
-STRIP= ${LINUXBASE}/usr/bin/strip
-BRANDELF?= /usr/bin/brandelf
-FMT?= /usr/bin/fmt
INSTALL_DATA_DIR?= ${INSTALL} -d -o ${SHAREOWN} \
-g ${SHAREGRP} -m 755
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/linux_devtools/Makefile devel_ports/devel/linux_devtools/Makefile
--- ports/devel/linux_devtools/Makefile Mon Apr 11 04:59:57 2005
+++ devel_ports/devel/linux_devtools/Makefile Mon Apr 11 14:23:45 2005
@@ -35,17 +35,12 @@
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-RESTRICTED= "binaries under GNU GPL without accompanying source"
-
-USE_LINUX?= yes
-NO_LATEST_LINK= yes
+USE_LINUX= 8
+USE_LINUX_PREFIX= yes
ONLY_FOR_ARCHS= i386 amd64
CONFLICTS= linux_devtools-*
DIST_SUBDIR= rpm/${ARCH}/${PORTVERSION}
-PREFIX= ${LINUXBASE}
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
-NO_MTREE= yes
PLIST= ${WRKDIR}/pkg-plist
# Let's avoid hardcoding 'en' as the language.
@@ -57,8 +52,8 @@
DBPATH= /var/lib/rpm
RPM= LC_ALL=C rpm
-RPMFLAGS= --root ${LINUXBASE} --dbpath ${DBPATH} --nodeps \
- --replacepkgs --ignoreos
+RPMFLAGS= --root ${PREFIX} --dbpath ${DBPATH} --nodeps \
+ --replacepkgs --ignoreos --ignorearch
RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
REMOVE_DIRS= dev tmp var/tmp
@@ -87,12 +82,15 @@
do-install:
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
- @${MKDIR} ${LINUXBASE}/tmp
- @${MKDIR} ${LINUXBASE}/var/tmp
- @${MKDIR} ${LINUXBASE}/dev
- @${RM} -f ${LINUXBASE}/dev/null
- @mknod ${LINUXBASE}/dev/null c 2 2
- @${CHMOD} 666 ${LINUXBASE}/dev/null
+ @${MKDIR} ${PREFIX}/tmp
+ @${MKDIR} ${PREFIX}/var/tmp
+# this isn't needed on a devfs system
+.if ( ${OSVERSION} < 502100 )
+ @${MKDIR} ${PREFIX}/dev
+ @${RM} -f ${PREFIX}/dev/null
+ @mknod ${PREFIX}/dev/null c 2 2
+ @${CHMOD} 666 ${PREFIX}/dev/null
+.endif
#
# Install all packages.
@for R in ${DISTFILES}; do \
@@ -108,10 +106,10 @@
#
# Finish
@for D in ${REMOVE_DIRS}; do \
- ${RM} -rf ${LINUXBASE}/$$D; \
+ ${RM} -rf ${PREFIX}/$$D; \
done
@for F in ${REMOVE_FILES}; do \
- ${RM} ${LINUXBASE}/$$F; \
+ ${RM} ${PREFIX}/$$F; \
done
.include <bsd.port.post.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/devel/zendstudio/Makefile devel_ports/devel/zendstudio/Makefile
--- ports/devel/zendstudio/Makefile Tue Mar 1 22:51:27 2005
+++ devel_ports/devel/zendstudio/Makefile Thu Apr 7 15:29:23 2005
@@ -20,6 +20,7 @@
RESTRICTED= "Redistribution is not permitted"
NO_PACKAGES= ${RESTRICTED}
NO_CDROM= ${RESTRICTED}
+USE_LINUX= yes
.include <bsd.port.pre.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/editors/edith/Makefile devel_ports/editors/edith/Makefile
--- ports/editors/edith/Makefile Tue Mar 1 22:51:27 2005
+++ devel_ports/editors/edith/Makefile Thu Apr 7 16:42:30 2005
@@ -16,10 +16,9 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A X11 GUI editor for binary and plain text files
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
-USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
RESTRICTED= "Redistribution not allowed"
NO_BUILD= yes
@@ -29,7 +28,6 @@
WRKSRC= ${WRKDIR}/edith
EDITHDIR= ${PREFIX}/lib/edith
-STRIP=
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/edith ${PREFIX}/bin
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/editors/staroffice5/Makefile devel_ports/editors/staroffice5/Makefile
--- ports/editors/staroffice5/Makefile Tue Mar 1 22:51:27 2005
+++ devel_ports/editors/staroffice5/Makefile Thu Apr 7 15:30:45 2005
@@ -26,6 +26,7 @@
NO_CDROM= 'Must be downloaded direct from Sun via www interface'
USE_REINPLACE= yes
+USE_LINUX= yes
IS_INTERACTIVE= yes
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_CMD= ${CAT}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/editors/staroffice52/Makefile devel_ports/editors/staroffice52/Makefile
--- ports/editors/staroffice52/Makefile Tue Mar 1 22:51:28 2005
+++ devel_ports/editors/staroffice52/Makefile Thu Apr 7 15:31:15 2005
@@ -42,6 +42,7 @@
IS_INTERACTIVE= yes
NO_BUILD= yes
USE_REINPLACE= yes
+USE_LINUX= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/editors/staroffice60/Makefile devel_ports/editors/staroffice60/Makefile
--- ports/editors/staroffice60/Makefile Tue Mar 1 22:51:28 2005
+++ devel_ports/editors/staroffice60/Makefile Thu Apr 7 15:31:32 2005
@@ -32,6 +32,7 @@
ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
+USE_LINUX= yes
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/editors/staroffice70/Makefile devel_ports/editors/staroffice70/Makefile
--- ports/editors/staroffice70/Makefile Tue Mar 1 22:51:28 2005
+++ devel_ports/editors/staroffice70/Makefile Thu Apr 7 15:31:46 2005
@@ -35,6 +35,7 @@
ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
+USE_LINUX= yes
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-geepee32/Makefile devel_ports/emulators/linux-geepee32/Makefile
--- ports/emulators/linux-geepee32/Makefile Tue Mar 1 22:51:28 2005
+++ devel_ports/emulators/linux-geepee32/Makefile Thu Apr 7 16:51:20 2005
@@ -15,17 +15,16 @@
MAINTAINER= arundel@h3c.de
COMMENT= The only GP32 emulator for i386
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
+USE_LINUX= yes
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_REINPLACE= yes
REINPLACE_ARGS=
-STRIP=
TARGET_DIR= ${PREFIX}/${PORTNAME}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-peops-softgpu/Makefile devel_ports/emulators/linux-peops-softgpu/Makefile
--- ports/emulators/linux-peops-softgpu/Makefile Tue Mar 1 22:51:28 2005
+++ devel_ports/emulators/linux-peops-softgpu/Makefile Thu Apr 7 16:44:19 2005
@@ -19,22 +19,20 @@
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
-
MAJOR= ${PORTVERSION:R}
MINOR= ${PORTVERSION:E}
PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR}
.include <bsd.port.pre.mk>
-PSEMUPRO_PLUGINS_DIR= ${LOCALBASE}/lib/psemupro/plugins
-PSEMUPRO_CFGBINS_DIR= ${LOCALBASE}/libexec/psemupro/cfg
-PSEMUPRO_CFGFILES_DIR= ${LOCALBASE}/share/psemupro/cfg
+PSEMUPRO_PLUGINS_DIR= ${PREFIX}/lib/psemupro/plugins
+PSEMUPRO_CFGBINS_DIR= ${PREFIX}/libexec/psemupro/cfg
+PSEMUPRO_CFGFILES_DIR= ${PREFIX}/share/psemupro/cfg
do-install:
${MKDIR} ${PSEMUPRO_PLUGINS_DIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-peops-spu/Makefile devel_ports/emulators/linux-peops-spu/Makefile
--- ports/emulators/linux-peops-spu/Makefile Tue Mar 1 22:51:29 2005
+++ devel_ports/emulators/linux-peops-spu/Makefile Thu Apr 7 16:44:58 2005
@@ -19,22 +19,20 @@
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
-
MAJOR= ${PORTVERSION:R}
MINOR= ${PORTVERSION:E}
PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR}
.include <bsd.port.pre.mk>
-PSEMUPRO_PLUGINS_DIR= ${LOCALBASE}/lib/psemupro/plugins
-PSEMUPRO_CFGBINS_DIR= ${LOCALBASE}/libexec/psemupro/cfg
-PSEMUPRO_CFGFILES_DIR= ${LOCALBASE}/share/psemupro/cfg
+PSEMUPRO_PLUGINS_DIR= ${PREFIX}/lib/psemupro/plugins
+PSEMUPRO_CFGBINS_DIR= ${PREFIX}/libexec/psemupro/cfg
+PSEMUPRO_CFGFILES_DIR= ${PREFIX}/share/psemupro/cfg
do-install:
${MKDIR} ${PSEMUPRO_PLUGINS_DIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-pete-mesagpu/Makefile devel_ports/emulators/linux-pete-mesagpu/Makefile
--- ports/emulators/linux-pete-mesagpu/Makefile Tue Mar 1 22:51:29 2005
+++ devel_ports/emulators/linux-pete-mesagpu/Makefile Thu Apr 7 16:49:36 2005
@@ -21,22 +21,20 @@
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
-
MAJOR= ${PORTVERSION:R}
MINOR= ${PORTVERSION:E}
PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR}
.include <bsd.port.pre.mk>
-PSEMUPRO_PLUGINS_DIR= ${LOCALBASE}/lib/psemupro/plugins
-PSEMUPRO_CFGBINS_DIR= ${LOCALBASE}/libexec/psemupro/cfg
-PSEMUPRO_CFGFILES_DIR= ${LOCALBASE}/share/psemupro/cfg
+PSEMUPRO_PLUGINS_DIR= ${PREFIX}/lib/psemupro/plugins
+PSEMUPRO_CFGBINS_DIR= ${PREFIX}/libexec/psemupro/cfg
+PSEMUPRO_CFGFILES_DIR= ${PREFIX}/share/psemupro/cfg
do-install:
${MKDIR} ${PSEMUPRO_PLUGINS_DIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-vmware-toolbox2/Makefile devel_ports/emulators/linux-vmware-toolbox2/Makefile
--- ports/emulators/linux-vmware-toolbox2/Makefile Tue Mar 1 22:51:29 2005
+++ devel_ports/emulators/linux-vmware-toolbox2/Makefile Thu Apr 7 16:49:55 2005
@@ -16,8 +16,6 @@
MAINTAINER= matusita@FreeBSD.org
COMMENT=VMware toolbox for guest OS (for VMware 2.x, Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
ONLY_FOR_ARCHS= i386
PLIST_FILES= bin/linux-vmware-toolbox
USE_X_PREFIX= yes
@@ -47,7 +45,6 @@
.else
MOUNT_DEV?= fd0
.endif
-STRIP=
VMWARE_VER= 2.0.4
BUILD_VER= 1142
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-vmware-toolbox4/Makefile devel_ports/emulators/linux-vmware-toolbox4/Makefile
--- ports/emulators/linux-vmware-toolbox4/Makefile Tue Mar 8 03:01:46 2005
+++ devel_ports/emulators/linux-vmware-toolbox4/Makefile Thu Apr 7 16:50:34 2005
@@ -16,17 +16,15 @@
MAINTAINER= matusita@FreeBSD.org
COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version)
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
DISTDIR= ${MOUNT_PT}
IGNOREFILES= ${DISTFILES}
PLIST_FILES= bin/linux-vmware-toolbox
WRKSRC= ${WRKDIR}/vmware-tools-distrib
-STRIP=
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
.if !defined(BATCH)
IS_INTERACTIVE= yes
.endif
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/linux-winetools/Makefile devel_ports/emulators/linux-winetools/Makefile
--- ports/emulators/linux-winetools/Makefile Tue Mar 1 22:51:29 2005
+++ devel_ports/emulators/linux-winetools/Makefile Thu Apr 7 16:51:02 2005
@@ -16,16 +16,14 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A setup and configuration tool for WINE
-RUN_DEPENDS= wine:${PORTSDIR}/emulators/wine \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+RUN_DEPENDS= wine:${PORTSDIR}/emulators/wine
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
PLIST_FILES= bin/winetools
-
-BRANDELF?= /usr/bin/brandelf
-STRIP=
post-extract:
@${BRANDELF} -t Linux ${WRKDIR}/${PORTNAME}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/rtc/Makefile devel_ports/emulators/rtc/Makefile
--- ports/emulators/rtc/Makefile Tue Mar 1 22:51:29 2005
+++ devel_ports/emulators/rtc/Makefile Thu Apr 7 15:37:07 2005
@@ -18,7 +18,7 @@
WRKSRC= ${WRKDIR}/files
NO_FETCH= yes
-USE_LINUX?= yes
+USE_LINUX= yes # because of ${DEVDIR}
KMODDIR= ${PREFIX}/modules
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/vmware2/Makefile devel_ports/emulators/vmware2/Makefile
--- ports/emulators/vmware2/Makefile Tue Mar 1 22:51:30 2005
+++ devel_ports/emulators/vmware2/Makefile Thu Apr 7 15:39:47 2005
@@ -45,7 +45,7 @@
SRC_BASE?= /usr/src
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/vmware-distrib
GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
MAN1= vmware.1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/emulators/vmware3/Makefile devel_ports/emulators/vmware3/Makefile
--- ports/emulators/vmware3/Makefile Tue Mar 1 22:51:30 2005
+++ devel_ports/emulators/vmware3/Makefile Thu Apr 7 15:40:55 2005
@@ -22,7 +22,7 @@
MAINTAINER= orlando@break.net
COMMENT= A virtual machine emulator - a full PC in a window
-RUN_DEPENDS= /dev/rtc:${PORTSDIR}/emulators/rtc \
+RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc \
${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
RESTRICTED= "Not sure if we can redistribute it"
@@ -39,7 +39,7 @@
SRC_BASE?= /usr/src
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/vmware-distrib
GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
MAN1= vmware.1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/french/gibi/Makefile devel_ports/french/gibi/Makefile
--- ports/french/gibi/Makefile Sat Apr 2 22:14:43 2005
+++ devel_ports/french/gibi/Makefile Thu Apr 7 15:43:27 2005
@@ -35,6 +35,7 @@
ONLY_FOR_ARCHS= i386
USE_REINPLACE= yes
+USE_LINUX= yes
REINPLACE_ARGS= -i ""
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/french/homard/Makefile devel_ports/french/homard/Makefile
--- ports/french/homard/Makefile Sat Apr 2 22:15:09 2005
+++ devel_ports/french/homard/Makefile Thu Apr 7 15:42:03 2005
@@ -26,7 +26,7 @@
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
USE_PYTHON= yes
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/french/staroffice52/Makefile devel_ports/french/staroffice52/Makefile
--- ports/french/staroffice52/Makefile Tue Mar 1 22:51:30 2005
+++ devel_ports/french/staroffice52/Makefile Thu Apr 7 15:42:55 2005
@@ -36,6 +36,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NO_CDROM= 'Doit être téléchargé depuis le site web de Sun'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/HeroesOfMightAndMagic/Makefile devel_ports/games/HeroesOfMightAndMagic/Makefile
--- ports/games/HeroesOfMightAndMagic/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/HeroesOfMightAndMagic/Makefile Thu Apr 7 15:43:45 2005
@@ -20,6 +20,7 @@
PLIST= ${WRKDIR}/PLIST
IS_INTERACTIVE= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
NO_CDROM= Software is commercial
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/adom/Makefile devel_ports/games/adom/Makefile
--- ports/games/adom/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/adom/Makefile Thu Apr 7 16:51:36 2005
@@ -15,11 +15,11 @@
MAINTAINER= sr-13@mail.ru
COMMENT= An rogue-like advanced rpg with color support (binary port)
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
NO_CDROM= Copy of CD must be sent to author
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/adom
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/atitd/Makefile devel_ports/games/atitd/Makefile
--- ports/games/atitd/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/atitd/Makefile Thu Apr 7 16:55:30 2005
@@ -28,13 +28,14 @@
.endif
PLIST_FILES= bin/atitd
-USE_LINUX?= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
USE_MESA= yes
ONLY_FOR_ARCHS= i386
NO_CDROM= "Redistribution not allowed"
-NO_PACKAGE= "Not packagable."
NO_BUILD= yes
+NO_PACKAGE= "Not packagable."
NO_WRKSUBDIR= yes
LINUX_SH= ${LINUXBASE}/bin/sh
@@ -58,6 +59,7 @@
post-install:
@${ECHO_MSG} "===> Fixing permissions."
@${CHOWN} -R atitd:atitd ${PREFIX}/games/atitd
+ @${BRANDELF} -t Linux ${PREFIX}/games/atitd/elaunch
@${CHMOD} ug+s ${PREFIX}/games/atitd/elaunch
${INSTALL_SCRIPT} ${WRKSRC}/atitd.sh ${PREFIX}/bin/atitd
@${ECHO_MSG} "===> Running the post-install script."
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/dsnake/Makefile devel_ports/games/dsnake/Makefile
--- ports/games/dsnake/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/dsnake/Makefile Thu Apr 7 17:12:24 2005
@@ -20,9 +20,12 @@
NO_PACKAGE= Licence forbids any repacking and reselling
ONLY_FOR_ARCHS= i386
-NO_BUILD= yes
-PREFIX?= ${X11BASE}
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/DeluxeSnake
+
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/dsnake
do-install:
${MKDIR} ${DATADIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/halflifeserver/Makefile devel_ports/games/halflifeserver/Makefile
--- ports/games/halflifeserver/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/halflifeserver/Makefile Thu Apr 7 15:45:16 2005
@@ -18,7 +18,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
USE_PERL5= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/hlserver-cs/Makefile devel_ports/games/hlserver-cs/Makefile
--- ports/games/hlserver-cs/Makefile Tue Mar 1 22:51:31 2005
+++ devel_ports/games/hlserver-cs/Makefile Thu Apr 7 15:45:49 2005
@@ -26,7 +26,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
USE_PERL5= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/hohlin/Makefile devel_ports/games/hohlin/Makefile
--- ports/games/hohlin/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/hohlin/Makefile Thu Apr 7 15:50:10 2005
@@ -22,6 +22,7 @@
WRKSRC= ${WRKDIR}/hoh-install-${PORTVERSION}/
USE_BZIP2= YES
+USE_LINUX= yes
NO_BUILD= YES
ONLY_FOR_ARCHS= i386
SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-enemyterritory/Makefile devel_ports/games/linux-enemyterritory/Makefile
--- ports/games/linux-enemyterritory/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/linux-enemyterritory/Makefile Thu Apr 7 15:49:38 2005
@@ -27,7 +27,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
NO_PACKAGE= Distfile is 258MB, set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-nwnclient/Makefile devel_ports/games/linux-nwnclient/Makefile
--- ports/games/linux-nwnclient/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/linux-nwnclient/Makefile Thu Apr 7 15:49:57 2005
@@ -23,6 +23,7 @@
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NWNDATADIR= ${LOCALBASE}/share/nwndata
PLIST_SUB+= NWNVERSION="${PORTVERSION:S/.//}"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-nwserver/Makefile devel_ports/games/linux-nwserver/Makefile
--- ports/games/linux-nwserver/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/linux-nwserver/Makefile Thu Apr 7 16:59:18 2005
@@ -16,14 +16,13 @@
MAINTAINER= apeiron@coitusmentis.info
COMMENT= Neverwinter Nights Linux (x86) Dedicated Server
-USE_LINUX?= yes
-NO_BUILD= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
WRKSRC= ${WRKDIR}
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
+do-build:
+ ${BRANDELF} -t Linux ${WRKDIR}/fixinstall
+ ${BRANDELF} -t Linux ${WRKDIR}/nwserver
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/fixinstall ${PREFIX}/bin
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-q3ademo/Makefile devel_ports/games/linux-q3ademo/Makefile
--- ports/games/linux-q3ademo/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/linux-q3ademo/Makefile Thu Apr 7 16:59:49 2005
@@ -21,8 +21,9 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux 3d shooter from id Software / Loki Software (demo version)
-PREFIX?= ${X11BASE}
USE_GL= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
@@ -32,9 +33,6 @@
RUN_DEPENDS += ${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
.endif
-# Linux binary should not be stripped by INSTALL_PROGRAM as it uses /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
-STRIP=
-
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
IGNORE= may not be automatically fetched due to licensing\
restrictions. You MUST manually fetch the Linux version from:\
@@ -63,6 +61,8 @@
@${ECHO_CMD} "quake=\"./q3demo\"" >> ${WRKSRC}/q3demo
@${ECHO_CMD} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo
@${ECHO_CMD} "exit "$$"?" >> ${WRKSRC}/q3demo
+ @${BRANDELF} -t Linux ${WRKSRC}/bin/x86/glibc-2.0/q3ded
+ @${BRANDELF} -t Linux ${WRKSRC}/bin/x86/glibc-2.0/q3demo
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/q3demo ${PREFIX}/bin
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-spheresofchaos-demo/Makefile devel_ports/games/linux-spheresofchaos-demo/Makefile
--- ports/games/linux-spheresofchaos-demo/Makefile Tue Mar 1 22:51:32 2005
+++ devel_ports/games/linux-spheresofchaos-demo/Makefile Thu Apr 7 15:50:22 2005
@@ -21,6 +21,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
USE_ZIP= yes
+USE_LINUX= yes
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/linux-steam/Makefile devel_ports/games/linux-steam/Makefile
--- ports/games/linux-steam/Makefile Tue Mar 1 22:51:33 2005
+++ devel_ports/games/linux-steam/Makefile Thu Apr 7 15:49:22 2005
@@ -18,6 +18,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
IS_INTERACTIVE= yes
+USE_LINUX= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
INSTALLDIR?= steam
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/q3server/Makefile devel_ports/games/q3server/Makefile
--- ports/games/q3server/Makefile Tue Mar 1 22:51:33 2005
+++ devel_ports/games/q3server/Makefile Thu Apr 7 15:46:56 2005
@@ -19,7 +19,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
USE_PERL5= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/rt2-demo/Makefile devel_ports/games/rt2-demo/Makefile
--- ports/games/rt2-demo/Makefile Tue Mar 1 22:51:33 2005
+++ devel_ports/games/rt2-demo/Makefile Thu Apr 7 15:47:03 2005
@@ -19,7 +19,7 @@
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_LINUX?= yes
+USE_LINUX= yes
do-install:
@${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/rtcw/Makefile devel_ports/games/rtcw/Makefile
--- ports/games/rtcw/Makefile Tue Mar 1 22:51:33 2005
+++ devel_ports/games/rtcw/Makefile Thu Apr 7 15:47:14 2005
@@ -18,7 +18,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/rtcw-paks/Makefile devel_ports/games/rtcw-paks/Makefile
--- ports/games/rtcw-paks/Makefile Tue Mar 1 22:51:33 2005
+++ devel_ports/games/rtcw-paks/Makefile Thu Apr 7 17:02:04 2005
@@ -18,17 +18,17 @@
MAINTAINER= nik@FreeBSD.org
COMMENT= Return to Castle Wolfenstein for Linux .pk3 files
-# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
+# Make this a BUILD_DEPENDs too, so that it can create the
# directory hierarchy for us.
BUILD_DEPENDS= ${PREFIX}/usr/games/rtcw/wolf.x86:${PORTSDIR}/games/rtcw
+RUN_DEPENDS= ${BUILD_DEPENDS}
ONLY_FOR_ARCHS= i386
-USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
EXTRACT_ONLY= # Don't extract anything
-STRIP=
-GAMEDIR= ${PREFIX}/usr/games/rtcw/
+GAMEDIR= ${PREFIX}/games/rtcw/
.include <bsd.port.pre.mk>
@@ -41,6 +41,7 @@
# Do nothing for the build. Don't set NO_BUILD because of the earlier
# BUILD_DEPENDS
do-build:
+ @${DO_NADA}
do-install:
${MKDIR} -p ${GAMEDIR}/main
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/ssamtse/Makefile devel_ports/games/ssamtse/Makefile
--- ports/games/ssamtse/Makefile Tue Mar 1 22:51:34 2005
+++ devel_ports/games/ssamtse/Makefile Thu Apr 7 17:13:53 2005
@@ -16,11 +16,10 @@
MAINTAINER= asa@gascom.ru
COMMENT= Serious Sam - The Second Encounter
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
NO_BUILD= yes
USE_BZIP2= yes
USE_REINPLACE= yes
+USE_LINUX= yes
USE_X_PREFIX= yes
USE_GL= yes
INSTALLS_SHLIB= yes
@@ -59,6 +58,7 @@
@${SED} 's|%SSAMDIR%|${SSAMDIR}|g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
do-install:
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
@${MKDIR} ${SSAMDIR}
@${TAR} --bzip2 -C ${SSAMDIR} -xf \
${WRKDIR}/ssam/bins.tar.bz2
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/stvef-paks/Makefile devel_ports/games/stvef-paks/Makefile
--- ports/games/stvef-paks/Makefile Tue Mar 1 22:51:34 2005
+++ devel_ports/games/stvef-paks/Makefile Thu Apr 7 17:03:42 2005
@@ -17,17 +17,17 @@
MAINTAINER= nik@FreeBSD.org
COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux .pk3 files
-# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
+# Make this a BUILD_DEPENDS too, so that it can create the
# directory hierarchy for us.
BUILD_DEPENDS= ${PREFIX}/usr/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/games/stvef-server
+RUN_DEPENDS= ${BUILD_DEPENDS}
ONLY_FOR_ARCHS= i386
-USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
EXTRACT_ONLY= # Don't extract anything
-STRIP=
-GAMEDIR= ${PREFIX}/usr/games/stvef/
+GAMEDIR= ${PREFIX}/games/stvef/
.include <bsd.port.pre.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/stvef-server/Makefile devel_ports/games/stvef-server/Makefile
--- ports/games/stvef-server/Makefile Tue Mar 1 22:51:34 2005
+++ devel_ports/games/stvef-server/Makefile Thu Apr 7 17:04:59 2005
@@ -17,19 +17,21 @@
ONLY_FOR_ARCHS= i386
USE_ZIP= yes
-USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
-NO_BUILD= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/Linux
-STRIP=
INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
-GAMEDIR= ${PREFIX}/usr/games/stvef/
+GAMEDIR= ${PREFIX}/games/stvef/
# files which should be installed with executables perms
EXECUTABLES= linuxstvefded_1.2-static linuxstvefded_1.2-glibc2.1.3
+
+de-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-static
+ ${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-glibc2.1.3
do-install:
${MKDIR} ${GAMEDIR}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/utserver/Makefile devel_ports/games/utserver/Makefile
--- ports/games/utserver/Makefile Sun Mar 27 04:16:32 2005
+++ devel_ports/games/utserver/Makefile Thu Apr 7 15:47:49 2005
@@ -23,6 +23,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
+USE_LINUX= yes
USE_PERL5= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/games/utserver-to/Makefile devel_ports/games/utserver-to/Makefile
--- ports/games/utserver-to/Makefile Sat Mar 26 21:12:01 2005
+++ devel_ports/games/utserver-to/Makefile Thu Apr 7 17:10:01 2005
@@ -22,13 +22,12 @@
MAINTAINER?= pat@FreeBSD.org
COMMENT?= Unreal Tournament mod Tactical Ops full server package for Linux
-RUN_DEPENDS= ${LINUXBASE}/usr/games/ut-server/System/ucc-bin:${UTSERVER_PORT}
+RUN_DEPENDS= ${LOCALBASE}/games/ut-server/System/ucc-bin:${UTSERVER_PORT}
BROKEN= Unfetchable
ONLY_FOR_ARCHS= i386
-USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
USE_PERL5= yes
NO_CDROM= "Size; the data set is much too big"
NO_BUILD= yes
@@ -43,13 +42,8 @@
.ifndef(DO_USE_WRKSUBDIR)
NO_WRKSUBDIR= yes
.endif
-.if defined(DO_USE_STRIP) && exists(${LINUXBASE}/usr/bin/strip)
-STRIP= ${LINUXBASE}/usr/bin/strip
-.else
-STRIP=
-.endif
-UTDIR= usr/games/ut-server/
+UTDIR= games/ut-server/
PLIST_SUB+= UTDIR="${UTDIR}"
INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
@@ -84,6 +78,7 @@
# Contributed by <lioux@FreeBSD.org>
do-install: install-parse-plist install-scripts
+# XXX: this is missing a ${BRANDELF} -t Linux <executables>
install-parse-plist: generate-plist
@${PERL} -e 'open(FHANDLER,"${TMPPLIST}");' \
-e 'open(FDIR,">${WRKDIR}/dirs.sh.tmp");' \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/german/citrix_ica/Makefile devel_ports/german/citrix_ica/Makefile
--- ports/german/citrix_ica/Makefile Tue Mar 1 22:51:34 2005
+++ devel_ports/german/citrix_ica/Makefile Thu Apr 7 15:50:39 2005
@@ -23,6 +23,7 @@
NO_WRKSUBDIR= Yes
NO_BUILD= Yes
+USE_LINUX= yes
CDIR= ${PREFIX}/ICAClient
BINDIR= ${PREFIX}/bin
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/german/staroffice5/Makefile devel_ports/german/staroffice5/Makefile
--- ports/german/staroffice5/Makefile Tue Mar 1 22:51:35 2005
+++ devel_ports/german/staroffice5/Makefile Thu Apr 7 15:50:52 2005
@@ -25,6 +25,7 @@
NO_LATEST_LINK= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
IS_INTERACTIVE= yes
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/german/staroffice52/Makefile devel_ports/german/staroffice52/Makefile
--- ports/german/staroffice52/Makefile Tue Mar 1 22:51:35 2005
+++ devel_ports/german/staroffice52/Makefile Thu Apr 7 15:51:05 2005
@@ -35,6 +35,7 @@
NO_LATEST_LINK= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/german/staroffice70/Makefile devel_ports/german/staroffice70/Makefile
--- ports/german/staroffice70/Makefile Tue Mar 1 22:51:35 2005
+++ devel_ports/german/staroffice70/Makefile Thu Apr 7 15:51:15 2005
@@ -37,6 +37,7 @@
IS_INTERACTIVE= yes
NO_BUILD= yes
+USE_LINUX= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
WRKSRC= ${WRKDIR}/${SOVERSION}
TMPDIR= ${WRKDIR}/tmp
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-ac3d/Makefile devel_ports/graphics/linux-ac3d/Makefile
--- ports/graphics/linux-ac3d/Makefile Tue Mar 15 21:40:18 2005
+++ devel_ports/graphics/linux-ac3d/Makefile Thu Apr 7 17:16:34 2005
@@ -16,19 +16,20 @@
MAINTAINER= ip@doom.homeunix.org
COMMENT= Easy to use and powerful 3D graphics modeller (trial version)
-.ifdef(INSTALL_DYNLINKED_VERSION)
-LIB_DEPENDS= ${LINUXBASE}/usr/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
-.endif
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
+RUN_DEPENDS= \
${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png10 \
${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
+.ifdef(INSTALL_DYNLINKED_VERSION)
+RUN_DEPENDS+= ${LINUXBASE}/usr/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
+.endif
RESTRICTED= "no distribution permitted"
NO_CDROM= ${RESTRICTED}
-NO_BUILD= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}lx
SUB_FILES= pkg-message
@@ -44,10 +45,6 @@
PROGRAM= ${PORTNAME}
.endif
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
-
.ifndef(INSTALL_DYNLINKED_VERSION)
pre-everything::
@${ECHO_MSG} 'Define INSTALL_DYNLINKED_VERSION=yes to install'
@@ -56,6 +53,9 @@
@${ECHO_MSG} 'It may be useful with hardware accellerated MesaGL'
@${ECHO_MSG} ''
.endif
+
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/${PROGRAM}
pre-install:
# Generate startup script
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-bmrt/Makefile devel_ports/graphics/linux-bmrt/Makefile
--- ports/graphics/linux-bmrt/Makefile Tue Mar 1 22:51:35 2005
+++ devel_ports/graphics/linux-bmrt/Makefile Thu Apr 7 17:17:47 2005
@@ -21,10 +21,7 @@
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
NO_CDROM= "See the License"
-
-# Linux binary should not be stripped by INSTALL_PROGRAM as it uses
-# /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
-STRIP=
+USE_LINUX= yes
.include <bsd.port.pre.mk>
@@ -69,7 +66,7 @@
.endfor
.for i in ${PROGRAM}
${INSTALL_PROGRAM} ${WRKSRC}/bin/${i} ${PREFIX}/bin
- /usr/bin/brandelf -t Linux ${PREFIX}/bin/${i}
+ ${BRANDELF} -t Linux ${PREFIX}/bin/${i}
.endfor
post-install:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-gdk-pixbuf/Makefile devel_ports/graphics/linux-gdk-pixbuf/Makefile
--- ports/graphics/linux-gdk-pixbuf/Makefile Mon Apr 11 10:02:39 2005
+++ devel_ports/graphics/linux-gdk-pixbuf/Makefile Mon Apr 11 14:20:03 2005
@@ -24,11 +24,10 @@
CONFLICTS= linux-gtk2*
USE_LINUX_PREFIX=yes
-USE_LINUX?= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
DIST_SUBDIR= rpm
NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/}
# Set the version of Fedora Core
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-libmng/Makefile devel_ports/graphics/linux-libmng/Makefile
--- ports/graphics/linux-libmng/Makefile Mon Apr 11 10:02:40 2005
+++ devel_ports/graphics/linux-libmng/Makefile Mon Apr 11 14:24:33 2005
@@ -22,13 +22,12 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
BASEVERSION= 8.0
-USE_LINUX_RPM= yes
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
ONLY_FOR_ARCHS= i386
DIST_SUBDIR= rpm
-NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
+NO_BUILD= yes
PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-panorama-tools/Makefile devel_ports/graphics/linux-panorama-tools/Makefile
--- ports/graphics/linux-panorama-tools/Makefile Sat Mar 26 21:02:26 2005
+++ devel_ports/graphics/linux-panorama-tools/Makefile Thu Apr 7 15:53:28 2005
@@ -29,6 +29,7 @@
BROKEN= Broken dependency
NO_BUILD= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/PTLinux
PROGRAM= Helpers/PTStitcher
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux-sdl_image/Makefile devel_ports/graphics/linux-sdl_image/Makefile
--- ports/graphics/linux-sdl_image/Makefile Mon Apr 11 10:02:42 2005
+++ devel_ports/graphics/linux-sdl_image/Makefile Mon Apr 11 14:20:03 2005
@@ -21,13 +21,13 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
ONLY_FOR_ARCHS= i386
DIST_SUBDIR= rpm
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
DBPATH= /var/lib/rpm
RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux_dri/Makefile devel_ports/graphics/linux_dri/Makefile
--- ports/graphics/linux_dri/Makefile Tue Mar 1 22:51:36 2005
+++ devel_ports/graphics/linux_dri/Makefile Thu Apr 7 17:19:22 2005
@@ -20,19 +20,17 @@
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Binary Linux DRI libraries for 3D hardware acceleration of linux apps
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
-
WRKSRC= ${WRKDIR}/lib
NO_BUILD= yes
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
+USE_XLIB= yes
ONLY_FOR_ARCHS= i386
MODULELIST= gamma_dri.so i810_dri.so i830_dri.so mga_dri.so r128_dri.so \
r200_dri.so radeon_dri.so tdfx_dri.so
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
-NO_FILTER_SHLIBS= yes
-STRIP=
do-install:
${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri
@@ -49,7 +47,9 @@
${LN} -sf libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v5.so
${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/libglut.so.3.7.0 ${PREFIX}/usr/X11R6/lib
${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/gears ${PREFIX}/usr/X11R6/bin
+ ${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/gears
${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/glxinfo ${PREFIX}/usr/X11R6/bin
+ ${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/glxinfo
post-install:
@${LDCONFIG_LINUX} ${PREFIX}/usr/X11R6/lib
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/graphics/linux_glide/Makefile devel_ports/graphics/linux_glide/Makefile
--- ports/graphics/linux_glide/Makefile Tue Mar 1 22:51:36 2005
+++ devel_ports/graphics/linux_glide/Makefile Thu Apr 7 15:52:09 2005
@@ -22,7 +22,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX=yes
-USE_LINUX?= yes
+USE_LINUX= yes
NO_MTREE= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/Glide2.4
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/japanese/slimeforest/Makefile devel_ports/japanese/slimeforest/Makefile
--- ports/japanese/slimeforest/Makefile Thu Mar 3 08:59:29 2005
+++ devel_ports/japanese/slimeforest/Makefile Thu Apr 7 15:53:59 2005
@@ -18,6 +18,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0:${PORTSDIR}/graphics/linux-sdl_image
NO_BUILD= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/slimeforest
FIND_DIRS= -type d \! -empty
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-blackdown-jdk12/Makefile devel_ports/java/linux-blackdown-jdk12/Makefile
--- ports/java/linux-blackdown-jdk12/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-blackdown-jdk12/Makefile Thu Apr 7 15:54:21 2005
@@ -28,6 +28,7 @@
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= YES
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
NO_BUILD= YES
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-blackdown-jdk13/Makefile devel_ports/java/linux-blackdown-jdk13/Makefile
--- ports/java/linux-blackdown-jdk13/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-blackdown-jdk13/Makefile Thu Apr 7 15:54:51 2005
@@ -28,6 +28,7 @@
PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
NO_BUILD= yes
+USE_LINUX= yes
LATEST_LINK= linux-blackdown-jdk13
ONLY_FOR_ARCHS= i386 amd64
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-blackdown-jdk14/Makefile devel_ports/java/linux-blackdown-jdk14/Makefile
--- ports/java/linux-blackdown-jdk14/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-blackdown-jdk14/Makefile Thu Apr 7 15:55:13 2005
@@ -25,6 +25,7 @@
EXTRACT_BEFORE_ARGS= +564
EXTRACT_AFTER_ARGS= | ${BZIP2_CMD} -dc | ${TAR} xf -
USE_BZIP2= yes
+USE_LINUX= yes
LATEST_LINK= linux-blackdown-jdk14
WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-blackdown-jre11/Makefile devel_ports/java/linux-blackdown-jre11/Makefile
--- ports/java/linux-blackdown-jre11/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-blackdown-jre11/Makefile Thu Apr 7 15:56:42 2005
@@ -29,6 +29,7 @@
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= YES
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/jre118_v3
JRE_VERSION= 1.1.8
PLIST_SUB+= JRE_VERSION=${JRE_VERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-ibm-jdk13/Makefile devel_ports/java/linux-ibm-jdk13/Makefile
--- ports/java/linux-ibm-jdk13/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-ibm-jdk13/Makefile Thu Apr 7 17:20:49 2005
@@ -26,6 +26,7 @@
PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
NO_BUILD= yes
+USE_LINUX= yes
JDK_VERSION= 1.3.1
LATEST_LINK= linux-ibm-jdk13
ONLY_FOR_ARCHS= i386 amd64
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-ibm-jdk14/Makefile devel_ports/java/linux-ibm-jdk14/Makefile
--- ports/java/linux-ibm-jdk14/Makefile Tue Mar 1 22:51:37 2005
+++ devel_ports/java/linux-ibm-jdk14/Makefile Thu Apr 7 15:55:52 2005
@@ -28,6 +28,7 @@
NO_BUILD= yes
USE_REINPLACE= yes
+USE_LINUX= yes
JDK_VERSION= 1.4.2
ONLY_FOR_ARCHS= i386 amd64
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-sun-jdk12/Makefile devel_ports/java/linux-sun-jdk12/Makefile
--- ports/java/linux-sun-jdk12/Makefile Tue Mar 1 22:51:38 2005
+++ devel_ports/java/linux-sun-jdk12/Makefile Thu Apr 7 15:56:04 2005
@@ -24,6 +24,7 @@
LATEST_LINK= linux-sun-jdk12
NO_BUILD= yes
+USE_LINUX= yes
JDK_VERSION= 1.2.2.017
ONLY_FOR_ARCHS= i386 amd64
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-sun-jdk13/Makefile devel_ports/java/linux-sun-jdk13/Makefile
--- ports/java/linux-sun-jdk13/Makefile Tue Mar 1 22:51:38 2005
+++ devel_ports/java/linux-sun-jdk13/Makefile Thu Apr 7 15:56:14 2005
@@ -30,6 +30,7 @@
JDK_VERSION=${JDK_VERSION}
NO_BUILD= yes
+USE_LINUX= yes
JDK_VERSION= 1.3.1
JDK_REVISION= 14
ONLY_FOR_ARCHS= i386 amd64
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-sun-jdk14/Makefile devel_ports/java/linux-sun-jdk14/Makefile
--- ports/java/linux-sun-jdk14/Makefile Tue Mar 1 22:51:38 2005
+++ devel_ports/java/linux-sun-jdk14/Makefile Thu Apr 7 15:56:30 2005
@@ -30,6 +30,7 @@
PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
+USE_LINUX= yes
JDK_VERSION= 1.4.2
JDK_REVISION= 07
DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/java/linux-sun-jdk15/Makefile devel_ports/java/linux-sun-jdk15/Makefile
--- ports/java/linux-sun-jdk15/Makefile Mon Apr 4 21:55:10 2005
+++ devel_ports/java/linux-sun-jdk15/Makefile Thu Apr 7 15:56:53 2005
@@ -30,6 +30,7 @@
PKGINSTALL= ${WRKDIR}/pkg-install
NO_BUILD= yes
+USE_LINUX= yes
JDK_VERSION= 1.5.0
JDK_REVISION= 02
DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/korean/linux_locale/Makefile devel_ports/korean/linux_locale/Makefile
--- ports/korean/linux_locale/Makefile Tue Mar 1 22:51:38 2005
+++ devel_ports/korean/linux_locale/Makefile Thu Apr 7 17:21:16 2005
@@ -19,13 +19,11 @@
ONLY_FOR_ARCHS= i386
+USE_LINUX= 8 # BUILD_DEPENDS is hardcoded, so we hardcode here too
USE_LINUX_PREFIX=yes
-USE_LINUX?= yes
-NO_MTREE= yes
NO_BUILD= yes
EXTRACT_ONLY= # empty
NO_WRKSUBDIR= yes
-NO_FILTER_SHLIBS= yes
do-install:
@zcat ${DISTDIR}/${DISTNAME}.tar.gz |(cd ${PREFIX}; ${PAX} -r)
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/compaq-cc/Makefile devel_ports/lang/compaq-cc/Makefile
--- ports/lang/compaq-cc/Makefile Tue Mar 1 22:51:39 2005
+++ devel_ports/lang/compaq-cc/Makefile Thu Apr 7 17:21:30 2005
@@ -40,9 +40,7 @@
EXTRACT_ONLY=
NO_WRKSUBDIR= yes
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
-NO_MTREE= yes
-USE_LINUX?= yes
+USE_LINUX= 7
.include <bsd.port.pre.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/freetxl/Makefile devel_ports/lang/freetxl/Makefile
--- ports/lang/freetxl/Makefile Tue Mar 1 22:51:39 2005
+++ devel_ports/lang/freetxl/Makefile Thu Apr 7 17:27:02 2005
@@ -14,14 +14,18 @@
MAINTAINER= ryan@sasknow.com
COMMENT= The TXL Programming Language (transformation by example)
-USE_LINUX?= yes
-STRIP=
-NO_BUILD= yes
+USE_LINUX= yes
MAN1= txl.1 txlc.1 txldb.1 txlp.1
PORTDOCS= 00README.txt COPYRIGHT.txt Documents.html Examples.html \
FILES.txt Learning.html Support.html
+
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/bin/txl \
+ ${WRKSRC}/bin/txlc \
+ ${WRKSRC}/bin/txldb \
+ ${WRKSRC}/bin/txlp
do-install:
${INSTALL_PROGRAM} \
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/icc/Makefile devel_ports/lang/icc/Makefile
--- ports/lang/icc/Makefile Sun Mar 6 16:08:25 2005
+++ devel_ports/lang/icc/Makefile Thu Apr 7 17:24:41 2005
@@ -18,7 +18,7 @@
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
.if ${PORTVERSION} != ${PATCHLEVEL}
DISTFILES+= ${DISTNAME}_${PATCHLEVEL}${EXTRACT_SUFX}
-PATCH_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
+PATCH_DEPENDS= ${DEFAULT_LINUX_BASE}
.endif
EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
@@ -30,9 +30,8 @@
ONLY_FOR_ARCHS= i386
CONFLICTS= linux_devtools*
-USE_LINUX?= yes
+USE_LINUX= yes
USE_REINPLACE= yes
-NO_FILTER_SHLIBS= yes
COMPILERDIR= intel_cc_80
PLIST_SUB= COMPILERDIR=${COMPILERDIR}
@@ -219,7 +218,8 @@
@${CC} ${CFLAGS} -o \
${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld \
${FILESDIR}/ld.c
- @${STRIP_CMD} ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
+# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one.
+ @/usr/bin/strip ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
@${CHMOD} 755 ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
# Make ICC happy with regards to crtbegin.o, crtend.o and libgcc.a which it
# expects to find in GXX_ROOT.
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/icc7/Makefile devel_ports/lang/icc7/Makefile
--- ports/lang/icc7/Makefile Tue Mar 1 22:51:39 2005
+++ devel_ports/lang/icc7/Makefile Thu Apr 7 17:28:08 2005
@@ -25,10 +25,9 @@
ONLY_FOR_ARCHS= i386
CONFLICTS= linux_devtools* ifc*
-USE_LINUX?= yes
+USE_LINUX= yes
USE_REINPLACE= yes
NO_WRKSUBDIR= yes
-NO_FILTER_SHLIBS= yes
COMPILERDIR= compiler70
PLIST_SUB= COMPILERDIR=${COMPILERDIR}
@@ -160,7 +159,8 @@
@${CC} ${CFLAGS} -o \
${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld \
${FILESDIR}/ld.c
- @${STRIP_CMD} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
+# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one.
+ @/usr/bin/strip ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
do-install:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/ifc/Makefile devel_ports/lang/ifc/Makefile
--- ports/lang/ifc/Makefile Tue Mar 1 22:51:39 2005
+++ devel_ports/lang/ifc/Makefile Thu Apr 7 17:25:53 2005
@@ -18,8 +18,7 @@
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
.if ${PORTVERSION} != ${PATCHLEVEL}
DISTFILES+= ${DISTNAME}_${PATCHLEVEL}${EXTRACT_SUFX}
-#PATCH_DEPENDS= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
-PATCH_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
+PATCH_DEPENDS= ${DEFAULT_LINUX_BASE}
.endif
EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
@@ -31,7 +30,7 @@
ONLY_FOR_ARCHS= i386
CONFLICTS= linux_devtools*
-USE_LINUX?= yes
+USE_LINUX= yes
USE_REINPLACE= yes
NO_FILTER_SHLIBS= yes
@@ -192,7 +191,8 @@
@${CC} ${CFLAGS} -o \
${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld \
${FILESDIR}/ld.c
- @${STRIP_CMD} ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
+# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one.
+ @/usr/bin/strip ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
@${CHMOD} 755 ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
do-install:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/ifc7/Makefile devel_ports/lang/ifc7/Makefile
--- ports/lang/ifc7/Makefile Tue Mar 1 22:51:39 2005
+++ devel_ports/lang/ifc7/Makefile Thu Apr 7 17:28:52 2005
@@ -24,10 +24,9 @@
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
USE_REINPLACE= yes
NO_WRKSUBDIR= yes
-NO_FILTER_SHLIBS= yes
COMPILERDIR= compiler70
PLIST_SUB= COMPILERDIR=${COMPILERDIR}
@@ -158,7 +157,8 @@
@${CC} ${CFLAGS} -o \
${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld \
${FILESDIR}/ld.c
- @${STRIP_CMD} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
+# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one.
+ @/usr/bin/strip ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld
do-install:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/linux-j/Makefile devel_ports/lang/linux-j/Makefile
--- ports/lang/linux-j/Makefile Fri Apr 8 20:50:42 2005
+++ devel_ports/lang/linux-j/Makefile Sun Apr 10 15:34:54 2005
@@ -18,7 +18,7 @@
BROKEN= Unfetchable
-USE_LINUX?= yes
+USE_LINUX= yes
USE_JAVA= 1.3+
ONLY_FOR_ARCHS= i386
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/lang/visualworks/Makefile devel_ports/lang/visualworks/Makefile
--- ports/lang/visualworks/Makefile Tue Mar 1 22:51:40 2005
+++ devel_ports/lang/visualworks/Makefile Thu Apr 7 15:59:53 2005
@@ -18,7 +18,7 @@
MAINTAINER= chris@chrisburkert.de
COMMENT= A high performance Smalltalk environment
-USE_LINUX?= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
PLIST_FILES= bin/visual
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/mail/mulberry/Makefile devel_ports/mail/mulberry/Makefile
--- ports/mail/mulberry/Makefile Tue Mar 1 22:51:40 2005
+++ devel_ports/mail/mulberry/Makefile Thu Apr 7 16:00:28 2005
@@ -22,6 +22,7 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
.include <bsd.port.pre.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/math/linux-dislin/Makefile devel_ports/math/linux-dislin/Makefile
--- ports/math/linux-dislin/Makefile Mon Apr 11 10:03:18 2005
+++ devel_ports/math/linux-dislin/Makefile Mon Apr 11 14:20:07 2005
@@ -17,13 +17,12 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific data plotting package
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
BROKEN= Unfetchable
ONLY_FOR_ARCHS= i386 alpha
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_BUILD= yes
-INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${DISLIN_DIR}/lib
MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
@@ -38,6 +37,8 @@
<${FILESDIR}/dislin-wrapper.sh >${WRKDIR}/dislin.sh
${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \
<${FILESDIR}/pkg-message >${WRKDIR}/pkg-message
+
+# XXX: this is missing "${BRANDELF} -t Linux <executable>"
do-install:
(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/math/linux-relview/Makefile devel_ports/math/linux-relview/Makefile
--- ports/math/linux-relview/Makefile Tue Mar 1 22:51:40 2005
+++ devel_ports/math/linux-relview/Makefile Thu Apr 7 17:29:21 2005
@@ -19,6 +19,8 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
EXTRACT_AFTER_ARGS= > ${DISTNAME}
@@ -26,10 +28,6 @@
NO_BUILD= yes
PLIST_SUB= VERSION=${PORTVERSION}
-
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP= # empty
do-install:
${BRANDELF} -t Linux ${WRKDIR}/${DISTNAME}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/math/mupad/Makefile devel_ports/math/mupad/Makefile
--- ports/math/mupad/Makefile Sat Mar 19 16:19:58 2005
+++ devel_ports/math/mupad/Makefile Thu Apr 7 17:30:49 2005
@@ -20,11 +20,9 @@
NO_CDROM= "unsure to sell for profit"
-USE_LINUX?= yes
+USE_LINUX= yes
ONLY_FOR_ARCHS= i386
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
NO_WRKSUBDIR= yes
MAN1= mmg.1 mmgd.1 mupad.1 xmupad.1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/math/wingz/Makefile devel_ports/math/wingz/Makefile
--- ports/math/wingz/Makefile Tue Mar 1 22:51:41 2005
+++ devel_ports/math/wingz/Makefile Thu Apr 7 17:31:52 2005
@@ -16,12 +16,13 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A Commercial Spreadsheet
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
+
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/math/wingz3/Makefile devel_ports/math/wingz3/Makefile
--- ports/math/wingz3/Makefile Tue Mar 1 22:51:41 2005
+++ devel_ports/math/wingz3/Makefile Thu Apr 7 17:32:55 2005
@@ -15,13 +15,12 @@
MAINTAINER= mi@aldan.algebra.com
COMMENT= A Commercial Spreadsheet
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
NO_PACKAGE= "nothing to build. commercial software"
ONLY_FOR_ARCHS= i386
-
+USE_LINUX= yes
USE_X_PREFIX= yes
+
NO_BUILD= yes
do-fetch:
@@ -32,6 +31,8 @@
# http://www.wingz-us.com/iisg_main/downloads.html
# download the ${DISTFILES} and save it to ${DISTDIR}.
#
+
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
do-install:
${TAR} -xzp -C ${X11BASE} -f ${DISTDIR}/${DISTFILES}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/misc/ftree/Makefile devel_ports/misc/ftree/Makefile
--- ports/misc/ftree/Makefile Tue Mar 1 22:51:41 2005
+++ devel_ports/misc/ftree/Makefile Thu Apr 7 17:35:18 2005
@@ -17,23 +17,18 @@
MAINTAINER= user@unknown.nu
COMMENT= An X11 genealogy program
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
-USE_X_PREFIX= yes
-
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_CDROM= Non-commercial use only
RESTRICTED= Non-commercial use only
WRKSRC= ${WRKDIR}/usr
MAN1= ftree.1
-STRIP= # empty: do not strip linux binary!
-
-do-patch:
-do-configure:
do-build:
${BRANDELF} -t Linux ${WRKSRC}/bin/ftree
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/ftree ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/share/man/man1/ftree.1 ${PREFIX}/man/man1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/misc/linux-edonkey-tool-list/Makefile devel_ports/misc/linux-edonkey-tool-list/Makefile
--- ports/misc/linux-edonkey-tool-list/Makefile Sun Mar 13 02:18:38 2005
+++ devel_ports/misc/linux-edonkey-tool-list/Makefile Thu Apr 7 17:35:40 2005
@@ -20,19 +20,10 @@
COMMENT= Creates a web page with ed2k:// links to all your shared files
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
PLIST_FILES= bin/edonkey-tool-list
-STRIP=
-
-STRIP_CMD= ${LINUXBASE}/usr/bin/strip
-
-.if exists(/usr/bin/brandelf)
-BRANDELF?= /usr/bin/brandelf
-.else
-BRANDELF?= brandelf
-.endif
BINARY_NAME= ${PORTNAME}${PKGNAMESUFFIX}
@@ -45,9 +36,7 @@
.include <bsd.port.pre.mk>
pre-install:
-.if exists(${STRIP_CMD})
@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
.include <bsd.port.post.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/misc/linux-edonkey-tool-recovermet/Makefile devel_ports/misc/linux-edonkey-tool-recovermet/Makefile
--- ports/misc/linux-edonkey-tool-recovermet/Makefile Sun Mar 13 02:18:38 2005
+++ devel_ports/misc/linux-edonkey-tool-recovermet/Makefile Thu Apr 7 17:35:55 2005
@@ -20,19 +20,10 @@
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 -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/misc/linux-opengroupware/Makefile devel_ports/misc/linux-opengroupware/Makefile
--- ports/misc/linux-opengroupware/Makefile Mon Apr 11 10:03:23 2005
+++ devel_ports/misc/linux-opengroupware/Makefile Mon Apr 11 14:20:07 2005
@@ -22,7 +22,7 @@
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 \
+RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \
${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake
@@ -105,7 +105,7 @@
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 -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/misc/opencyc/Makefile devel_ports/misc/opencyc/Makefile
--- ports/misc/opencyc/Makefile Tue Mar 1 22:51:42 2005
+++ devel_ports/misc/opencyc/Makefile Thu Apr 7 16:02:37 2005
@@ -19,6 +19,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
NO_BUILD= yes
+USE_LINUX= yes
PLIST_SUB= PORTVERSION="${PORTVERSION}"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/linux-divx4linux/Makefile devel_ports/multimedia/linux-divx4linux/Makefile
--- ports/multimedia/linux-divx4linux/Makefile Tue Mar 1 22:51:42 2005
+++ devel_ports/multimedia/linux-divx4linux/Makefile Thu Apr 7 16:03:24 2005
@@ -21,7 +21,7 @@
ONLY_FOR_ARCHS= i386
USE_REINPLACE= yes
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${RELEASE_DATE}
NO_BUILD= yes
PLIST_SUB= PKGNAME="${PKGNAME}"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/linux-divx4linux4/Makefile devel_ports/multimedia/linux-divx4linux4/Makefile
--- ports/multimedia/linux-divx4linux4/Makefile Tue Mar 1 22:51:42 2005
+++ devel_ports/multimedia/linux-divx4linux4/Makefile Thu Apr 7 16:03:30 2005
@@ -21,7 +21,7 @@
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
+USE_LINUX= yes
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:C/_.+$//}
NO_BUILD= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/linux-realplayer/Makefile devel_ports/multimedia/linux-realplayer/Makefile
--- ports/multimedia/linux-realplayer/Makefile Sun Mar 20 23:18:14 2005
+++ devel_ports/multimedia/linux-realplayer/Makefile Thu Apr 7 17:37:03 2005
@@ -21,12 +21,9 @@
WRKSRC= ${WRKDIR}/usr/local/RealPlayer
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
RESTRICTED= "Redistribution not allowed"
NO_BUILD= yes
-
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
RADIR= ${PREFIX}/lib/RealPlayer
PLUGINSDIR= ${PREFIX}/lib/linux-mozilla/plugins
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/linux-xmovie/Makefile devel_ports/multimedia/linux-xmovie/Makefile
--- ports/multimedia/linux-xmovie/Makefile Tue Mar 1 22:51:43 2005
+++ devel_ports/multimedia/linux-xmovie/Makefile Thu Apr 7 17:37:25 2005
@@ -19,22 +19,16 @@
COMMENT= A movie player for AVI, MPEG-2/4 and MOV movies
EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
EXTRACT_CMD= rpm2cpio
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet
NO_BUILD= yes
PLIST_FILES= bin/xmovie
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/usr/bin
-
-BRANDELF?= /usr/bin/brandelf
-
-# Linux binary should not be stripped by INSTALL_PROGRAM as it uses
-# /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
-STRIP=
pre-install:
@${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/mtv/Makefile devel_ports/multimedia/mtv/Makefile
--- ports/multimedia/mtv/Makefile Tue Mar 1 22:51:43 2005
+++ devel_ports/multimedia/mtv/Makefile Thu Apr 7 17:39:04 2005
@@ -15,18 +15,19 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= High-performance MPEG video player (shareware)
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
-
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
NO_PACKAGE= "No redistribution"
NO_CDROM= "No redistribution"
-NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mtv
MAN1= mtv.1
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/mtv ${WRKSRC}/mtvp
+
do-install:
@${MKDIR} ${WRKDIR}/libSDLx11
@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libSDLx11.so.tar.gz \
@@ -34,8 +35,8 @@
${INSTALL_DATA} ${WRKDIR}/libSDLx11/libSDLx11.so.0.9.9 \
${LINUXBASE}/usr/X11R6/lib
${LINUXBASE}/sbin/ldconfig
- ${INSTALL_SCRIPT} ${WRKSRC}/mtv ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/mtvp ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/mtv ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/mtvp ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/mtv.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/mtv
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/multimedia/netshow/Makefile devel_ports/multimedia/netshow/Makefile
--- ports/multimedia/netshow/Makefile Thu Mar 17 17:42:30 2005
+++ devel_ports/multimedia/netshow/Makefile Thu Apr 7 17:39:48 2005
@@ -16,16 +16,13 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Microsoft NetShow video stream player
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
RESTRICTED= "Commercial software"
BROKEN= Unfetchable
ONLY_FOR_ARCHS= i386
-PLIST_FILES= bin/netshow
-
-NO_BUILD= yes
+USE_LINUX= yes
USE_X_PREFIX= yes
+PLIST_FILES= bin/netshow
pre-extract:
@${MKDIR} ${WRKDIR}
@@ -33,8 +30,8 @@
do-extract:
${GUNZIP_CMD} < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/netshow
-do-patch:
- brandelf -t Linux ${WRKDIR}/netshow
+do-build:
+ ${BRANDELF} -t Linux ${WRKDIR}/netshow
do-install:
${INSTALL} -c -o bin -g bin -m 555 ${WRKDIR}/netshow ${PREFIX}/bin/netshow
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/aim/Makefile devel_ports/net/aim/Makefile
--- ports/net/aim/Makefile Tue Mar 1 22:51:43 2005
+++ devel_ports/net/aim/Makefile Thu Apr 7 17:41:08 2005
@@ -19,15 +19,14 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
-PREFIX?= ${X11BASE}
-INSTALLS_SHLIB= yes
-# must not strip
-STRIP=
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/aim ${PREFIX}/libexec
+ ${BRANDELF} -t Linux ${PREFIX}/libexec
(cd ${WRKSRC}/usr/lib;exec ${TAR} --exclude aim/source -cf - *)|(cd ${PREFIX}/lib;exec ${TAR} -xpf -)
@${ECHO_CMD} "#!/bin/sh" >${PREFIX}/bin/aim
@${ECHO_CMD} "ulimit -Sc 0" >>${PREFIX}/bin/aim
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/citrix_ica/Makefile devel_ports/net/citrix_ica/Makefile
--- ports/net/citrix_ica/Makefile Tue Mar 1 22:51:43 2005
+++ devel_ports/net/citrix_ica/Makefile Thu Apr 7 16:05:20 2005
@@ -18,6 +18,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
RESTRICTED= "License prohibits redistribution"
IS_INTERACTIVE= "Noisy license agreement ignores stdin"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-agsatellite/Makefile devel_ports/net/linux-agsatellite/Makefile
--- ports/net/linux-agsatellite/Makefile Thu Mar 10 23:10:02 2005
+++ devel_ports/net/linux-agsatellite/Makefile Thu Apr 7 17:41:32 2005
@@ -16,18 +16,15 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Client that allows you to share your music on Audiogalaxy(TM)
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//}
NO_BUILD= yes
USE_REINPLACE= yes
-STRIP=
+USE_LINUX= yes
+USE_X_PREFIX= yes
RESTRICTED= no response from developer on licensing issues
DOCS= german_readme.txt license.txt readme.txt
-
-BRANDELF= /usr/bin/brandelf
post-patch:
@${REINPLACE_CMD} -e "s|
||;s|email|username|" ${WRKSRC}/*.txt
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-edonkey-core/Makefile devel_ports/net/linux-edonkey-core/Makefile
--- ports/net/linux-edonkey-core/Makefile Sun Mar 13 02:21:03 2005
+++ devel_ports/net/linux-edonkey-core/Makefile Thu Apr 7 17:41:53 2005
@@ -19,18 +19,9 @@
COMMENT= eDonkey2000 'core' command line client
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
-STRIP=
-
-STRIP_CMD= ${LINUXBASE}/usr/bin/strip
-
-.if exists(/usr/bin/brandelf)
-BRANDELF?= /usr/bin/brandelf
-.else
-BRANDELF?= brandelf
-.endif
BINARY_NAME_OLD?= donkey${PORTVERSION}
BINARY_NAME= donkey
@@ -51,9 +42,7 @@
.include <bsd.port.pre.mk>
pre-install:
-.if exists(${STRIP_CMD})
@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD}
-.endif
@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD}
.include <bsd.port.post.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-edonkey-server/Makefile devel_ports/net/linux-edonkey-server/Makefile
--- ports/net/linux-edonkey-server/Makefile Mon Apr 4 01:23:03 2005
+++ devel_ports/net/linux-edonkey-server/Makefile Thu Apr 7 17:42:39 2005
@@ -20,21 +20,12 @@
COMMENT= A decentralized peer-to-peer file-sharing server (eDonkey2000 server)
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
-STRIP=
#
PKGDEINSTALL= ${PKGINSTALL}
-STRIP_CMD= ${LINUXBASE}/usr/bin/strip
-
-.if exists(/usr/bin/brandelf)
-BRANDELF?= /usr/bin/brandelf
-.else
-BRANDELF?= brandelf
-.endif
-
BINARY_NAME= dserver
RC_SAMPLE= edonkey2000-server.sh.sample
@@ -57,9 +48,7 @@
.include <bsd.port.pre.mk>
pre-install:
-.if exists(${STRIP_CMD})
@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
.include <bsd.port.post.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-jigdo/Makefile devel_ports/net/linux-jigdo/Makefile
--- ports/net/linux-jigdo/Makefile Tue Mar 1 22:51:44 2005
+++ devel_ports/net/linux-jigdo/Makefile Thu Apr 7 17:43:04 2005
@@ -21,9 +21,8 @@
ONLY_FOR_ARCHS= i386
USE_BZIP2= YES
-USE_LINUX?= yes
+USE_LINUX= yes
NO_BUILD= yes
-STRIP=
PROGRAMS= jigdo-file
SCRIPTS= jigdo-lite jigdo-mirror
@@ -31,7 +30,7 @@
MAN1= jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
pre-install:
- @brandelf -t Linux ${WRKSRC}/jigdo-file
+ @${BRANDELF} -t Linux ${WRKSRC}/jigdo-file
do-install:
.for i in ${PROGRAMS}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-nx-client/Makefile devel_ports/net/linux-nx-client/Makefile
--- ports/net/linux-nx-client/Makefile Tue Mar 1 22:51:44 2005
+++ devel_ports/net/linux-nx-client/Makefile Thu Apr 7 17:45:23 2005
@@ -17,18 +17,15 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_BUILD= yes
NXSRC= ${WRKSRC}/NX
NXDST= ${PREFIX}/lib/linux-nx-client
ICONS3232= nx.png nxclient-admin.png nxclient-wizard.png
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=
-
PLIST_SUB+= PORTVERSION=${PORTVERSION}
post-extract:
@@ -67,6 +64,7 @@
${ECHO_CMD} "export NXDIR=${NXDST}" >> ${WRKSRC}/${f}
${ECHO_CMD} "exec \$$NXDIR/bin/${f} \"\$$@\"" >> ${WRKSRC}/${f}
${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
+ ${BRANDELF} -t Linux ${NXDST}/bin/${f}
.endfor
.include <bsd.port.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/linux-overnet-core/Makefile devel_ports/net/linux-overnet-core/Makefile
--- ports/net/linux-overnet-core/Makefile Tue Mar 1 22:51:45 2005
+++ devel_ports/net/linux-overnet-core/Makefile Thu Apr 7 17:45:36 2005
@@ -18,10 +18,9 @@
COMMENT= Overnet 'core' command line client
ONLY_FOR_ARCHS= i386
-USE_LINUX?= yes
+USE_LINUX= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
-STRIP=
BINARY_NAME_OLD?= ${PORTNAME}clc
TARGET_DIR= ${PORTNAME}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/peercast/Makefile devel_ports/net/peercast/Makefile
--- ports/net/peercast/Makefile Tue Mar 1 22:51:45 2005
+++ devel_ports/net/peercast/Makefile Thu Apr 7 16:07:45 2005
@@ -15,7 +15,7 @@
MAINTAINER= jylefort@brutele.be
COMMENT= A peer-to-peer network for broadcasting and listening to streams
-USE_LINUX?= yes
+USE_LINUX= yes
NO_WRKSUBDIR= yes
do-build:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/net/skype/Makefile devel_ports/net/skype/Makefile
--- ports/net/skype/Makefile Sun Mar 6 14:33:41 2005
+++ devel_ports/net/skype/Makefile Thu Apr 7 17:43:27 2005
@@ -16,11 +16,11 @@
COMMENT= P2P VoIP software
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
- ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
USE_BZIP2= yes
-PREFIX?= ${X11BASE}
+USE_LINUX= yes
+USE_X_PREFIX= yes
WANT_GNOME= yes
ONLY_FOR_ARCHS= i386
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/portuguese/staroffice52/Makefile devel_ports/portuguese/staroffice52/Makefile
--- ports/portuguese/staroffice52/Makefile Tue Mar 1 22:51:45 2005
+++ devel_ports/portuguese/staroffice52/Makefile Thu Apr 7 16:07:57 2005
@@ -31,6 +31,7 @@
FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
NO_CDROM= 'Deve ser obtido diretamente do site da Sun via interface www'
CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/print/acroread/Makefile devel_ports/print/acroread/Makefile
--- ports/print/acroread/Makefile Sun Mar 20 09:33:43 2005
+++ devel_ports/print/acroread/Makefile Thu Apr 7 17:46:45 2005
@@ -20,15 +20,14 @@
MAINTAINER= trevor@FreeBSD.org
COMMENT= View, distribute and print PDF documents
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
-
CONFLICTS= acroread7
ONLY_FOR_ARCHS= amd64 i386
USE_REINPLACE= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_BUILD= yes
REINPLACE_ARGS= -i '' -E
-NO_FILTER_SHLIBS= yes
PLIST_SUB= "ARCHDIR=intellinux"
WRKSRC= ${WRKDIR}/installers
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/print/bjfiltercom/Makefile devel_ports/print/bjfiltercom/Makefile
--- ports/print/bjfiltercom/Makefile Tue Mar 1 22:51:45 2005
+++ devel_ports/print/bjfiltercom/Makefile Thu Apr 7 17:49:24 2005
@@ -43,7 +43,7 @@
DESCR= ${.CURDIR}/pkg-descr
MD5_FILE= ${.CURDIR}/distinfo
ONLY_FOR_ARCHS= i386
-NO_FILTER_SHLIBS= yes
+USE_LINUX= yes
NO_MTREE= yes
RPMREVISION= 1
.if defined(SLAVE_PORT)
@@ -75,6 +75,8 @@
-e 's,%%PRMODEL%%,${PRMODEL},g' \
-e 's,%%PREFIX%%,${PREFIX},g' \
${FILESDIR}/setup > ${WRKDIR}/setup.freebsd
+
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
do-install:
${MKDIR} ${LINUXBASE}/usr/lib/bjlib
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/sysutils/linux-acu/Makefile devel_ports/sysutils/linux-acu/Makefile
--- ports/sysutils/linux-acu/Makefile Tue Mar 1 22:51:46 2005
+++ devel_ports/sysutils/linux-acu/Makefile Thu Apr 7 17:50:42 2005
@@ -30,9 +30,9 @@
.endif
ONLY_FOR_ARCHS= i386
-PREFIX?= ${X11BASE}
+USE_LINUX= yes
+USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
-NO_BUILD= yes
NO_CDROM= "Redistribution not allowed"
LINPROCFS!= /sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}'
@@ -54,6 +54,9 @@
@${ECHO} "becauce acu needs to read ${LINUXBASE}/proc/aironet"
@${FALSE}
.endif
+
+do-build:
+ @${BRANDELF} -t Linux ${WRKSRC}/utilities/acu
do-install:
@${MKDIR} ${PREFIX}/bin
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/sysutils/linux-afaapps/Makefile devel_ports/sysutils/linux-afaapps/Makefile
--- ports/sysutils/linux-afaapps/Makefile Mon Apr 11 10:04:03 2005
+++ devel_ports/sysutils/linux-afaapps/Makefile Mon Apr 11 14:25:11 2005
@@ -26,12 +26,11 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_LINUX_PREFIX= yes
-NO_MTREE= yes
+USE_LINUX= yes
+USE_LINUX_PREFIX= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
ONLY_FOR_ARCHS= i386
-NO_FILTER_SHLIBS= yes
PLIST= ${MASTERDIR}/pkg-plist.${ARCH}
MD5_FILE= ${MASTERDIR}/distinfo.${ARCH}
@@ -43,8 +42,9 @@
do-install:
@${LOCALBASE}/bin/rpm -U ${RPMFLAGS} ${WRKDIR}/${RPMFILE}
- @${RM} ${LINUXBASE}/usr/sbin/afacli
- @${MV} ${LINUXBASE}/usr/sbin/afacli.bin ${LINUXBASE}/usr/sbin/afacli
+ @${RM} ${PREFIX}/usr/sbin/afacli
+ @${MV} ${PREFIX}/usr/sbin/afacli.bin ${PREFIX}/usr/sbin/afacli
+ @${BRANDELF} -t Linux ${PREFIX}/usr/sbin/afacli
@${LDCONFIG_LINUX}
.include <bsd.port.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/textproc/linux-aspell/Makefile devel_ports/textproc/linux-aspell/Makefile
--- ports/textproc/linux-aspell/Makefile Tue Mar 1 22:51:46 2005
+++ devel_ports/textproc/linux-aspell/Makefile Thu Apr 7 17:52:30 2005
@@ -27,10 +27,9 @@
NO_BUILD= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
-USE_LINUX?= yes
USE_GMAKE= yes
-NO_FILTER_SHLIBS= yes
LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig
DBPATH= /var/lib/rpm
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/textproc/pocketreader/Makefile devel_ports/textproc/pocketreader/Makefile
--- ports/textproc/pocketreader/Makefile Tue Mar 1 22:51:46 2005
+++ devel_ports/textproc/pocketreader/Makefile Thu Apr 7 16:10:46 2005
@@ -16,14 +16,14 @@
MAINTAINER= simond@irrelevant.org
COMMENT= Siemens PocketReader
-USE_LINUX?= YES
+USE_LINUX= YES
NO_BUILD= YES
PLIST_FILES= bin/pocketreader
WRKSRC= ${WRKDIR}/linux
do-install:
- brandelf -t Linux ${WRKSRC}/installfiles/pocketreader_static
+ ${BRANDELF} -t Linux ${WRKSRC}/installfiles/pocketreader_static
${CP} ${WRKSRC}/installfiles/pocketreader_static ${PREFIX}/bin/pocketreader
.include <bsd.port.mk>
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/aswedit/Makefile devel_ports/www/aswedit/Makefile
--- ports/www/aswedit/Makefile Tue Mar 1 22:51:46 2005
+++ devel_ports/www/aswedit/Makefile Thu Apr 7 16:11:14 2005
@@ -21,6 +21,7 @@
NO_BUILD= yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/asWedit-4.0.1
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-beonex/Makefile devel_ports/www/linux-beonex/Makefile
--- ports/www/linux-beonex/Makefile Tue Mar 1 22:51:46 2005
+++ devel_ports/www/linux-beonex/Makefile Thu Apr 7 17:55:56 2005
@@ -26,14 +26,13 @@
${LINUXBASE}/usr/lib/libpng.so.2.1.0.16:${PORTSDIR}/graphics/linux-png10 \
${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
PATCHFILES= linux-beonex-generated-files-${PORTVERSION}.tar.bz2
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${WRKDIR}/pkg-plist
USE_BZIP2= yes
-PREFIX?= ${X11BASE}
WRKSRC= ${WRKDIR}/beonex-comm
post-extract:
@@ -55,6 +54,9 @@
${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" \
>>${WRKDIR}/linkfarm
.endfor
+
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/lib/linux-beonex/beonex-comm
pre-install:
${ECHO_CMD} bin/linux-beonex > ${PLIST}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-firefox/Makefile devel_ports/www/linux-firefox/Makefile
--- ports/www/linux-firefox/Makefile Fri Mar 11 11:12:08 2005
+++ devel_ports/www/linux-firefox/Makefile Thu Apr 7 18:01:46 2005
@@ -17,16 +17,13 @@
COMMENT= Web browser branched from Mozilla
RUN_DEPENDS?= \
-${LINUXBASE}/usr/lib/libstdc++.so.5:${PORTSDIR}/emulators/linux_base-8 \
${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango\
${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
-${LINUXBASE}${X11BASE}/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
ONLY_FOR_ARCHS=i386
FIREFOX_NAME= ${PKGNAMEPREFIX}${PORTNAME}
DESCR= ${.CURDIR}/pkg-descr
@@ -34,7 +31,6 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${WRKDIR}/pkg-plist
USE_LINUX= yes
-USE_XLIB= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/firefox
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-flashplugin/Makefile devel_ports/www/linux-flashplugin/Makefile
--- ports/www/linux-flashplugin/Makefile Tue Mar 1 22:51:47 2005
+++ devel_ports/www/linux-flashplugin/Makefile Thu Apr 7 16:11:51 2005
@@ -24,6 +24,7 @@
RESTRICTED= "Redistribution not allowed"
NO_BUILD= yes
+USE_LINUX= yes
WRKSRC= ${WRKDIR}/flash_linux
LATEST_LINK= flash5
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-flashplugin6/Makefile devel_ports/www/linux-flashplugin6/Makefile
--- ports/www/linux-flashplugin6/Makefile Tue Mar 1 22:51:47 2005
+++ devel_ports/www/linux-flashplugin6/Makefile Thu Apr 7 16:12:08 2005
@@ -20,6 +20,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
RESTRICTED= "Redistribution not allowed"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-flashplugin7/Makefile devel_ports/www/linux-flashplugin7/Makefile
--- ports/www/linux-flashplugin7/Makefile Tue Mar 1 22:51:47 2005
+++ devel_ports/www/linux-flashplugin7/Makefile Thu Apr 7 16:13:12 2005
@@ -20,6 +20,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
RESTRICTED= "Redistribution not allowed"
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-mozilla/Makefile devel_ports/www/linux-mozilla/Makefile
--- ports/www/linux-mozilla/Makefile Tue Mar 1 22:51:47 2005
+++ devel_ports/www/linux-mozilla/Makefile Thu Apr 7 17:59:32 2005
@@ -20,11 +20,10 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
ONLY_FOR_ARCHS= i386
-PREFIX?= ${X11BASE}
USE_ZIP= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xpi
INSTALL_DIR= ${PREFIX}/lib/linux-mozilla
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -87,6 +86,9 @@
${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" \
>> ${WRKDIR}/linkfarm
.endfor
+
+do-build:
+ ${BRANDELF} -t Linux ${WRKSRC}/bin/mozilla
pre-install:
${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-mozilla-devel/Makefile devel_ports/www/linux-mozilla-devel/Makefile
--- ports/www/linux-mozilla-devel/Makefile Tue Mar 1 22:51:47 2005
+++ devel_ports/www/linux-mozilla-devel/Makefile Thu Apr 7 17:59:58 2005
@@ -22,11 +22,10 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
ONLY_FOR_ARCHS= i386
-PREFIX?= ${X11BASE}
USE_ZIP= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xpi
INSTALL_DIR= linux-mozilla-devel
FULL_INSTALL_DIR= ${PREFIX}/lib/linux-mozilla-devel
@@ -87,6 +86,9 @@
${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" >>${WRKDIR}/linkfarm
${ECHO_CMD} -n "${FIND} ../../linux-beonex/plugins" >>${WRKDIR}/linkfarm
${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" >>${WRKDIR}/linkfarm
+
+do-build:
+ ${BRANDELF} -t ${WRKSRC}/bin/mozilla
pre-install:
${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-mozillafirebird/Makefile devel_ports/www/linux-mozillafirebird/Makefile
--- ports/www/linux-mozillafirebird/Makefile Sat Mar 26 20:37:32 2005
+++ devel_ports/www/linux-mozillafirebird/Makefile Thu Apr 7 18:00:52 2005
@@ -23,14 +23,14 @@
BROKEN= Incorrect pkg-plist
NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
ONLY_FOR_ARCHS= i386
+USE_LINUX= yes
+USE_X_PREFIX= yes
FIREBIRD_NAME= ${PKGNAMEPREFIX}${PORTNAME}
DESCR= ${.CURDIR}/pkg-descr
MD5_FILE= ${.CURDIR}/distinfo
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${WRKDIR}/pkg-plist
-PREFIX?= ${X11BASE}
WRKSRC= ${WRKDIR}/MozillaFirebird
do-patch:
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/linux-opera/Makefile devel_ports/www/linux-opera/Makefile
--- ports/www/linux-opera/Makefile Sun Feb 20 23:22:27 2005
+++ devel_ports/www/linux-opera/Makefile Fri Apr 8 10:57:08 2005
@@ -25,21 +25,20 @@
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
+RUN_DEPENDS= \
${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/linux-openmotif
RESTRICTED= "not redistributable; commercial software"
-PREFIX?= ${X11BASE}
USE_BZIP2= yes
WANT_GNOME= yes
-WITH_LINUX= yes
+USE_LINUX= yes
USE_REINPLACE= yes
+USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
-NO_FILTER_SHLIBS=yes
OPERA_VER= 7.54
OPERA_DATE= 20050131
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/www/netscape7/Makefile devel_ports/www/netscape7/Makefile
--- ports/www/netscape7/Makefile Sat Mar 26 21:09:41 2005
+++ devel_ports/www/netscape7/Makefile Thu Apr 7 18:01:21 2005
@@ -28,12 +28,12 @@
MAJ?= netscape7
NETSCAPE_LANG?=english
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
ONLY_FOR_ARCHS= i386
RESTRICTED= "no redistribution"
NO_CDROM= ${RESTRICTED}
-PREFIX?= ${X11BASE}
USE_ZIP= yes
+USE_LINUX= yes
+USE_X_PREFIX= yes
VER?= ${PORTVERSION}
WRKSRC= ${WRKDIR}/netscape-installer/xpi
INSTALL_DIR= lib/linux-${MAJ}-${NETSCAPE_LANG}
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/x11/linux-XFree86-libs/Makefile devel_ports/x11/linux-XFree86-libs/Makefile
--- ports/x11/linux-XFree86-libs/Makefile Tue Mar 1 22:51:48 2005
+++ devel_ports/x11/linux-XFree86-libs/Makefile Thu Apr 7 18:02:45 2005
@@ -27,9 +27,9 @@
CONFLICTS= linux_base-6* linux_base-7* linux_base-deb*
USE_LINUX_PREFIX=yes
+USE_LINUX= yes
MD5_FILE= ${MASTERDIR}/distinfo.i386
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
ONLY_FOR_ARCHS= amd64 i386
PKGINSTALL= ${WRKDIR}/pkg-install
PLIST= ${WRKDIR}/plist
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/x11/nvidia-driver/Makefile devel_ports/x11/nvidia-driver/Makefile
--- ports/x11/nvidia-driver/Makefile Tue Mar 1 22:51:48 2005
+++ devel_ports/x11/nvidia-driver/Makefile Thu Apr 7 16:14:24 2005
@@ -41,7 +41,7 @@
LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
.if !defined(WITHOUT_LINUX)
-USE_LINUX?= yes
+USE_LINUX= yes
RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
PLIST_SUB+= LINUX=""
.else
diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude distfiles ports/x11-toolkits/linux-gtk/Makefile devel_ports/x11-toolkits/linux-gtk/Makefile
--- ports/x11-toolkits/linux-gtk/Makefile Tue Mar 1 22:51:48 2005
+++ devel_ports/x11-toolkits/linux-gtk/Makefile Thu Apr 7 18:03:23 2005
@@ -23,6 +23,7 @@
ONLY_FOR_ARCHS?= i386 alpha amd64
+USE_LINUX= yes
USE_LINUX_PREFIX= yes
.include <bsd.port.pre.mk>
@@ -34,7 +35,6 @@
DIST_SUBDIR?= rpm
EXTRACT_ONLY=
NO_BUILD= yes
-NO_FILTER_SHLIBS= yes
PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050411175736.mabpo9me4g4cwc4g>