diff options
278 files changed, 1526 insertions, 1060 deletions
@@ -10,6 +10,22 @@ in the release notes. All ports committers are allowed to commit to this file. +20050618: +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 LINUX_BASE_PORT contains a string which is suitable as an + item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the + default (or overriden) linux base, ${LINUX_BASE_PORT} should be used+ + instead of a hardcoded reference. + - If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base + port and if USE_LINUX isn't set to "yes" (case insensitive), the port will + be marked as IGNORE. + 20050609: AUTHOR: portmgr@FreeBSD.org The following changes were introduced: diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 65f260a3e6f8..c62a5c599376 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -280,7 +280,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # 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 @@ -353,8 +354,23 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # 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. +# OVERRIDE_LINUX_BASE_PORT - This specifies the default linux base to use, for valid values +# have a look at the description of USE_LINUX. This is an user-only +# variable. Don't use it in any port, it's meant to be used in +# make.conf. +# +# LINUX_BASE_PORT - This is a read-only variable, it gets set to a value which +# is usable in *_DEPENDS (e.g. BUILD_DEPENDS=${LINUX_BASE_PORT}). +# It honors USE_LINUX=foo and OVERRIDE_LINUX_BASE_PORT. ## # USE_MYSQL - Add MySQL client dependency. # If no version is given (by the maintainer via the port or @@ -1520,15 +1536,39 @@ LIB_DEPENDS+= intl.${USE_GETTEXT}:${PORTSDIR}/devel/gettext .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_LINUX_BASE_PORT) +. if ${USE_LINUX:L} == yes +USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} +. endif +. endif + . if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX}) -RUN_DEPENDS+= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} +LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX} == "7" -RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base +LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base . else -RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8 +. if ${USE_LINUX:L} == "yes" +LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8 +. else +IGNORE= There is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT. +. endif . endif . endif + +RUN_DEPENDS+= ${LINUX_BASE_PORT} .endif .if defined(USE_MOTIF) @@ -1800,7 +1840,11 @@ USE_SUBMAKE= yes .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 @@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20050618: + 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_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use + ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use + ${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}). + 20050610: AFFECTS: users of ftp/wget built with SSL (default) AUTHOR: sf@FreeBSD.org diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile index 166f5ec48cb7..b8c83d39c036 100644 --- a/accessibility/linux-atk/Makefile +++ b/accessibility/linux-atk/Makefile @@ -7,7 +7,7 @@ PORTNAME= atk PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= accessibility MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/accessibility/linux-atk/pkg-plist b/accessibility/linux-atk/pkg-plist index 238c70c0c2d2..ce0a7ef29bea 100644 --- a/accessibility/linux-atk/pkg-plist +++ b/accessibility/linux-atk/pkg-plist @@ -20,3 +20,5 @@ usr/share/locale/sv/LC_MESSAGES/atk10.mo usr/share/locale/uk/LC_MESSAGES/atk10.mo usr/share/locale/vi/LC_MESSAGES/atk10.mo @dirrm usr/share/doc/atk-1.2.0 +@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/he 2>&1 >/dev/null || true diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile index 166f5ec48cb7..b8c83d39c036 100644 --- a/accessibility/linux-f10-atk/Makefile +++ b/accessibility/linux-f10-atk/Makefile @@ -7,7 +7,7 @@ PORTNAME= atk PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= accessibility MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/accessibility/linux-f10-atk/pkg-plist b/accessibility/linux-f10-atk/pkg-plist index 238c70c0c2d2..ce0a7ef29bea 100644 --- a/accessibility/linux-f10-atk/pkg-plist +++ b/accessibility/linux-f10-atk/pkg-plist @@ -20,3 +20,5 @@ usr/share/locale/sv/LC_MESSAGES/atk10.mo usr/share/locale/uk/LC_MESSAGES/atk10.mo usr/share/locale/vi/LC_MESSAGES/atk10.mo @dirrm usr/share/doc/atk-1.2.0 +@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/he 2>&1 >/dev/null || true diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile index 166f5ec48cb7..b8c83d39c036 100644 --- a/accessibility/linux-f8-atk/Makefile +++ b/accessibility/linux-f8-atk/Makefile @@ -7,7 +7,7 @@ PORTNAME= atk PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= accessibility MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/accessibility/linux-f8-atk/pkg-plist b/accessibility/linux-f8-atk/pkg-plist index 238c70c0c2d2..ce0a7ef29bea 100644 --- a/accessibility/linux-f8-atk/pkg-plist +++ b/accessibility/linux-f8-atk/pkg-plist @@ -20,3 +20,5 @@ usr/share/locale/sv/LC_MESSAGES/atk10.mo usr/share/locale/uk/LC_MESSAGES/atk10.mo usr/share/locale/vi/LC_MESSAGES/atk10.mo @dirrm usr/share/doc/atk-1.2.0 +@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/he 2>&1 >/dev/null || true diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile index c6418ac7cd99..eda98d5deba7 100644 --- a/archivers/stuffit/Makefile +++ b/archivers/stuffit/Makefile @@ -20,8 +20,7 @@ NO_PACKAGE= Only unmodified original package can be distributed 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 --git a/astro/linux-setiathome/Makefile b/astro/linux-setiathome/Makefile index d3a788143e1e..bafda34c9ac2 100644 --- a/astro/linux-setiathome/Makefile +++ b/astro/linux-setiathome/Makefile @@ -16,7 +16,7 @@ COMMENT= Donate idle cycles to the search for space aliens - Linux i686 version # ONLY_FOR_ARCHS= i386 -USE_LINUX?= yes +USE_LINUX= yes # Local variables # diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile index 32154b5df243..2f431f3dd035 100644 --- a/audio/baudline/Makefile +++ b/audio/baudline/Makefile @@ -17,13 +17,12 @@ DISTNAME= baudline_${PORTVERSION:S/.p/pre/}_i686 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 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 --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile index 108d6b92be4d..09fe988d6318 100644 --- a/audio/linux-arts/Makefile +++ b/audio/linux-arts/Makefile @@ -21,15 +21,13 @@ COMMENT= Audio system for the KDE integrated X11 desktop 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.${MACHINE_ARCH} MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile index e67027ca85ba..9897ca985c97 100644 --- a/audio/linux-esound/Makefile +++ b/audio/linux-esound/Makefile @@ -8,7 +8,7 @@ PORTNAME= esound CATEGORIES= audio linux PORTVERSION= 0.2.22 -PORTREVISION= 3 +PORTREVISION= 4 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of esound diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile index 108d6b92be4d..09fe988d6318 100644 --- a/audio/linux-f10-arts/Makefile +++ b/audio/linux-f10-arts/Makefile @@ -21,15 +21,13 @@ COMMENT= Audio system for the KDE integrated X11 desktop 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.${MACHINE_ARCH} MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile index e67027ca85ba..9897ca985c97 100644 --- a/audio/linux-f10-esound/Makefile +++ b/audio/linux-f10-esound/Makefile @@ -8,7 +8,7 @@ PORTNAME= esound CATEGORIES= audio linux PORTVERSION= 0.2.22 -PORTREVISION= 3 +PORTREVISION= 4 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of esound diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile index 35d35de5cb40..1575b768348b 100644 --- a/audio/linux-f10-libaudiofile/Makefile +++ b/audio/linux-f10-libaudiofile/Makefile @@ -7,7 +7,7 @@ PORTNAME= libaudiofile PORTVERSION= 0.1.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile index 108d6b92be4d..09fe988d6318 100644 --- a/audio/linux-f8-arts/Makefile +++ b/audio/linux-f8-arts/Makefile @@ -21,15 +21,13 @@ COMMENT= Audio system for the KDE integrated X11 desktop 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.${MACHINE_ARCH} MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile index e67027ca85ba..9897ca985c97 100644 --- a/audio/linux-f8-esound/Makefile +++ b/audio/linux-f8-esound/Makefile @@ -8,7 +8,7 @@ PORTNAME= esound CATEGORIES= audio linux PORTVERSION= 0.2.22 -PORTREVISION= 3 +PORTREVISION= 4 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of esound diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile index 35d35de5cb40..1575b768348b 100644 --- a/audio/linux-f8-libaudiofile/Makefile +++ b/audio/linux-f8-libaudiofile/Makefile @@ -7,7 +7,7 @@ PORTNAME= libaudiofile PORTVERSION= 0.1.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile index 35d35de5cb40..1575b768348b 100644 --- a/audio/linux-libaudiofile/Makefile +++ b/audio/linux-libaudiofile/Makefile @@ -7,7 +7,7 @@ PORTNAME= libaudiofile PORTVERSION= 0.1.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/audio/linux-mbrola/Makefile b/audio/linux-mbrola/Makefile index d743249666ad..59039811d97b 100644 --- a/audio/linux-mbrola/Makefile +++ b/audio/linux-mbrola/Makefile @@ -19,7 +19,7 @@ DIST_SUBDIR= mbrola-linux 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 --git a/audio/linux-vsound/Makefile b/audio/linux-vsound/Makefile index 301965d865af..729c985afea6 100644 --- a/audio/linux-vsound/Makefile +++ b/audio/linux-vsound/Makefile @@ -19,7 +19,7 @@ COMMENT= Utility for capturing audio streams from Linux binaries RUN_DEPENDS= sox:${PORTSDIR}/audio/sox/ -USE_LINUX?= yes +USE_LINUX= yes NO_BUILD= yes do-install: diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index 11099f875ff3..57f6a4746ec9 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -18,8 +18,7 @@ WRKSRC= ${WRKDIR}/tss2_rc2 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 --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile index d2ed493be271..18d151392e76 100644 --- a/audio/teamspeak_client/Makefile +++ b/audio/teamspeak_client/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg 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 --git a/audio/teamspeak_server/Makefile b/audio/teamspeak_server/Makefile index 11099f875ff3..57f6a4746ec9 100644 --- a/audio/teamspeak_server/Makefile +++ b/audio/teamspeak_server/Makefile @@ -18,8 +18,7 @@ WRKSRC= ${WRKDIR}/tss2_rc2 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 --git a/cad/linux-eagle/Makefile b/cad/linux-eagle/Makefile index e3bddcaf743f..651d6b605be5 100644 --- a/cad/linux-eagle/Makefile +++ b/cad/linux-eagle/Makefile @@ -28,7 +28,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME:S/linux-//} 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 --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile index e3bddcaf743f..651d6b605be5 100644 --- a/cad/linux-eagle5/Makefile +++ b/cad/linux-eagle5/Makefile @@ -28,7 +28,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME:S/linux-//} 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 --git a/cad/linux-gid/Makefile b/cad/linux-gid/Makefile index 441aadce2522..94d219d139e5 100644 --- a/cad/linux-gid/Makefile +++ b/cad/linux-gid/Makefile @@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A graphical pre- and post-processor for numerical simulation programs -RUN_DEPENDS= ${LINUXBASE}${X11BASE}/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs - CONFLICTS= id-utils-[0-9]* coreutils-[0-9]* ONLY_FOR_ARCHS= amd64 i386 -USE_LINUX?= yes +USE_LINUX= yes +USE_X_PREFIX= yes USE_REINPLACE= yes REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes diff --git a/databases/sybase_ase/Makefile b/databases/sybase_ase/Makefile index f6c97df2dd9e..6985c2712673 100644 --- a/databases/sybase_ase/Makefile +++ b/databases/sybase_ase/Makefile @@ -22,7 +22,7 @@ NO_PACKAGE= "Packaging is pointless, the port does not build anything" NO_INSTALL_MANPAGES= yes PKGDEINSTALL= ${PKGDIR}/pkg-install -USE_LINUX?= yes +USE_LINUX= yes pre-install: @${ECHO_MSG} "---> Creating sybase user and group" diff --git a/deskutils/linux-sunbird/Makefile b/deskutils/linux-sunbird/Makefile index c0f7812869da..796f096fa5fe 100644 --- a/deskutils/linux-sunbird/Makefile +++ b/deskutils/linux-sunbird/Makefile @@ -7,6 +7,7 @@ PORTNAME= sunbird PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES?= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR?=calendar/sunbird/releases/${PORTVERSION} @@ -17,23 +18,19 @@ MAINTAINER= voisine@gmail.com COMMENT= Calendaring application 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 SUNBIRD_NAME= ${PKGNAMEPREFIX}${PORTNAME} DESCR= ${.CURDIR}/pkg-descr MD5_FILE= ${.CURDIR}/distinfo PLIST= ${WRKDIR}/pkg-plist USE_LINUX= yes -USE_XLIB= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/sunbird @@ -46,6 +43,8 @@ pre-install: ${SED} -e 's:^:@dirrm lib/${SUNBIRD_NAME}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${SUNBIRD_NAME} >> ${PLIST} +# XXX: This is missing a "${BRANDELF\ -t Linux <executables>". + do-install: ${MKDIR} ${PREFIX}/lib/${SUNBIRD_NAME} ${CHMOD} 755 ${PREFIX}/lib/${SUNBIRD_NAME} diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile index a310ff14145b..9727c09279cc 100644 --- a/devel/linux-allegro/Makefile +++ b/devel/linux-allegro/Makefile @@ -11,30 +11,19 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} -EXTRACT_SUFX= .rpm -EXTRACT_ONLY= MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform game programming library (linux version) -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 +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm +RUN_DEPENDS= -DBPATH= /var/lib/rpm -RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ - --nodeps --replacepkgs -RPMDIR= ${DISTDIR}/${DIST_SUBDIR} +USE_LINUX= yes +USE_LINUX_PREFIX= yes +ONLY_FOR_ARCHS= i386 -do-install: - @${PREFIX}/bin/rpm -U ${RPMFLAGS} ${RPMDIR}/${DISTFILES} - @${LDCONFIG_LINUX} - @${RMDIR} ${PREFIX}/var/tmp +RPM_SET= ${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm +PLIST= ${MASTERDIR}/pkg-plist +MD5_FILE= ${MASTERDIR}/distinfo -.include <bsd.port.mk> +.include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile index a310ff14145b..9727c09279cc 100644 --- a/devel/linux-f10-allegro/Makefile +++ b/devel/linux-f10-allegro/Makefile @@ -11,30 +11,19 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} -EXTRACT_SUFX= .rpm -EXTRACT_ONLY= MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform game programming library (linux version) -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 +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm +RUN_DEPENDS= -DBPATH= /var/lib/rpm -RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ - --nodeps --replacepkgs -RPMDIR= ${DISTDIR}/${DIST_SUBDIR} +USE_LINUX= yes +USE_LINUX_PREFIX= yes +ONLY_FOR_ARCHS= i386 -do-install: - @${PREFIX}/bin/rpm -U ${RPMFLAGS} ${RPMDIR}/${DISTFILES} - @${LDCONFIG_LINUX} - @${RMDIR} ${PREFIX}/var/tmp +RPM_SET= ${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm +PLIST= ${MASTERDIR}/pkg-plist +MD5_FILE= ${MASTERDIR}/distinfo -.include <bsd.port.mk> +.include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-f10-libglade/Makefile +++ b/devel/linux-f10-libglade/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-f10-libglade2/Makefile +++ b/devel/linux-f10-libglade2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile index 28845887cf76..c5d9f985eafb 100644 --- a/devel/linux-f10-sdl12/Makefile +++ b/devel/linux-f10-sdl12/Makefile @@ -21,9 +21,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform multi-media development API (linux version) BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS= i386 alpha diff --git a/devel/linux-f10-sdl12/pkg-plist.i386 b/devel/linux-f10-sdl12/pkg-plist.i386 index 4e5d3adfe310..76916fafd2f9 100644 --- a/devel/linux-f10-sdl12/pkg-plist.i386 +++ b/devel/linux-f10-sdl12/pkg-plist.i386 @@ -6,3 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 +@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile index a310ff14145b..9727c09279cc 100644 --- a/devel/linux-f8-allegro/Makefile +++ b/devel/linux-f8-allegro/Makefile @@ -11,30 +11,19 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} -EXTRACT_SUFX= .rpm -EXTRACT_ONLY= MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform game programming library (linux version) -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 +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm +RUN_DEPENDS= -DBPATH= /var/lib/rpm -RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ - --nodeps --replacepkgs -RPMDIR= ${DISTDIR}/${DIST_SUBDIR} +USE_LINUX= yes +USE_LINUX_PREFIX= yes +ONLY_FOR_ARCHS= i386 -do-install: - @${PREFIX}/bin/rpm -U ${RPMFLAGS} ${RPMDIR}/${DISTFILES} - @${LDCONFIG_LINUX} - @${RMDIR} ${PREFIX}/var/tmp +RPM_SET= ${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm +PLIST= ${MASTERDIR}/pkg-plist +MD5_FILE= ${MASTERDIR}/distinfo -.include <bsd.port.mk> +.include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-f8-libglade/Makefile +++ b/devel/linux-f8-libglade/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-f8-libglade2/Makefile +++ b/devel/linux-f8-libglade2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile index 28845887cf76..c5d9f985eafb 100644 --- a/devel/linux-f8-sdl12/Makefile +++ b/devel/linux-f8-sdl12/Makefile @@ -21,9 +21,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform multi-media development API (linux version) BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS= i386 alpha diff --git a/devel/linux-f8-sdl12/pkg-plist.i386 b/devel/linux-f8-sdl12/pkg-plist.i386 index 4e5d3adfe310..76916fafd2f9 100644 --- a/devel/linux-f8-sdl12/pkg-plist.i386 +++ b/devel/linux-f8-sdl12/pkg-plist.i386 @@ -6,3 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 +@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile index 84da08785493..6167073aac7c 100644 --- a/devel/linux-glib2/Makefile +++ b/devel/linux-glib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= glib2 PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist index deed898fe114..cb5d711bbf3d 100644 --- a/devel/linux-glib2/pkg-plist +++ b/devel/linux-glib2/pkg-plist @@ -53,3 +53,27 @@ usr/share/locale/vi/LC_MESSAGES/glib20.mo usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm usr/share/doc/glib2-2.2.1 +@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/am 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/az 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/bg 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/bn 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/eu 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/hi 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mn 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ms 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/nn 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sq 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ta 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/vi 2>&1 >/dev/null || true diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-libglade/Makefile +++ b/devel/linux-libglade/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile index f076547bce49..98963b60ff0c 100644 --- a/devel/linux-libglade2/Makefile +++ b/devel/linux-libglade2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile index 1e6dcf068608..b50708262e41 100644 --- a/devel/linux-runrev/Makefile +++ b/devel/linux-runrev/Makefile @@ -7,7 +7,7 @@ PORTNAME= runrev PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel linux MASTER_SITES= ftp://ftp.runrev.com/pub/revolution/ \ http://www.runrev.com/revolution/engines11/unix/ @@ -19,23 +19,18 @@ DIST_SUBDIR= ${PORTNAME} 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 @@ do-install: .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 --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile index 28845887cf76..c5d9f985eafb 100644 --- a/devel/linux-sdl12/Makefile +++ b/devel/linux-sdl12/Makefile @@ -21,9 +21,10 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform multi-media development API (linux version) BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS= i386 alpha diff --git a/devel/linux-sdl12/pkg-plist.i386 b/devel/linux-sdl12/pkg-plist.i386 index 4e5d3adfe310..76916fafd2f9 100644 --- a/devel/linux-sdl12/pkg-plist.i386 +++ b/devel/linux-sdl12/pkg-plist.i386 @@ -6,3 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 +@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true diff --git a/devel/linux-understand_ada/Makefile b/devel/linux-understand_ada/Makefile index 1bc6b0602b53..4a4ce55fa187 100644 --- a/devel/linux-understand_ada/Makefile +++ b/devel/linux-understand_ada/Makefile @@ -7,7 +7,7 @@ PORTNAME= understand_ada PORTVERSION= 1.4.206 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel linux MASTER_SITES= http://www.scitools.com/ftp/pub/download/${PORTNAME}/%SUBDIR%/ MASTER_SITE_SUBDIR= latest pastbuilds @@ -17,8 +17,6 @@ DISTNAME= und_ada-14b${PORTVERSION:E}-linux 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 @@ RESTRICTED= Commercial software 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 --git a/devel/linux-understand_c/Makefile b/devel/linux-understand_c/Makefile index 30d8b7eceb7a..3ac995deda04 100644 --- a/devel/linux-understand_c/Makefile +++ b/devel/linux-understand_c/Makefile @@ -7,7 +7,7 @@ PORTNAME= understand_c PORTVERSION= 1.4.206 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel linux MASTER_SITES= http://www.scitools.com/ftp/pub/download/understand_c/%SUBDIR%/ @@ -18,8 +18,6 @@ DISTNAME= und_c-14b${PORTVERSION:E}-linux 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 @@ RESTRICTED= Commercial software 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 --git a/devel/linux-understand_java/Makefile b/devel/linux-understand_java/Makefile index 0baeafd3c66c..ef2c2d33b352 100644 --- a/devel/linux-understand_java/Makefile +++ b/devel/linux-understand_java/Makefile @@ -7,7 +7,7 @@ PORTNAME= understand_java PORTVERSION= 1.4.206 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java linux MASTER_SITES= http://www.scitools.com/ftp/pub/download/${PORTNAME}/%SUBDIR%/ MASTER_SITE_SUBDIR= latest pastbuilds @@ -17,8 +17,6 @@ DISTNAME= und_java-14b${PORTVERSION:E}-linux 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 @@ RESTRICTED= Commercial software 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 --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile index 9b10874b4598..c9ba027775f2 100644 --- a/devel/linux_devtools/Makefile +++ b/devel/linux_devtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= linux_devtools PORTVERSION= 8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel emulators linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS @@ -35,17 +35,12 @@ COMMENT= Packages needed for doing development in Linux mode 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,7 +52,7 @@ UPDATES= XFree86-devel-4.2.1-23.i386.rpm DBPATH= /var/lib/rpm RPM= LC_ALL=C rpm -RPMFLAGS= --root ${LINUXBASE} --dbpath ${DBPATH} --nodeps \ +RPMFLAGS= --root ${PREFIX} --dbpath ${DBPATH} --nodeps \ --replacepkgs --ignoreos RPMDIR= ${DISTDIR}/${DIST_SUBDIR} @@ -82,17 +77,16 @@ pre-install: cd ${WRKSRC}/tmp; ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | \ ${GREP} -vwE "(bin$$|X11R6/include$$|lib$$|man$$|src$$)" | \ - ${SED} -e 's:^:@dirrm :'>> ${PLIST} + ${SED} -e 's:^:@dirrm :' >> ${PLIST} +.for dir in lib/gcc-lib src X11R6/bin X11R6/include X11R6/lib X11R6/man X11R6 + ${ECHO_CMD} "@unexec rmdir %D/usr/${dir} >/dev/null 2>&1 || true" >> ${PLIST} +.endfor ${RM} -rf ${WRKSRC}/tmp 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 # # Install all packages. @for R in ${DISTFILES}; do \ @@ -108,10 +102,10 @@ do-install: # # 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 --git a/devel/zendstudio/Makefile b/devel/zendstudio/Makefile index a35b12eb2acc..9011cdadf38b 100644 --- a/devel/zendstudio/Makefile +++ b/devel/zendstudio/Makefile @@ -7,19 +7,19 @@ PORTNAME= ZendStudio PORTVERSION= 3.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g} MASTER_SITES= http://www.zend.com/store/products/zend-studio.php MAINTAINER= tux@pinguru.net COMMENT= A PHP IDE -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - NO_BUILD= yes RESTRICTED= "Redistribution is not permitted" NO_PACKAGES= ${RESTRICTED} NO_CDROM= ${RESTRICTED} +USE_LINUX= yes +USE_X_PREFIX= yes .include <bsd.port.pre.mk> @@ -55,5 +55,6 @@ do-install: post-install: ${LN} -s ${PREFIX}/Zend/bin/ZDE ${PREFIX}/bin/ZDE +# This is missing a "${BRANDELF} -t Linux <executables>" .include <bsd.port.post.mk> diff --git a/editors/edith/Makefile b/editors/edith/Makefile index 79cdac4b7076..540ce2461ed0 100644 --- a/editors/edith/Makefile +++ b/editors/edith/Makefile @@ -16,10 +16,9 @@ DISTFILES= edith1.55.common.tar.gz \ 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 @@ MANCOMPRESSED= no WRKSRC= ${WRKDIR}/edith EDITHDIR= ${PREFIX}/lib/edith -STRIP= do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/edith ${PREFIX}/bin diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index 987adec11bad..dc94cc74415c 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.1a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors linux MASTER_SITES= http://afug.hypermart.net/files/ \ ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ @@ -19,13 +19,14 @@ MAINTAINER= mb@imp.ch COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be downloaded direct from Sun via www interface' USE_REINPLACE= yes +USE_LINUX= yes +USE_X_PREFIX= yes IS_INTERACTIVE= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_CMD= ${CAT} @@ -71,6 +72,7 @@ do-install: @/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp @${CAT} ${PKGMESSAGE} @-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". @${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin @${INSTALL_DATA} ${_DISTDIR}/libofa517li.so ${PREFIX}/Office51/lib diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index 40bc9cc72532..ae12d1d6f4ca 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \ ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \ @@ -32,8 +32,7 @@ EXTRACT_ONLY= 109939-03.tar.Z MAINTAINER= mbr@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +FETCH_DEPENDS= ${LINUX_BASE_PORT} NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 @@ -42,6 +41,8 @@ CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes NO_BUILD= yes USE_REINPLACE= yes +USE_LINUX= yes +USE_X_PREFIY= yes DIST_SUBDIR= staroffice52 WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp @@ -213,6 +214,7 @@ do-install: @for file in ${SUNSOLVE}/* ; do \ ${CP} -Rv $$file ${PREFIX}/office52/ ; \ done +# XXX: This is missing a "${BRANDELF} -t Linux <executables>" .endif post-install: diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index 6cbb8b0b1821..e890b2a7b57b 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \ ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \ @@ -26,12 +26,12 @@ EXTRACT_ONLY= 112887-04.tar MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' +USE_LINUX= yes +USE_X_PREFIX= yes IS_INTERACTIVE= yes NO_BUILD= yes SOVERSION= ${PORTNAME}${PORTVERSION} @@ -229,6 +229,7 @@ post-install: @${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin @${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb @${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". @${ECHO} StarOffice6.0 has been installed successfully. In order to use @${ECHO} it, execute ${PREFIX}/bin/staroffice6. @${ECHO} diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index 048ba74c9e5f..ffff7c009307 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors linux MASTER_SITES= ftp://patches.sun.com/patchroot/all_unsigned/:patch \ ftp://ftp.sun.co.uk/pub/patches/:patch \ @@ -30,11 +30,11 @@ EXTRACT_ONLY= 116518-06.tar MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' +USE_LINUX= yes +USE_X_PREFIX= yes IS_INTERACTIVE= yes NO_BUILD= yes SOVERSION= ${PORTNAME}${PORTVERSION} @@ -243,6 +243,7 @@ post-install: @${LN} -fs ${PREFIX}/bin/staroffice7 ${PREFIX}/bin/staroffice-spadmin @${LN} -fs ${PREFIX}/bin/staroffice7 ${PREFIX}/bin/staroffice-sweb @${LN} -fs ${PREFIX}/bin/staroffice7 ${PREFIX}/bin/staroffice-swriter +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". @${ECHO} StarOffice7.0 has been installed successfully. In order to use @${ECHO} it, execute ${PREFIX}/bin/staroffice7. @${ECHO} diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile index a76e73d80f1a..4d328358dc62 100644 --- a/emulators/linux-ePSXe/Makefile +++ b/emulators/linux-ePSXe/Makefile @@ -16,26 +16,21 @@ MAINTAINER= jylefort@FreeBSD.org COMMENT= A Sony Playstation emulator (Linux version) # The binary is built against glibc 2.3, so we need linux_base-8. -RUN_DEPENDS= ${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \ - ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk +RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk +USE_LINUX= yes USE_X_PREFIX= yes USE_ZIP= yes NO_WRKSUBDIR= 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= - .include <bsd.port.pre.mk> EPSXE= ${PREFIX}/libexec/epsxe -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-build: ${MKDIR} ${WRKSRC}/FreeBSD @@ -57,6 +52,7 @@ do-install: ${MKDIR} ${PREFIX}/libexec ${INSTALL_PROGRAM} ${WRKSRC}/epsxe ${EPSXE} + ${BRANDELF} -t Linux ${EPSXE} ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/keycodes.lst ${DATADIR} diff --git a/emulators/linux-geepee32/Makefile b/emulators/linux-geepee32/Makefile index 1ce7f856b758..c33d030b6b15 100644 --- a/emulators/linux-geepee32/Makefile +++ b/emulators/linux-geepee32/Makefile @@ -15,17 +15,16 @@ DISTNAME= ${PORTNAME}_linux_sdl_${PORTVERSION} 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 --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile index cc520d34417a..d54d0978b4bd 100644 --- a/emulators/linux-peops-softgpu/Makefile +++ b/emulators/linux-peops-softgpu/Makefile @@ -7,6 +7,7 @@ PORTNAME= peops-softgpu PORTVERSION= 1.16 +PORTREVISION= 1 CATEGORIES= emulators linux MASTER_SITES= http://www.pbernert.com/ PKGNAMEPREFIX= linux- @@ -19,22 +20,20 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux 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 --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile index a0c8c5c2f9dc..c152868e6537 100644 --- a/emulators/linux-peops-spu/Makefile +++ b/emulators/linux-peops-spu/Makefile @@ -7,6 +7,7 @@ PORTNAME= peops-spu PORTVERSION= 1.9 +PORTREVISION= 1 CATEGORIES= emulators linux MASTER_SITES= http://www.pbernert.com/ PKGNAMEPREFIX= linux- @@ -19,22 +20,20 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux 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 --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile index f1574d17dbee..aadd42953aba 100644 --- a/emulators/linux-pete-mesagpu/Makefile +++ b/emulators/linux-pete-mesagpu/Makefile @@ -7,7 +7,7 @@ PORTNAME= pete-mesagpu PORTVERSION= 1.75 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators linux MASTER_SITES= http://www.pbernert.com/ PKGNAMEPREFIX= linux- @@ -21,22 +21,20 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux 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 --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile index e31b3a929bbb..79df27b0d7f2 100644 --- a/emulators/linux-vmware-toolbox2/Makefile +++ b/emulators/linux-vmware-toolbox2/Makefile @@ -16,10 +16,9 @@ DISTNAME= vmware-linux-tools 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_LINUX= yes USE_X_PREFIX= yes NO_BUILD= yes .if !defined(BATCH) @@ -47,7 +46,6 @@ MOUNT_DEV?= vn0 .else MOUNT_DEV?= fd0 .endif -STRIP= VMWARE_VER= 2.0.4 BUILD_VER= 1142 @@ -98,6 +96,7 @@ do-fetch: .endif do-install: + ${BRANDELF} -t Linux ${WRKSRC}/vmware-toolbox ${INSTALL_PROGRAM} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile index 8b7e4836a98e..51d74980c208 100644 --- a/emulators/linux-vmware-toolbox4/Makefile +++ b/emulators/linux-vmware-toolbox4/Makefile @@ -16,17 +16,15 @@ DISTNAME= vmware-linux-tools 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 @@ -90,6 +88,7 @@ post-extract: ${UMOUNT} ${MOUNT_DEV} do-install: + ${BRANDELF} -t Linux ${WRKSRC}/bin/vmware-toolbox ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile index 2d5b96db128c..0d507ed4001f 100644 --- a/emulators/linux-vmware-toolbox5/Makefile +++ b/emulators/linux-vmware-toolbox5/Makefile @@ -16,15 +16,13 @@ DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER} MAINTAINER= matusita@FreeBSD.org COMMENT=VMware toolbox for guest OS (for VMware 5.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_LINUX= yes USE_X_PREFIX= yes NO_BUILD= yes .if !defined(BATCH) @@ -89,6 +87,7 @@ post-extract: ${UMOUNT} ${MOUNT_DEV} do-install: + ${BRANDELF} -t Linux ${WRKSRC}/bin/vmware-toolbox-old ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox-old ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile index 2d5b96db128c..0d507ed4001f 100644 --- a/emulators/linux-vmware-toolbox6/Makefile +++ b/emulators/linux-vmware-toolbox6/Makefile @@ -16,15 +16,13 @@ DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER} MAINTAINER= matusita@FreeBSD.org COMMENT=VMware toolbox for guest OS (for VMware 5.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_LINUX= yes USE_X_PREFIX= yes NO_BUILD= yes .if !defined(BATCH) @@ -89,6 +87,7 @@ post-extract: ${UMOUNT} ${MOUNT_DEV} do-install: + ${BRANDELF} -t Linux ${WRKSRC}/bin/vmware-toolbox-old ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox-old ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-winetools/Makefile b/emulators/linux-winetools/Makefile index bfd4c6e430d5..0fe7cfd6f13d 100644 --- a/emulators/linux-winetools/Makefile +++ b/emulators/linux-winetools/Makefile @@ -7,7 +7,7 @@ PORTNAME= winetools PORTVERSION= 1.25a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/winetools/} PKGNAMEPREFIX= linux- @@ -16,17 +16,15 @@ EXTRACT_SUFX= .tgz 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 --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 4b2e1cd958d8..756cf87721e6 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -60,7 +60,7 @@ CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \ linux_base-rh* linux_base-suse* ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm/${ARCH}/${PORTVERSION} -PREFIX= ${LINUXBASE} +PREFIX?= ${LINUXBASE} NO_BUILD= yes NO_FILTER_SHLIBS= yes NO_MTREE= yes @@ -106,12 +106,6 @@ pre-install: @cd ${WRKSRC}/lib && ${LN} -sf libtermcap.so.2.0.8 libtermcap.so.2 @${RPM} --initdb --root ${WRKSRC} --dbpath ${DBPATH} # -# Make sure we have a /dev/null in the chrooted environment. - @${MKDIR} ${WRKSRC}/dev - @${RM} -f ${WRKSRC}/dev/null - @mknod ${WRKSRC}/dev/null c 2 2 - @${CHMOD} 666 ${WRKSRC}/dev/null -# # Install all packages. Ignore dependencies just like the Red Hat installer. # Also, set the ELF fallback brand to Linux, so that we don't have to do # anything special to run staticly linked binaries. @@ -121,7 +115,7 @@ pre-install: ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done @for F in ${BRAND_FILES}; do \ - brandelf -t Linux ${WRKSRC}/$$F; \ + ${BRANDELF} -t Linux ${WRKSRC}/$$F; \ done @/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${PREVIOUS_ELF} # diff --git a/emulators/linux_base-8/pkg-message b/emulators/linux_base-8/pkg-message index b7d8d197ca8f..29791da973dc 100644 --- a/emulators/linux_base-8/pkg-message +++ b/emulators/linux_base-8/pkg-message @@ -8,5 +8,16 @@ is now enabled. Linux mode can be enabled permanently with the linux_enable variable of rc.conf(5). -When using NIS, don't forget to edit -yp.conf in /compat/linux/etc. +To make use of NIS you have to adjust yp.conf and nsswitch.conf in +/compat/linux/etc/ accordingly. For example: + +Set your yp-server and yp-domainname in yp.conf: +domainname my.yp.domainname +ypserver my.yp.server + +Let your lists for hosts, passwd and group be resolved via nsswitch.conf: +passwd: files nis +shadow: files nis +group: files nis +hosts: files dns nis + diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile index 1d54e5ffa33c..bb8d2fb8fb97 100644 --- a/emulators/rtc/Makefile +++ b/emulators/rtc/Makefile @@ -18,7 +18,7 @@ COMMENT= Kernel module which provides /dev/rtc device support WRKSRC= ${WRKDIR}/files NO_FETCH= yes -USE_LINUX?= yes +USE_LINUX= yes # because of ${DEVDIR} KMODDIR= ${PREFIX}/modules diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile index 9aac5f1e92cd..0254c7182993 100644 --- a/emulators/vmware2/Makefile +++ b/emulators/vmware2/Makefile @@ -8,7 +8,7 @@ PORTNAME= vmware2 PORTVERSION= 2.0.4.1142 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= ${FREEBSD_MODULE_SITES} \ ${VMWARE_MIRROR_SITES} @@ -21,8 +21,7 @@ DISTFILES= VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX}:vmware \ MAINTAINER= vsilyaev@mindspring.com COMMENT= A virtual machine emulator - a full PC in a window -RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc RESTRICTED= "Not sure if we can redistribute it" @@ -45,7 +44,8 @@ VMDIR= ${PREFIX}/lib/vmware SRC_BASE?= /usr/src ONLY_FOR_ARCHS= i386 -USE_XLIB= yes +USE_LINUX= yes +USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/vmware-distrib GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1= vmware.1 diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 69679054dba4..f2cd79750896 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware3 PORTVERSION= 3.2.1.2242 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= emulators linux MASTER_SITES= http://www4.vmware.com/software/ \ @@ -22,8 +22,7 @@ DISTFILES= VMware-workstation-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX}:v MAINTAINER= orlando@break.net COMMENT= A virtual machine emulator - a full PC in a window -RUN_DEPENDS= /dev/rtc:${PORTSDIR}/emulators/rtc \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc RESTRICTED= "Not sure if we can redistribute it" @@ -39,7 +38,8 @@ VMDIR= ${PREFIX}/lib/vmware SRC_BASE?= /usr/src ONLY_FOR_ARCHS= i386 -USE_XLIB= yes +USE_LINUX= yes +USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/vmware-distrib GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1= vmware.1 diff --git a/emulators/winetools/Makefile b/emulators/winetools/Makefile index bfd4c6e430d5..0fe7cfd6f13d 100644 --- a/emulators/winetools/Makefile +++ b/emulators/winetools/Makefile @@ -7,7 +7,7 @@ PORTNAME= winetools PORTVERSION= 1.25a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/winetools/} PKGNAMEPREFIX= linux- @@ -16,17 +16,15 @@ EXTRACT_SUFX= .tgz 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 --git a/french/gibi/Makefile b/french/gibi/Makefile index 9cf2ac894f20..2e3e76c69d4d 100644 --- a/french/gibi/Makefile +++ b/french/gibi/Makefile @@ -7,7 +7,7 @@ PORTNAME= gibi PORTVERSION= 2000 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= french cad linux MASTER_SITES= http://www.code-aster.org/FICHIERS/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} @@ -25,7 +25,6 @@ COMMENT= GIBI est la partie mailleur et post de CASTEM BUILD_DEPENDS+= ${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster RUN_DEPENDS+= ${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \ ${SHELL_RUN_GIBI}:${PORTSDIR}/shells/${SHRGDEP} RESTRICTED= "Toute personne chargeant le logiciel GIBI s'engage à ne\ @@ -35,6 +34,8 @@ RESTRICTED= "Toute personne chargeant le logiciel GIBI s'engage à ne\ ONLY_FOR_ARCHS= i386 USE_REINPLACE= yes +USE_LINUX= yes +USE_X_PREFIX= yes REINPLACE_ARGS= -i "" NO_BUILD= yes @@ -93,7 +94,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME}${ARCHIVER} \ ${GIBIDIR}/bin @${BRANDELF} -t Linux ${GIBIDIR}/bin/${PORTNAME}${ARCHIVER} - @${BRANDELF} ${GIBIDIR}/DATA/kinstall_${ARCHIVER} + @${BRANDELF} -t Linux ${GIBIDIR}/DATA/kinstall_${ARCHIVER} @(cd ${GIBIDIR}/DATA \ && ./kinstall_${ARCHIVER} < ${FILESDIR}/clef >/dev/null 2>&1 \ && ${CHMOD} 666 USRDAT) diff --git a/french/homard/Makefile b/french/homard/Makefile index 9a955f59f15d..2407456d0b6b 100644 --- a/french/homard/Makefile +++ b/french/homard/Makefile @@ -26,7 +26,7 @@ RESTRICTED= "Toute personne chargeant le logiciel HOMARD s'engage à ne\ ONLY_FOR_ARCHS= i386 -USE_LINUX?= yes +USE_LINUX= yes USE_PYTHON= yes USE_REINPLACE= yes REINPLACE_ARGS= -i "" diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile index 6b7b6c57824b..8b1825a970fa 100644 --- a/french/staroffice52/Makefile +++ b/french/staroffice52/Makefile @@ -8,7 +8,7 @@ PORTNAME= staroffice PORTVERSION= 5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= french editors linux MASTER_SITES= ftp://ftp.cem2.univ-montp2.fr/pub/linux/soft/StarOffice/ \ ftp://sunsite.cnlab-switch.ch/mirror/staroffice/francais/ \ @@ -32,10 +32,11 @@ EXTRACT_ONLY= 109939-03.tar.Z MAINTAINER= mbr@FreeBSD.org COMMENT= Suite bureautique intégrée -FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +FETCH_DEPENDS= ${LINUX_BASE_PORT} ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes NO_CDROM= 'Doit être téléchargé depuis le site web de Sun' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes @@ -191,5 +192,6 @@ post-install: install-user: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \ ${PREFIX}/office52/program/setup +# XXX: This is missing a "$BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile index 0809894d01cf..1518ee2cebdc 100644 --- a/games/HeroesOfMightAndMagic/Makefile +++ b/games/HeroesOfMightAndMagic/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux 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 --git a/games/adom/Makefile b/games/adom/Makefile index 0ce9b2bdc672..136ae457dbf4 100644 --- a/games/adom/Makefile +++ b/games/adom/Makefile @@ -7,7 +7,7 @@ PORTNAME= adom PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://www.adom.de/adom/download/linux/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-elf @@ -15,11 +15,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-elf 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 --git a/games/atitd/Makefile b/games/atitd/Makefile index 4377c5fa0817..44d220448515 100644 --- a/games/atitd/Makefile +++ b/games/atitd/Makefile @@ -7,14 +7,14 @@ PORTNAME= atitd PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games graphics linux MASTER_SITES= http://www.atitd.com/ DISTNAME= eClient-linux.run EXTRACT_SUFX= EXTRACT_ONLY= -MAINTAINER= ports@freebsd.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Linux "A Tale in the Desert" (ATITD) client RUN_DEPENDS= ${X11BASE}/bin/xhost:${X_CLIENTS_PORT} @@ -28,7 +28,8 @@ RUN_DEPENDS+= ${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx .endif PLIST_FILES= bin/atitd -USE_LINUX?= yes +USE_LINUX= yes +USE_X_PREFIX= yes USE_MESA= yes ONLY_FOR_ARCHS= i386 @@ -58,6 +59,7 @@ do-install: 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 --git a/games/dsnake/Makefile b/games/dsnake/Makefile index 032fa929fc02..6c583ec364ec 100644 --- a/games/dsnake/Makefile +++ b/games/dsnake/Makefile @@ -7,7 +7,7 @@ PORTNAME= dsnake PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://bitblaze.com/downloads/ DISTNAME= ${PORTNAME}-linux-${PORTVERSION} @@ -20,10 +20,13 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/liballeg.so.4.0:${PORTSDIR}/devel/linux-allegr 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} (cd ${WRKSRC}; ${TAR} -cf - *) | (cd ${DATADIR}; ${TAR} -xf -) diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile index 5ae639046c1d..4989f8948a2a 100644 --- a/games/halflifeserver/Makefile +++ b/games/halflifeserver/Makefile @@ -18,7 +18,7 @@ COMMENT= Half-Life Dedicated Server for Linux 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 --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile index f0dfa2888124..5c2a84031f15 100644 --- a/games/hlserver-cs/Makefile +++ b/games/hlserver-cs/Makefile @@ -26,7 +26,7 @@ USE_SUBMAKE= yes 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 --git a/games/hohlin/Makefile b/games/hohlin/Makefile index 4045216f221c..838a8ecc7d8f 100644 --- a/games/hohlin/Makefile +++ b/games/hohlin/Makefile @@ -7,6 +7,7 @@ PORTNAME= hohlin PORTVERSION= 1.01 +PORTREVISION= 1 CATEGORIES= games #MASTER_SITES= http://retrospec.sgn.net/download.php?id=63&path=games/hoh/bin/ #requires post to download @@ -17,20 +18,22 @@ DISTNAME= ${PORTNAME}-${SHORTPORTVERSION} MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Remake of the classic spectrum game Head over Heels -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs - WRKSRC= ${WRKDIR}/hoh-install-${PORTVERSION}/ USE_BZIP2= YES -NO_BUILD= YES +USE_LINUX= yes +USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/} .include <bsd.port.pre.mk> +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/data/HoH + do-install: ${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/data/HoH ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/data/HoH ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/data/HoHOriginal.dat ${DATADIR} ${MKDIR} ${DATADIR}/Sound ${INSTALL_DATA} ${WRKSRC}/data/Sound/Sound.dat ${DATADIR}/Sound/ diff --git a/games/linux-enemyterritory-fortress/Makefile b/games/linux-enemyterritory-fortress/Makefile index 962c7a834928..70eb3aac3c2b 100644 --- a/games/linux-enemyterritory-fortress/Makefile +++ b/games/linux-enemyterritory-fortress/Makefile @@ -7,6 +7,7 @@ PORTNAME= enemyterritory-fortress PORTVERSION= 1.4 +PORTREVISON= 1 CATEGORIES= games linux MASTER_SITES= http://ftp.games.skynet.be/pub/wolfenstein/etf/ \ http://www.playlinux.net/pub/files/native/ @@ -20,8 +21,8 @@ COMMENT= A class-based teamplay modification for Enemy Territory RUN_DEPENDS= et:${PORTSDIR}/games/linux-enemyterritory ONLY_FOR_ARCHS= i386 -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_LINUX= yes +USE_X_PREFIX= yes NO_PACKAGE= Distfile is 249MB, set FORCE_PACKAGE if you really want to build this package RESTRICTED= Redistribution is limited, see license NO_WRKSUBDIR= yes diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile index 155a0c249864..cf51e33fe694 100644 --- a/games/linux-enemyterritory-tce/Makefile +++ b/games/linux-enemyterritory-tce/Makefile @@ -7,7 +7,7 @@ PORTNAME= enemyterritory-tce PORTVERSION= 0.48 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://ftp.games.skynet.be/pub/www.filesnetwork.com/Wolfenstein_Enemy_Territory/Mods/Total_Conversions/:full,update \ http://darkstar.ist.utl.pt/pub/games/:full,update \ @@ -26,12 +26,11 @@ RUN_DEPENDS= et:${PORTSDIR}/games/linux-enemyterritory ONLY_FOR_ARCHS= i386 USE_ZIP= yes -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_LINUX= yes +USE_X_PREFIX= yes NO_PACKAGE= Distfiles are 135MB, set FORCE_PACKAGE if you really want to build this package RESTRICTED= Redistribution is limited, see license ETDIR= ${PREFIX}/lib/enemyterritory -STRIP= # do not brand Linux binaries as FreeBSD on INSTALL_PROGRAM do-build: .for f in et etded diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile index 3da7b2e94b76..1b4b597645f7 100644 --- a/games/linux-enemyterritory/Makefile +++ b/games/linux-enemyterritory/Makefile @@ -7,6 +7,7 @@ PORTNAME= enemyterritory PORTVERSION= 2.60 +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= http://mirrors.xmission.com/idsoftware/et/linux/ \ http://3dgamers.intelenet.net/pub/3dgamers/games/wolfensteinet/ \ @@ -22,15 +23,11 @@ EXTRACT_SUFX= .run MAINTAINER= benlutz@datacomm.ch COMMENT= Wolfenstein: Enemy Territory (Linux version) -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 -PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB USE_LINUX= yes +USE_X_PREFIX= yes NO_PACKAGE= Package will be 257MB, set FORCE_PACKAGE if you really want to build it RESTRICTED= Redistribution is limited, see license -NO_BUILD= yes -STRIP= # empty: do not strip(1) linux binaries NO_WRKSUBDIR= yes ETDIR= ${PREFIX}/lib/${PORTNAME} INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} @@ -45,6 +42,12 @@ post-patch: @${SED} -e 's|@ETDIR@|${ETDIR}|' ${FILESDIR}/${FILE}.in > ${WRKSRC}/${FILE} .endfor +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/pb/pbweb.x86 +.for FILE in et.x86 etded.x86 + ${BRANDELF} -t Linux ${WRKSRC}/bin/Linux/x86/${FILE} +.endfor + do-install: ${INSTALL_DIR} ${ETDIR} diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile index 4fc4b98f2e0b..76d420fd22b7 100644 --- a/games/linux-nwnclient/Makefile +++ b/games/linux-nwnclient/Makefile @@ -7,7 +7,7 @@ PORTNAME= nwnclient PORTVERSION= 1.65 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://content.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/ PKGNAMEPREFIX= linux- @@ -23,6 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata \ NO_BUILD= yes ONLY_FOR_ARCHS= i386 +USE_LINUX= yes NWNDATADIR= ${LOCALBASE}/share/nwndata PLIST_SUB+= NWNVERSION="${PORTVERSION:S/.//}" diff --git a/games/linux-nwserver/Makefile b/games/linux-nwserver/Makefile index 0f7072225c6f..fad8f784d27e 100644 --- a/games/linux-nwserver/Makefile +++ b/games/linux-nwserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= nwserver PORTVERSION= 1.32 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://nwdownloads.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/ PKGNAMEPREFIX= linux- @@ -16,14 +16,12 @@ DISTNAME= linuxserver${PORTVERSION:S/.//} 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}/nwserver do-install: ${INSTALL_PROGRAM} ${WRKDIR}/fixinstall ${PREFIX}/bin diff --git a/games/linux-q3ademo/Makefile b/games/linux-q3ademo/Makefile index be3e026c84f3..7416ed8b981c 100644 --- a/games/linux-q3ademo/Makefile +++ b/games/linux-q3ademo/Makefile @@ -10,7 +10,7 @@ PORTNAME= linux-q3ademo PORTVERSION= 1.11.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games graphics linux # fetch manually MASTER_SITES= @@ -21,8 +21,9 @@ EXTRACT_SUFX= 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}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_ 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 @@ do-configure: @${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 --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile index be3e026c84f3..7416ed8b981c 100644 --- a/games/linux-quake3-demo/Makefile +++ b/games/linux-quake3-demo/Makefile @@ -10,7 +10,7 @@ PORTNAME= linux-q3ademo PORTVERSION= 1.11.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games graphics linux # fetch manually MASTER_SITES= @@ -21,8 +21,9 @@ EXTRACT_SUFX= 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}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_ 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 @@ do-configure: @${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 --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile index 781b49a5b18f..33a6c620ffef 100644 --- a/games/linux-quake3/Makefile +++ b/games/linux-quake3/Makefile @@ -18,14 +18,14 @@ MAINTAINER= pat@FreeBSD.org COMMENT= Quake III Arena Dedicated Server for Linux 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 NO_WRKSUBDIR= yes -Q3DIR= usr/games/quake3/ -PLIST_SUB+= Q3DIR="${Q3DIR}" +Q3BASE= games +Q3DIR= ${Q3BASE}/quake3/ +PLIST_SUB+= Q3DIR="${Q3DIR}" Q3BASE="${Q3BASE}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 do-extract: diff --git a/games/linux-quake3/pkg-plist b/games/linux-quake3/pkg-plist index 88a94199ab49..6f7c422a1252 100644 --- a/games/linux-quake3/pkg-plist +++ b/games/linux-quake3/pkg-plist @@ -95,4 +95,5 @@ %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/PunkBuster %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/LinuxFAQ %%PORTDOCS%%@dirrm %%Q3DIR%%Docs -@unexec rmdir %D/%%Q3DIR%% 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -Rf ${PKG_PREFIX}/%%Q3DIR%%`` to remove any configuration files, *.pk3 files, and mods left." | fmt +@unexec rmdir %D/%%Q3DIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should do a ``rm -Rf ${PKG_PREFIX}/%%Q3DIR%%; rmdir ${PKG_PREFIX}/%%Q3BASE%% >/dev/null 2>&1 || true`` to remove any configuration files, *.pk3 files, and mods left." | fmt +@unexec rmdir %D/%%Q3BASE%% >/dev/null 2>&1 || true diff --git a/games/linux-spheresofchaos-demo/Makefile b/games/linux-spheresofchaos-demo/Makefile index 4f641f568a5d..7a7ce470044b 100644 --- a/games/linux-spheresofchaos-demo/Makefile +++ b/games/linux-spheresofchaos-demo/Makefile @@ -7,6 +7,7 @@ PORTNAME= spheresofchaos PORTVERSION= 2.06 +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= http://people.FreeBSD.org/~roam/games/ \ ${MASTER_SITE_LOCAL} @@ -21,6 +22,7 @@ COMMENT= An unusual and spectacular shoot-em-up for the PC RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 USE_ZIP= yes +USE_LINUX= yes NO_BUILD= yes diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile index 9f365edfdfaf..bd4a3dcab9ed 100644 --- a/games/linux-ssamtse/Makefile +++ b/games/linux-ssamtse/Makefile @@ -7,7 +7,7 @@ PORTNAME= ssamtse PORTVERSION= b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= # must fetch manually DISTFILES= ${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin @@ -16,11 +16,10 @@ EXTRACT_ONLY= 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 @@ post-patch: @${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 --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile index efa38c1064d9..26362f628e60 100644 --- a/games/linux-steam/Makefile +++ b/games/linux-steam/Makefile @@ -7,7 +7,7 @@ PORTNAME= steam PORTVERSION= 1.0 -PORTREVISOIN= 1 +PORTREVISOIN= 2 CATEGORIES= games linux MASTER_SITES= http://www.coreblack.com/files/ PKGNAMEPREFIX= linux- @@ -15,9 +15,9 @@ PKGNAMEPREFIX= linux- MAINTAINER= hido@coreblack.com COMMENT= Half Life dedicated server running on steam -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs - IS_INTERACTIVE= yes +USE_LINUX= yes +USE_X_PREFIX= yes PKGMESSAGE= ${WRKDIR}/pkg-message INSTALLDIR?= steam diff --git a/games/q3server-ra3/Makefile b/games/q3server-ra3/Makefile index fba662cc6309..651707b7893b 100644 --- a/games/q3server-ra3/Makefile +++ b/games/q3server-ra3/Makefile @@ -19,10 +19,10 @@ DISTFILES?= ${PORTNAME}${PORTVERSION:S/.//}cl.zip \ MAINTAINER?= pat@FreeBSD.org COMMENT?= Quake III Arena Mod: Rocket Arena 3 for Linux -RUN_DEPENDS= ${LINUXBASE}/usr/games/quake3/q3ded:${Q3SERVER_PORT} +RUN_DEPENDS= ${LOCALBASE}/games/quake3/q3ded:${Q3SERVER_PORT} 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 @@ -42,7 +42,7 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} Q3SUBDIR?= ${PORTNAME} .endif -Q3DIR= usr/games/quake3/${Q3SUBDIR}/ +Q3DIR= games/quake3/${Q3SUBDIR}/ PLIST_SUB+= Q3DIR="${Q3DIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 diff --git a/games/q3server/Makefile b/games/q3server/Makefile index 781b49a5b18f..33a6c620ffef 100644 --- a/games/q3server/Makefile +++ b/games/q3server/Makefile @@ -18,14 +18,14 @@ MAINTAINER= pat@FreeBSD.org COMMENT= Quake III Arena Dedicated Server for Linux 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 NO_WRKSUBDIR= yes -Q3DIR= usr/games/quake3/ -PLIST_SUB+= Q3DIR="${Q3DIR}" +Q3BASE= games +Q3DIR= ${Q3BASE}/quake3/ +PLIST_SUB+= Q3DIR="${Q3DIR}" Q3BASE="${Q3BASE}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 do-extract: diff --git a/games/q3server/pkg-plist b/games/q3server/pkg-plist index 88a94199ab49..6f7c422a1252 100644 --- a/games/q3server/pkg-plist +++ b/games/q3server/pkg-plist @@ -95,4 +95,5 @@ %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/PunkBuster %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/LinuxFAQ %%PORTDOCS%%@dirrm %%Q3DIR%%Docs -@unexec rmdir %D/%%Q3DIR%% 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -Rf ${PKG_PREFIX}/%%Q3DIR%%`` to remove any configuration files, *.pk3 files, and mods left." | fmt +@unexec rmdir %D/%%Q3DIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should do a ``rm -Rf ${PKG_PREFIX}/%%Q3DIR%%; rmdir ${PKG_PREFIX}/%%Q3BASE%% >/dev/null 2>&1 || true`` to remove any configuration files, *.pk3 files, and mods left." | fmt +@unexec rmdir %D/%%Q3BASE%% >/dev/null 2>&1 || true diff --git a/games/quake3-ra3/Makefile b/games/quake3-ra3/Makefile index fba662cc6309..651707b7893b 100644 --- a/games/quake3-ra3/Makefile +++ b/games/quake3-ra3/Makefile @@ -19,10 +19,10 @@ DISTFILES?= ${PORTNAME}${PORTVERSION:S/.//}cl.zip \ MAINTAINER?= pat@FreeBSD.org COMMENT?= Quake III Arena Mod: Rocket Arena 3 for Linux -RUN_DEPENDS= ${LINUXBASE}/usr/games/quake3/q3ded:${Q3SERVER_PORT} +RUN_DEPENDS= ${LOCALBASE}/games/quake3/q3ded:${Q3SERVER_PORT} 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 @@ -42,7 +42,7 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} Q3SUBDIR?= ${PORTNAME} .endif -Q3DIR= usr/games/quake3/${Q3SUBDIR}/ +Q3DIR= games/quake3/${Q3SUBDIR}/ PLIST_SUB+= Q3DIR="${Q3DIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile index bd99ff6d6bf1..8ea4735c9423 100644 --- a/games/rt2-demo/Makefile +++ b/games/rt2-demo/Makefile @@ -19,7 +19,7 @@ COMMENT= The free demo of Railroad Tycoon II NO_WRKSUBDIR= yes NO_BUILD= yes -USE_LINUX?= yes +USE_LINUX= yes do-install: @${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR} diff --git a/games/rtcw-paks/Makefile b/games/rtcw-paks/Makefile index 001775f2d5cd..daace097aabb 100644 --- a/games/rtcw-paks/Makefile +++ b/games/rtcw-paks/Makefile @@ -7,6 +7,7 @@ PORTNAME= rtcw-paks PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= # DISTFILES= mp_pak0.pk3 mp_pak1.pk3 mp_pak2.pk3 \ @@ -18,17 +19,17 @@ IGNOREFILES= ${ALLFILES} 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 +BUILD_DEPENDS= ${X11BASE}/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 +42,7 @@ IGNORE=You must manually copy all the .pk3 files from the main/ directory of an # 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 --git a/games/rtcw-paks/pkg-plist b/games/rtcw-paks/pkg-plist index a9c76a4bde87..29fd53465658 100644 --- a/games/rtcw-paks/pkg-plist +++ b/games/rtcw-paks/pkg-plist @@ -1,6 +1,6 @@ -usr/games/rtcw/main/mp_pak0.pk3 -usr/games/rtcw/main/mp_pak1.pk3 -usr/games/rtcw/main/mp_pak2.pk3 -usr/games/rtcw/main/pak0.pk3 -usr/games/rtcw/main/sp_pak1.pk3 -usr/games/rtcw/main/sp_pak2.pk3 +games/rtcw/main/mp_pak0.pk3 +games/rtcw/main/mp_pak1.pk3 +games/rtcw/main/mp_pak2.pk3 +games/rtcw/main/pak0.pk3 +games/rtcw/main/sp_pak1.pk3 +games/rtcw/main/sp_pak2.pk3 diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile index d4b58d65182e..37a8a142d439 100644 --- a/games/rtcw/Makefile +++ b/games/rtcw/Makefile @@ -7,7 +7,7 @@ PORTNAME= rtcw PORTVERSION= 1.1b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/wolf/linux/old/ DISTNAME= wolf-linux-${PORTVERSION}.x86 @@ -17,13 +17,13 @@ MAINTAINER= nik@FreeBSD.org COMMENT= Return to Castle Wolfenstein for Linux ONLY_FOR_ARCHS= i386 -USE_LINUX_PREFIX= yes -USE_LINUX?= yes +USE_LINUX= yes +USE_X_PREFIX= yes NO_CDROM= "Size; the data set is much too big" NO_BUILD= yes NO_WRKSUBDIR= yes USE_PERL5_BUILD=yes -RTCWDIR= usr/games/rtcw +RTCWDIR= games/rtcw PLIST_SUB+= RTCWDIR="${RTCWDIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 diff --git a/games/ssamtse/Makefile b/games/ssamtse/Makefile index 9f365edfdfaf..bd4a3dcab9ed 100644 --- a/games/ssamtse/Makefile +++ b/games/ssamtse/Makefile @@ -7,7 +7,7 @@ PORTNAME= ssamtse PORTVERSION= b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= # must fetch manually DISTFILES= ${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin @@ -16,11 +16,10 @@ EXTRACT_ONLY= 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 @@ post-patch: @${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 --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile index a5784dda5731..c30aab5a16db 100644 --- a/games/stvef-paks/Makefile +++ b/games/stvef-paks/Makefile @@ -7,7 +7,7 @@ PORTNAME= stvef-paks PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= # DISTFILES= pak0.pk3 @@ -17,17 +17,17 @@ IGNOREFILES= ${ALLFILES} 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 +BUILD_DEPENDS= ${X11BASE}/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> @@ -45,7 +45,7 @@ do-build: ${RM} -f ${PLIST} for file in ${DISTDIR}/stvef/*; do \ b=`basename $$file`; \ - ${ECHO} usr/games/stvef/baseEF/$$b >> ${PLIST}; \ + ${ECHO_CMD} games/stvef/baseEF/$$b >> ${PLIST}; \ done do-install: diff --git a/games/stvef-paks/pkg-plist b/games/stvef-paks/pkg-plist index a133f1f2662f..a8d434ded82a 100644 --- a/games/stvef-paks/pkg-plist +++ b/games/stvef-paks/pkg-plist @@ -1,5 +1,5 @@ -usr/games/stvef/baseEF/efconfig.cfg -usr/games/stvef/baseEF/hmconfig.cfg -usr/games/stvef/baseEF/pak0.pk3 -usr/games/stvef/baseEF/pak1.pk3 -usr/games/stvef/baseEF/pak2.pk3 +games/stvef/baseEF/efconfig.cfg +games/stvef/baseEF/hmconfig.cfg +games/stvef/baseEF/pak0.pk3 +games/stvef/baseEF/pak1.pk3 +games/stvef/baseEF/pak2.pk3 diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile index 0232ab3316c0..a3da8be781c4 100644 --- a/games/stvef-server/Makefile +++ b/games/stvef-server/Makefile @@ -6,7 +6,7 @@ PORTNAME= stvef-server PORTVERSION= 1.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= ftp.multiplay.co.uk/pub/games/fps/eliteforce/patches/linux/ \ ftp://3dgamers.in-span.net/pub/3dgamers/games/stveliteforce/ @@ -17,20 +17,22 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux 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 +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-static + ${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-glibc2.1.3 + do-install: ${MKDIR} ${GAMEDIR} ${INSTALL_PROGRAM} ${WRKSRC}/linuxstvefded_1.2-static ${GAMEDIR} diff --git a/games/stvef-server/pkg-plist b/games/stvef-server/pkg-plist index 063c006ad23a..8375a0b53c51 100644 --- a/games/stvef-server/pkg-plist +++ b/games/stvef-server/pkg-plist @@ -1,6 +1,6 @@ -usr/games/stvef/linuxstvefded_1.2-glibc2.1.3 -usr/games/stvef/linuxstvefded_1.2-static -usr/games/stvef/readme.txt -usr/games/stvef/baseEF/server.cfg -@dirrm usr/games/stvef/baseEF -@dirrm usr/games/stvef +games/stvef/linuxstvefded_1.2-glibc2.1.3 +games/stvef/linuxstvefded_1.2-static +games/stvef/readme.txt +games/stvef/baseEF/server.cfg +@dirrm games/stvef/baseEF +@dirrm games/stvef diff --git a/games/utserver-to/Makefile b/games/utserver-to/Makefile index b2985e1aeb89..89b0e7435b8b 100644 --- a/games/utserver-to/Makefile +++ b/games/utserver-to/Makefile @@ -7,7 +7,7 @@ PORTNAME?= to PORTVERSION?= 2.2.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= games linux MASTER_SITES?= http://www.netreachgames.com/downloads/to/ \ http://downloads.fragism.com/ \ @@ -22,13 +22,12 @@ DISTNAME?= TacticalOps220 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 @@ USE_ZIP= yes .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 @@ pre-patch: # 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 --git a/games/utserver/Makefile b/games/utserver/Makefile index 1a27c4d85a83..5aa955b830c6 100644 --- a/games/utserver/Makefile +++ b/games/utserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= utserver PORTVERSION= 436 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games linux MASTER_SITES= http://public.planetmirror.com/pub/lokigames/installers/ut/ \ http://fileserver.talkware.net/ut/ @@ -22,13 +22,13 @@ BUILD_DEPENDS= ${RUN_DEPENDS} BROKEN= Incomplete pkg-plist 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 WRKSRC= ${WRKDIR}/ut-server -UTDIR= usr/games/ut-server/ +UTDIR= games/ut-server/ PLIST_SUB= UTDIR="${UTDIR}" EXTRA_PATCHES= ${WRKDIR}/patch-ngstatsut INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 diff --git a/games/utserver/pkg-message b/games/utserver/pkg-message index fbac5c6e76af..b428a91bf6af 100644 --- a/games/utserver/pkg-message +++ b/games/utserver/pkg-message @@ -7,8 +7,4 @@ user root. ------------------------------------------------------------ If you want to use ngStats and/or ngWorldStats -install linux-jdk-1.2.2 from /usr/ports/java/linux-jdk - -Install the ASU port from /usr/ports/games/utserver-asu -for easy installation of addon packages and managing -server settings. +install a 1.2 jdk from /usr/ports/java/*jdk12 diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile index bbad60918208..145787289d26 100644 --- a/german/citrix_ica/Makefile +++ b/german/citrix_ica/Makefile @@ -7,7 +7,7 @@ PORTNAME= citrix_ica PORTVERSION= 6.30.1054 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= german net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-de @@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME}-linuxx86-de MAINTAINER= mbr@FreeBSD.org COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 RESTRICTED= "License prohibits redistribution" IS_INTERACTIVE= "Noisy license agreement ignores stdin" NO_WRKSUBDIR= Yes -NO_BUILD= Yes +NO_BUILD= Yes +USE_LINUX= Yes +USE_X_PREFIX= Yes CDIR= ${PREFIX}/ICAClient BINDIR= ${PREFIX}/bin @@ -85,5 +85,6 @@ do-install: cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/german/citrix_xenapp/Makefile b/german/citrix_xenapp/Makefile index bbad60918208..145787289d26 100644 --- a/german/citrix_xenapp/Makefile +++ b/german/citrix_xenapp/Makefile @@ -7,7 +7,7 @@ PORTNAME= citrix_ica PORTVERSION= 6.30.1054 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= german net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-de @@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME}-linuxx86-de MAINTAINER= mbr@FreeBSD.org COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 RESTRICTED= "License prohibits redistribution" IS_INTERACTIVE= "Noisy license agreement ignores stdin" NO_WRKSUBDIR= Yes -NO_BUILD= Yes +NO_BUILD= Yes +USE_LINUX= Yes +USE_X_PREFIX= Yes CDIR= ${PREFIX}/ICAClient BINDIR= ${PREFIX}/bin @@ -85,5 +85,6 @@ do-install: cd ${WRKSRC} && ${LINUXBASE}/bin/sh -c './setupwfc < response' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile index 0acf731749fa..3dd4737b1ecd 100644 --- a/german/staroffice5/Makefile +++ b/german/staroffice5/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.1a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= german editors linux MASTER_SITES= ftp://ftp.hagenhomes.com/pub/ \ ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ \ @@ -21,10 +21,11 @@ MAINTAINER= mb@imp.ch COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.' IS_INTERACTIVE= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -98,6 +99,7 @@ post-install: @${CHMOD} 100755 ${PREFIX}/Office51/lib/libsdb517li.so @${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins @${INSTALL_DATA} ${FILESDIR}/dot.sversionrc /root/.sversionrc +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". install-user: ${PREFIX}/Office51/bin/setup diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index 8695f32ca341..733b7740ee31 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= german editors linux MASTER_SITES= ftp://ftp.hu-berlin.de/pub/linux/staroffice/german/ \ ftp://sunsite.cnlab-switch.ch/mirror/staroffice/deutsch/ \ @@ -30,11 +30,12 @@ EXTRACT_ONLY= 109939-03.tar.Z MAINTAINER= mbr@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +FETCH_DEPENDS= ${LINUX_BASE_PORT} NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes NO_CDROM= 'Sie muessen StarOffice manuell via WWW-Interface herunterladen.' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes @@ -192,5 +193,6 @@ post-install: install-user: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \ ${PREFIX}/office52/program/setup +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile index f450b48ce3be..79aaa6d698f4 100644 --- a/german/staroffice70/Makefile +++ b/german/staroffice70/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= german editors linux MASTER_SITES= ftp://patches.sun.com/patchroot/all_unsigned/:patch \ ftp://ftp.sun.co.uk/pub/patches/:patch \ @@ -30,13 +30,13 @@ EXTRACT_ONLY= 116518-06.tar MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' IS_INTERACTIVE= yes NO_BUILD= yes +USE_LINUX= yes +USE_X_PREFIX= yes SOVERSION= ${PORTNAME}${PORTVERSION} WRKSRC= ${WRKDIR}/${SOVERSION} TMPDIR= ${WRKDIR}/tmp @@ -246,6 +246,7 @@ post-install: @${ECHO} StarOffice7.0 has been installed successfully. In order to use @${ECHO} it, execute ${PREFIX}/bin/staroffice7. @${ECHO} +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". install-patch: @${CP} ${FILESDIR}/patchsetup.resp ${WRKSRC} diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile index c16e8e0bdae0..859d18490de8 100644 --- a/graphics/linux-ac3d/Makefile +++ b/graphics/linux-ac3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= ac3d PORTVERSION= 5.0.21 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://inivis.swmirror.com/ PKGNAMEPREFIX= linux- @@ -16,19 +17,20 @@ EXTRACT_SUFX= .tgz 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 +46,6 @@ PLIST_SUB= DYNAMIC_VERSION="" \ 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' @@ -57,6 +55,9 @@ pre-everything:: @${ECHO_MSG} '' .endif +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/${PROGRAM} + pre-install: # Generate startup script @${ECHO_CMD} "#!${SH}" > ${WRKDIR}/${PORTNAME}.sh diff --git a/graphics/linux-bmrt/Makefile b/graphics/linux-bmrt/Makefile index 356fd54e6962..b280b2566d6d 100644 --- a/graphics/linux-bmrt/Makefile +++ b/graphics/linux-bmrt/Makefile @@ -21,10 +21,7 @@ WRKSRC= ${WRKDIR}/BMRT2.6 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 @@ do-install: .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 --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile index c6226f70dda3..8b63ab7ec547 100644 --- a/graphics/linux-f10-gdk-pixbuf/Makefile +++ b/graphics/linux-f10-gdk-pixbuf/Makefile @@ -24,11 +24,10 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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 --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile index 771be258d8dd..a76aee9e8f06 100644 --- a/graphics/linux-f10-imlib/Makefile +++ b/graphics/linux-f10-imlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib PORTVERSION= 1.9.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile index a17828596f65..b62d2c2225a6 100644 --- a/graphics/linux-f10-jpeg/Makefile +++ b/graphics/linux-f10-jpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= jpeg PORTVERSION= 6b.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile index 7dc5f3cab911..8429247003be 100644 --- a/graphics/linux-f10-libmng/Makefile +++ b/graphics/linux-f10-libmng/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmng PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -22,13 +22,12 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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.${MACHINE_ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile index a552d996bb96..caf7025935e4 100644 --- a/graphics/linux-f10-png/Makefile +++ b/graphics/linux-f10-png/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile index 0172b415cec4..5307a31714f5 100644 --- a/graphics/linux-f10-png10/Makefile +++ b/graphics/linux-f10-png10/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.0.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile index 6d7f53e16e9f..6b60f37c8e41 100644 --- a/graphics/linux-f10-sdl_image/Makefile +++ b/graphics/linux-f10-sdl_image/Makefile @@ -8,6 +8,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- @@ -21,13 +22,13 @@ COMMENT= A simple library to load images as SDL interfaces (linux version) 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 --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile index 613aa8b6b490..b1514ecacddd 100644 --- a/graphics/linux-f10-tiff/Makefile +++ b/graphics/linux-f10-tiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= tiff PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_SUSE} MASTER_SITE_SUBDIR= i386/update/9.2/rpm/i586 @@ -23,15 +23,14 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm DIST_SUBDIR= rpm/i386/suse/9.2 DOCDIRS= usr/share/doc/libtiff-3.6.1 -NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= amd64 i386 PLIST= ${WRKDIR}/plist PLIST_DIRS= usr/share/doc/packages/libtiff usr/share/doc/packages PLIST_FILES= usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \ usr/share/doc/packages/libtiff/COPYRIGHT \ usr/share/doc/packages/libtiff/README -PREFIX= ${LINUXBASE} -USE_LINUX?= yes +USE_LINUX= yes +USE_LINUX_PREFIX=yes # dummy target so rpm can be in BUILD_DEPENDS do-build: @@ -40,13 +39,10 @@ do-build: do-install: ${MKDIR} ${WRKSRC} @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ - --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + --nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ || ${TRUE} post-install: - @${RM} -f ${LINUXBASE}/etc/ld.so.cache - @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ - > ${LINUXBASE}/etc/ld.so.conf @chroot ${LINUXBASE} sbin/ldconfig .include <bsd.port.mk> diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile index 479616796878..5e6c874ea956 100644 --- a/graphics/linux-f10-ungif/Makefile +++ b/graphics/linux-f10-ungif/Makefile @@ -5,7 +5,7 @@ # PORTNAME= ungif PORTVERSION= 4.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile index c6226f70dda3..8b63ab7ec547 100644 --- a/graphics/linux-f8-gdk-pixbuf/Makefile +++ b/graphics/linux-f8-gdk-pixbuf/Makefile @@ -24,11 +24,10 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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 --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile index 771be258d8dd..a76aee9e8f06 100644 --- a/graphics/linux-f8-imlib/Makefile +++ b/graphics/linux-f8-imlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib PORTVERSION= 1.9.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile index a17828596f65..b62d2c2225a6 100644 --- a/graphics/linux-f8-jpeg/Makefile +++ b/graphics/linux-f8-jpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= jpeg PORTVERSION= 6b.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile index 7dc5f3cab911..8429247003be 100644 --- a/graphics/linux-f8-libmng/Makefile +++ b/graphics/linux-f8-libmng/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmng PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -22,13 +22,12 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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.${MACHINE_ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile index a552d996bb96..caf7025935e4 100644 --- a/graphics/linux-f8-png/Makefile +++ b/graphics/linux-f8-png/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile index 0172b415cec4..5307a31714f5 100644 --- a/graphics/linux-f8-png10/Makefile +++ b/graphics/linux-f8-png10/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.0.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile index 6d7f53e16e9f..6b60f37c8e41 100644 --- a/graphics/linux-f8-sdl_image/Makefile +++ b/graphics/linux-f8-sdl_image/Makefile @@ -8,6 +8,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- @@ -21,13 +22,13 @@ COMMENT= A simple library to load images as SDL interfaces (linux version) 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 --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile index 613aa8b6b490..b1514ecacddd 100644 --- a/graphics/linux-f8-tiff/Makefile +++ b/graphics/linux-f8-tiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= tiff PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_SUSE} MASTER_SITE_SUBDIR= i386/update/9.2/rpm/i586 @@ -23,15 +23,14 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm DIST_SUBDIR= rpm/i386/suse/9.2 DOCDIRS= usr/share/doc/libtiff-3.6.1 -NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= amd64 i386 PLIST= ${WRKDIR}/plist PLIST_DIRS= usr/share/doc/packages/libtiff usr/share/doc/packages PLIST_FILES= usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \ usr/share/doc/packages/libtiff/COPYRIGHT \ usr/share/doc/packages/libtiff/README -PREFIX= ${LINUXBASE} -USE_LINUX?= yes +USE_LINUX= yes +USE_LINUX_PREFIX=yes # dummy target so rpm can be in BUILD_DEPENDS do-build: @@ -40,13 +39,10 @@ do-build: do-install: ${MKDIR} ${WRKSRC} @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ - --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + --nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ || ${TRUE} post-install: - @${RM} -f ${LINUXBASE}/etc/ld.so.cache - @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ - > ${LINUXBASE}/etc/ld.so.conf @chroot ${LINUXBASE} sbin/ldconfig .include <bsd.port.mk> diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile index 479616796878..5e6c874ea956 100644 --- a/graphics/linux-f8-ungif/Makefile +++ b/graphics/linux-f8-ungif/Makefile @@ -5,7 +5,7 @@ # PORTNAME= ungif PORTVERSION= 4.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index c6226f70dda3..8b63ab7ec547 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -24,11 +24,10 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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 --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile index 771be258d8dd..a76aee9e8f06 100644 --- a/graphics/linux-imlib/Makefile +++ b/graphics/linux-imlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib PORTVERSION= 1.9.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index a17828596f65..b62d2c2225a6 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= jpeg PORTVERSION= 6b.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile index 7dc5f3cab911..8429247003be 100644 --- a/graphics/linux-libmng/Makefile +++ b/graphics/linux-libmng/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmng PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -22,13 +22,12 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm 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.${MACHINE_ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} diff --git a/graphics/linux-panorama-tools/Makefile b/graphics/linux-panorama-tools/Makefile index fe6f59735697..ec2a448a871a 100644 --- a/graphics/linux-panorama-tools/Makefile +++ b/graphics/linux-panorama-tools/Makefile @@ -14,7 +14,7 @@ PORTNAME= linux-panorama-tools PORTVERSION= 2.6b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.path.unimelb.edu.au/~dersch/ DISTNAME= PanoTools @@ -23,12 +23,11 @@ MAINTAINER= cartola@openit.com.br COMMENT= Software to View, Create, Edit and Remap Panoramic Images RUN_DEPENDS= ${LINUXBASE}/usr/bin/jpegtran:${PORTSDIR}/graphics/linux-jpeg \ - ${LINUXBASE}/usr/bin/tiffcmp:${PORTSDIR}/graphics/linux-tiff \ + ${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \ ${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png -BROKEN= Broken dependency - NO_BUILD= yes +USE_LINUX= yes WRKSRC= ${WRKDIR}/PTLinux PROGRAM= Helpers/PTStitcher diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile index a552d996bb96..caf7025935e4 100644 --- a/graphics/linux-png/Makefile +++ b/graphics/linux-png/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.2.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile index 0172b415cec4..5307a31714f5 100644 --- a/graphics/linux-png10/Makefile +++ b/graphics/linux-png10/Makefile @@ -7,7 +7,7 @@ PORTNAME= png PORTVERSION= 1.0.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics linux MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \ http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/ diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile index 6d7f53e16e9f..6b60f37c8e41 100644 --- a/graphics/linux-sdl_image/Makefile +++ b/graphics/linux-sdl_image/Makefile @@ -8,6 +8,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- @@ -21,13 +22,13 @@ COMMENT= A simple library to load images as SDL interfaces (linux version) 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 --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile index 613aa8b6b490..b1514ecacddd 100644 --- a/graphics/linux-tiff/Makefile +++ b/graphics/linux-tiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= tiff PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_SUSE} MASTER_SITE_SUBDIR= i386/update/9.2/rpm/i586 @@ -23,15 +23,14 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm DIST_SUBDIR= rpm/i386/suse/9.2 DOCDIRS= usr/share/doc/libtiff-3.6.1 -NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= amd64 i386 PLIST= ${WRKDIR}/plist PLIST_DIRS= usr/share/doc/packages/libtiff usr/share/doc/packages PLIST_FILES= usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \ usr/share/doc/packages/libtiff/COPYRIGHT \ usr/share/doc/packages/libtiff/README -PREFIX= ${LINUXBASE} -USE_LINUX?= yes +USE_LINUX= yes +USE_LINUX_PREFIX=yes # dummy target so rpm can be in BUILD_DEPENDS do-build: @@ -40,13 +39,10 @@ do-build: do-install: ${MKDIR} ${WRKSRC} @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ - --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + --nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ || ${TRUE} post-install: - @${RM} -f ${LINUXBASE}/etc/ld.so.cache - @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ - > ${LINUXBASE}/etc/ld.so.conf @chroot ${LINUXBASE} sbin/ldconfig .include <bsd.port.mk> diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile index 479616796878..5e6c874ea956 100644 --- a/graphics/linux-ungif/Makefile +++ b/graphics/linux-ungif/Makefile @@ -5,7 +5,7 @@ # PORTNAME= ungif PORTVERSION= 4.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile index 0b39b45f9efa..099b55ea9131 100644 --- a/graphics/linux_dri/Makefile +++ b/graphics/linux_dri/Makefile @@ -7,7 +7,7 @@ PORTNAME= linux_dri PORTVERSION= 4.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \ http://people.freebsd.org/~anholt/dri/files/:anholt @@ -20,19 +20,17 @@ DIST_SUBDIR= linux_dri-${PORTVERSION} 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 @@ do-install: ${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 --git a/graphics/linux_glide/Makefile b/graphics/linux_glide/Makefile index 3dcfedc701a6..599f4fb62974 100644 --- a/graphics/linux_glide/Makefile +++ b/graphics/linux_glide/Makefile @@ -22,7 +22,7 @@ COMMENT= Linux library implementing the GLIDE interface to 3dfx video cards 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 --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile index 0a9c33a1abb5..8dc9521a2e28 100644 --- a/graphics/linux_glx/Makefile +++ b/graphics/linux_glx/Makefile @@ -7,7 +7,7 @@ PORTNAME= glx PORTVERSION= 991127 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= 3d/glx/linux @@ -17,17 +17,15 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Libraries to make use of glx-aware Linux apps -BUILD_DEPENDS= ${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8 +BUILD_DEPENDS= ${LINUX_BASE_PORT} USE_BZIP2= yes NO_BUILD= yes +USE_LINUX= yes USE_LINUX_PREFIX=yes -NO_MTREE= yes WRKSRC= ${WRKDIR}/linux_glx -# switch off stripping during INSTALL_PROGRAM -STRIP= .include <bsd.port.pre.mk> @@ -35,13 +33,11 @@ STRIP= IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*" .endif -# NEVER EVER use plain INSTALL_PROGRAM on Linux binaries, -# as they get stripped! do-install: ${INSTALL_PROGRAM} ${WRKSRC}/libGL.so ${PREFIX}/lib ${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so ${PREFIX}/lib ${INSTALL_PROGRAM} ${WRKSRC}/libglut.so ${PREFIX}/lib post-install: - @ ${PREFIX}/sbin/ldconfig + @${LINUXBASE}/sbin/ldconfig .include <bsd.port.post.mk> diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile index f993e307793b..868f2b815316 100644 --- a/graphics/linux_mesa3/Makefile +++ b/graphics/linux_mesa3/Makefile @@ -7,7 +7,7 @@ PORTNAME= mesa PORTVERSION= 3.4.2 -PORTREVISION= 5 +PORTREVISION= 6 MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/linux/redhat/redhat/updates/7.2/en/os/i386/ \ ftp://ftp.uni-kl.de/pub/linux/redhat/redhat/updates/7.2/en/os/i386/ \ ftp://ftp.icm.edu.pl/mirrors/ftp.redhat.com/pub/redhat/linux/updates/7.2/en/os/i386/ \ @@ -20,8 +20,7 @@ CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= A graphics library similar to SGI's OpenGL, used from Linux programs -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - +USE_XLIB= yes BASEVERSION=7.2 ONLY_FOR_ARCHS= i386 PLIST= ${PKGDIR}/pkg-plist diff --git a/japanese/acroread/Makefile b/japanese/acroread/Makefile index 5da96b54ddce..cde175cf4685 100644 --- a/japanese/acroread/Makefile +++ b/japanese/acroread/Makefile @@ -17,8 +17,7 @@ COMMENT= Adobe Reader which allows view, print, and search PDF documents BUILD_DEPENDS= ${LOCALBASE}/bin/jless:${PORTSDIR}/japanese/less RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \ - ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango \ - ${LINUXBASE}/usr/X11R6/lib/libXext.so.6:${PORTSDIR}/x11/linux-XFree86-libs + ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango RESTRICTED= "Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html" NO_PACKAGE= "Use and redistribution with repackaging are not allowed" @@ -26,9 +25,9 @@ IS_INTERACTIVE= yes CONFLICTS= acroread-[0-9]* acroread[57]-[0-9]* \ ja-acroread5-[0-9]* ONLY_FOR_ARCHS= amd64 i386 -USE_LINUX?= yes +USE_LINUX= yes +USE_X_PREFIX= yes NO_BUILD= yes -NO_FILTER_SHLIBS= yes PLIST_SUB= ACRODIR=${ACRODIR} SUB_FILES= acroread SUB_LIST= INSTALLDIR=${INSTALLDIR} @@ -43,6 +42,7 @@ INSTALLEXEC= ${SETENV} UNAME_s=Linux \ ${SH} ./INSTALL do-install: +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". ${MKDIR} ${INSTALLDIR} cd ${WRKSRC} && ${INSTALLEXEC} # disable the PPKLite plugin as it requires an LDAP share lib diff --git a/japanese/linux-ttfonts/Makefile b/japanese/linux-ttfonts/Makefile index 2462b5142f69..793d6f03446e 100644 --- a/japanese/linux-ttfonts/Makefile +++ b/japanese/linux-ttfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ttfonts-ja PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese x11-fonts linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -25,6 +25,7 @@ pre-install: rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} ja | ${SED} -e 's:^:@dirrm :' \ - >> ${PLIST} + >> ${PLIST}; \ + ${ECHO_CMD} '@unexec rmdir %D/usr/share/fonts 2>&1 >/dev/null || true' >> ${PLIST} .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/japanese/slimeforest/Makefile b/japanese/slimeforest/Makefile index d3acda8323f8..e29e83da10a1 100644 --- a/japanese/slimeforest/Makefile +++ b/japanese/slimeforest/Makefile @@ -7,6 +7,7 @@ PORTNAME= slimeforest PORTVERSION= 0.51 +PORTREVISION= 1 CATEGORIES= japanese games linux MASTER_SITES= http://lrnj.com/sfa/ DISTNAME= sfa @@ -18,6 +19,7 @@ COMMENT= A NES RPG game for learning KANA and KANJI (linux version) 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 --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile index 6c0c7e7ae315..68a241f49a86 100644 --- a/java/linux-blackdown-jdk12/Makefile +++ b/java/linux-blackdown-jdk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= 1.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java devel MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \ ${MASTER_SITE_LOCAL} @@ -18,8 +18,7 @@ DISTNAME= j2sdk-${PORTVERSION}-FCS-linux-${ARCH}-glibc-2.1.3 MAINTAINER= java@FreeBSD.org COMMENT= Blackdown Java Development Kit 1.2 for Linux -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee" NO_PACKAGE= "License doesn\'t allow binary distributions" @@ -28,6 +27,8 @@ LATEST_LINK= linux-blackdown-jdk12 ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= YES +USE_LINUX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} NO_BUILD= YES APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} @@ -37,6 +38,8 @@ post-patch: ${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \ | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-blackdown-jdk13/Makefile b/java/linux-blackdown-jdk13/Makefile index de20e61c79c5..419cf5f8d23f 100644 --- a/java/linux-blackdown-jdk13/Makefile +++ b/java/linux-blackdown-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java MASTER_SITES= ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/${DOWNLOAD_DIR}/ \ ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \ @@ -21,13 +21,14 @@ COMMENT= Blackdown Java Development Kit 1.3 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes LATEST_LINK= linux-blackdown-jdk13 ONLY_FOR_ARCHS= i386 amd64 @@ -52,6 +53,8 @@ post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f @${ECHO} " [ DONE ]" +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile index d1ab4947ff21..95e2d4e3ee6b 100644 --- a/java/linux-blackdown-jdk14/Makefile +++ b/java/linux-blackdown-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \ ftp://ftp.tux.org/pub/java/${DOWNLOAD_DIR}/ @@ -18,13 +18,14 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Blackdown Java Development Kit 1.4 for Linux -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper EXTRACT_CMD= ${TAIL} EXTRACT_BEFORE_ARGS= +564 EXTRACT_AFTER_ARGS= | ${BZIP2_CMD} -dc | ${TAR} xf - USE_BZIP2= yes +USE_LINUX= yes +USE_XLIB= yes LATEST_LINK= linux-blackdown-jdk14 WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION} @@ -53,6 +54,8 @@ post-patch: @${RM} -rf ${WRKSRC}/demo/plugin/jfc/SwingSet2/resources @${ECHO} " [ DONE ]" +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-blackdown-jre11/Makefile b/java/linux-blackdown-jre11/Makefile index b8f18a6f881c..bca155764490 100644 --- a/java/linux-blackdown-jre11/Makefile +++ b/java/linux-blackdown-jre11/Makefile @@ -7,7 +7,7 @@ PORTNAME= jre PORTVERSION= ${JRE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= ftp://gd.tuwien.ac.at/opsys/linux/java/JDK-${PORTVERSION}/${ARCH}/v3/ \ ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-${PORTVERSION}/i386/v3/ \ @@ -20,8 +20,7 @@ DISTNAME= jre118_v3-glibc-2.1.3 MAINTAINER= sime@logos.hr COMMENT= Blackdown Linux Java Runtime Environment 1.1.8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee" NO_PACKAGE= "License doesn\'t allow binary distributions" @@ -29,6 +28,8 @@ NO_PACKAGE= "License doesn\'t allow binary distributions" ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= YES +USE_LINUX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/jre118_v3 JRE_VERSION= 1.1.8 PLIST_SUB+= JRE_VERSION=${JRE_VERSION} @@ -42,6 +43,8 @@ post-patch: ${CHMOD} a+rx ${WRKSRC}/bin/arch ${CHMOD} a+r ${WRKSRC}/README.linux +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile index 0d560586a354..ee4647760f3c 100644 --- a/java/linux-ibm-jdk13/Makefile +++ b/java/linux-ibm-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 9 # SR7 +PORTREVISION= 10 # SR7 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-ibm- @@ -19,13 +19,14 @@ COMMENT= IBM Java Development Kit 1.3 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${DISTNAME:S/-SDK//} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.3.1 LATEST_LINK= linux-ibm-jdk13 ONLY_FOR_ARCHS= i386 amd64 @@ -60,6 +61,8 @@ post-patch: fi \ done +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . \ diff --git a/java/linux-ibm-jdk14/Makefile b/java/linux-ibm-jdk14/Makefile index aa07c205a41b..c45b1fff51db 100644 --- a/java/linux-ibm-jdk14/Makefile +++ b/java/linux-ibm-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java PKGNAMEPREFIX= linux-ibm- DISTNAME= IBMJava2-SDK-${JDK_VERSION:S/.//g} @@ -18,8 +18,7 @@ COMMENT= IBM Java Development Kit 1.4 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${DISTNAME:S/-SDK//} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} @@ -28,6 +27,8 @@ PLIST_SUB+= PORTREVISION=${PORTREVISION} NO_BUILD= yes USE_REINPLACE= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.4.2 ONLY_FOR_ARCHS= i386 amd64 APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} @@ -54,6 +55,8 @@ post-patch: ${REINPLACE_CMD} -e "s:%%APP_HOME%%:${APP_HOME}:g" ${WRKSRC}/bin/java-rmi.cgi @${RM} -f ${WRKSRC}/bin/java-rmi.cgi.* +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . \ diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile index 6d8829eddc48..21b6daf9b76e 100644 --- a/java/linux-sun-jdk12/Makefile +++ b/java/linux-sun-jdk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -16,14 +16,15 @@ DISTNAME= ${PORTNAME}-${JDK_VERSION:S/./_/g}-linux-i586 MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.2 for Linux -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} LATEST_LINK= linux-sun-jdk12 NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.2.2.017 ONLY_FOR_ARCHS= i386 amd64 @@ -42,6 +43,8 @@ IGNORE=You must manually fetch the Sun Java 2 Standard Edition SDK ${JDK_VERSION post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO_CMD} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index 344c269e06bc..c830d138d231 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -17,9 +17,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.3 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +29,8 @@ PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} \ JDK_VERSION=${JDK_VERSION} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.3.1 JDK_REVISION= 15 ONLY_FOR_ARCHS= i386 amd64 @@ -64,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 0263e7d9f954..76588e750681 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${INSTALL_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -17,9 +17,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.4 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +29,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.4.2 JDK_REVISION= 08 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -60,6 +61,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile index cee762130cd5..3d6e42457341 100644 --- a/java/linux-sun-jdk15/Makefile +++ b/java/linux-sun-jdk15/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${DL_JDK_VERSION:S/_/./g} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= java devel MASTER_SITES= # @@ -17,9 +18,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.5 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +30,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.5.0 JDK_REVISION= 03 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -63,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index cee762130cd5..3d6e42457341 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${DL_JDK_VERSION:S/_/./g} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= java devel MASTER_SITES= # @@ -17,9 +18,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.5 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +30,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.5.0 JDK_REVISION= 03 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -63,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/korean/linux_locale/Makefile b/korean/linux_locale/Makefile index 02b0c1db36f3..23a831cc1132 100644 --- a/korean/linux_locale/Makefile +++ b/korean/linux_locale/Makefile @@ -15,17 +15,15 @@ DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= cjh@kr.freebsd.org COMMENT= Glibc 2.0 Korean locale for linux compatibility -BUILD_DEPENDS= ${LINUXBASE}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base-8 +BUILD_DEPENDS= ${LINUX_BASE_PORT} -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 +USE_LINUX= yes 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 --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile index e767565034b4..c3067af81f74 100644 --- a/lang/compaq-cc/Makefile +++ b/lang/compaq-cc/Makefile @@ -40,9 +40,7 @@ EXTRACT_AFTER_ARGS= |${CPIO} -idum EXTRACT_ONLY= NO_WRKSUBDIR= yes NO_BUILD= yes -NO_FILTER_SHLIBS= yes -NO_MTREE= yes -USE_LINUX?= yes +USE_LINUX= yes .include <bsd.port.pre.mk> diff --git a/lang/freetxl/Makefile b/lang/freetxl/Makefile index f7e5a843154d..9fa645c87cc9 100644 --- a/lang/freetxl/Makefile +++ b/lang/freetxl/Makefile @@ -7,6 +7,7 @@ PORTNAME= freetxl PORTVERSION= 10.3 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.sasknow.com/pub/txl/ DISTNAME= txl${PORTVERSION}.linux @@ -14,15 +15,17 @@ DISTNAME= txl${PORTVERSION}.linux 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/txldb + do-install: ${INSTALL_PROGRAM} \ ${WRKSRC}/bin/txl \ diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 623f73484a05..f4bde4aef709 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -18,7 +18,7 @@ PATCHLEVEL= ${PORTVERSION:C/(.+p)(.+)$/pe\2/} 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= ${LINUX_BASE_PORT} .endif EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio @@ -30,9 +30,8 @@ NO_CDROM= ${RESTRICTED} 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 @@ do-build: @${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 --git a/lang/icc7/Makefile b/lang/icc7/Makefile index 2b53d3fc3c7b..1aab74063658 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -25,10 +25,9 @@ NO_CDROM= ${RESTRICTED} 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 @@ do-build: @${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 --git a/lang/ifc/Makefile b/lang/ifc/Makefile index 4287cd8a7603..9865fd6d544c 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -18,7 +18,7 @@ PATCHLEVEL= ${PORTVERSION:C/(.+p)(.+)$/pe\2/} 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= ${LINUX_BASE_PORT} .endif EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio @@ -30,7 +30,7 @@ NO_CDROM= ${RESTRICTED} ONLY_FOR_ARCHS= i386 CONFLICTS= linux_devtools* -USE_LINUX?= yes +USE_LINUX= yes USE_REINPLACE= yes NO_FILTER_SHLIBS= yes @@ -191,7 +191,8 @@ do-build: @${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 --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile index d5cb8fd02ad6..06eed2750ba0 100644 --- a/lang/ifc7/Makefile +++ b/lang/ifc7/Makefile @@ -24,10 +24,9 @@ NO_CDROM= ${RESTRICTED} 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 @@ do-build: @${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 --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index f041750145ff..8d2fcbf86667 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -17,7 +17,7 @@ COMMENT= A general purpose programming language RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper -USE_LINUX?= yes +USE_LINUX= yes USE_JAVA= yes JAVA_VERSION= 1.3+ diff --git a/lang/visualworks/Makefile b/lang/visualworks/Makefile index 22f46ff08290..74d71e8f1aa7 100644 --- a/lang/visualworks/Makefile +++ b/lang/visualworks/Makefile @@ -18,7 +18,7 @@ EXTRACT_ONLY= 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 --git a/mail/mulberry/Makefile b/mail/mulberry/Makefile index dffa15c9e4d8..dad88dc58b57 100644 --- a/mail/mulberry/Makefile +++ b/mail/mulberry/Makefile @@ -7,7 +7,7 @@ PORTNAME= mulberry PORTVERSION= 3.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.cyrusoft.com/pub/Mulberry/v${PORTVERSION:S/./_/g}/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}-rh6 @@ -18,10 +18,9 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= girgen@FreeBSD.org COMMENT= A scalable high-performance GUI internet Mail User Agent -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - -NO_BUILD= yes NO_WRKSUBDIR= yes +USE_LINUX= yes +USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 .include <bsd.port.pre.mk> @@ -44,10 +43,13 @@ INSTALL_DIR?= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 PLUGINSDIR= ${PREFIX}/lib/${PORTNAME}/Plug-ins PIXMAPSDIR= ${PREFIX}/share/pixmaps +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME} + do-install: ${INSTALL_DIR} ${PLUGINSDIR} ${INSTALL_DIR} ${PIXMAPSDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Plug-ins/* ${PLUGINSDIR} ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/icons/* ${PIXMAPSDIR} .if !defined(NOPORTDOCS) diff --git a/math/dislin/Makefile b/math/dislin/Makefile index cc31541939b3..67ef1708441e 100644 --- a/math/dislin/Makefile +++ b/math/dislin/Makefile @@ -7,7 +7,7 @@ PORTNAME= dislin PORTVERSION= 8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math linux MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/ PKGNAMEPREFIX= linux- @@ -17,13 +17,12 @@ DIST_SUBDIR= ${MACHINE_ARCH} 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.${MACHINE_ARCH} @@ -39,6 +38,8 @@ do-configure: ${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) ${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin diff --git a/math/linux-dislin/Makefile b/math/linux-dislin/Makefile index cc31541939b3..67ef1708441e 100644 --- a/math/linux-dislin/Makefile +++ b/math/linux-dislin/Makefile @@ -7,7 +7,7 @@ PORTNAME= dislin PORTVERSION= 8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math linux MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/ PKGNAMEPREFIX= linux- @@ -17,13 +17,12 @@ DIST_SUBDIR= ${MACHINE_ARCH} 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.${MACHINE_ARCH} @@ -39,6 +38,8 @@ do-configure: ${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) ${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile index d6a659195797..e51c3f99abb5 100644 --- a/math/linux-relview/Makefile +++ b/math/linux-relview/Makefile @@ -7,7 +7,7 @@ PORTNAME= relview PORTVERSION= 7.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math linux MASTER_SITES= ftp://ftp.informatik.uni-kiel.de/pub/kiel/relview/RELVIEW_7.0/LINUX/ PKGNAMEPREFIX= linux- @@ -19,6 +19,8 @@ COMMENT= An interactive tool for manipulation of relations 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} @@ -27,10 +29,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} ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin diff --git a/math/mupad/Makefile b/math/mupad/Makefile index 10054f365caa..e8e70eb02214 100644 --- a/math/mupad/Makefile +++ b/math/mupad/Makefile @@ -20,11 +20,9 @@ EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio 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 --git a/math/wingz/Makefile b/math/wingz/Makefile index 975b924b34b0..9355b4379f39 100644 --- a/math/wingz/Makefile +++ b/math/wingz/Makefile @@ -16,12 +16,13 @@ EXTRACT_SUFX= .tgz 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 --git a/math/wingz3/Makefile b/math/wingz3/Makefile index d0f61b176af9..bbd34b89187f 100644 --- a/math/wingz3/Makefile +++ b/math/wingz3/Makefile @@ -7,7 +7,7 @@ PORTNAME= wingzpro PORTVERSION= 311 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math linux MASTER_SITES= netu EXTRACT_ONLY= @@ -15,13 +15,12 @@ EXTRACT_ONLY= 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: @@ -33,6 +32,8 @@ do-fetch: # 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} ${SED} 's%_X11BASE_%${X11BASE}%' \ diff --git a/misc/ftree/Makefile b/misc/ftree/Makefile index d4f217e13dff..f42fadae39cd 100644 --- a/misc/ftree/Makefile +++ b/misc/ftree/Makefile @@ -7,7 +7,7 @@ PORTNAME= ftree PORTVERSION= 1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc linux MASTER_SITES= http://www.vjet.demon.co.uk/ftree/ \ http://www.unknown.nu/ports/ @@ -17,23 +17,18 @@ EXTRACT_SUFX= .tgz 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 --git a/misc/linux-edonkey-tool-list/Makefile b/misc/linux-edonkey-tool-list/Makefile index 3f3de502a2e8..e94d56c354a4 100644 --- a/misc/linux-edonkey-tool-list/Makefile +++ b/misc/linux-edonkey-tool-list/Makefile @@ -20,19 +20,10 @@ MAINTAINER= ports@FreeBSD.org 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 @@ do-install: .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 --git a/misc/linux-edonkey-tool-recovermet/Makefile b/misc/linux-edonkey-tool-recovermet/Makefile index 35befd2aae5a..06eb58419530 100644 --- a/misc/linux-edonkey-tool-recovermet/Makefile +++ b/misc/linux-edonkey-tool-recovermet/Makefile @@ -20,19 +20,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool that tries to re-create x.part.met files compromised due to crash ONLY_FOR_ARCHS= i386 -USE_LINUX?= yes +USE_LINUX= yes NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/edonkey-tool-recovermet -STRIP= - -STRIP_CMD= ${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?= /usr/bin/brandelf -.else -BRANDELF?= brandelf -.endif BINARY_NAME= ${PORTNAME}${PKGNAMESUFFIX} diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile index 9a0914c8731e..7745b417dec5 100644 --- a/misc/linux-opengroupware/Makefile +++ b/misc/linux-opengroupware/Makefile @@ -6,7 +6,7 @@ PORTNAME= opengroupware PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc www linux MASTER_SITES= http://download.opengroupware.org/packages/freebsd/linux-opengroupware/RPMS/:ogo \ http://download.opengroupware.org/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \ @@ -22,11 +22,12 @@ MAINTAINER= frank@opengroupware.org COMMENT= Groupware package including mail, calendar, palm sync and much more EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm -INSTALL_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ - ${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \ +RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \ ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake +USE_PGSQL= yes + #BEGINSET1 SET1= opengroupware-core-4.2-ogo107.i386.rpm:ogo \ @@ -105,7 +106,7 @@ SET3= postgresql-libs-7.2.4-5.80.i386.rpm \ NGOBJWEB_ADAPTOR= opengroupware.org-mod_ngobjweb-200407092000.tar.gz PATCHDIR?= ${MASTERDIR}/files -USE_LINUX?= yes +USE_LINUX= yes USE_GMAKE= yes MAKEFILE= ${WRKSRC}/opengroupware.org-mod_ngobjweb/GNUmakefile BUILD_WRKSRC?= ${WRKSRC}/opengroupware.org-mod_ngobjweb diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile index adaac7516ee6..6318e9302045 100644 --- a/misc/opencyc/Makefile +++ b/misc/opencyc/Makefile @@ -7,7 +7,7 @@ PORTNAME= opencyc PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc linux MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,8 +16,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= alexs@snark.rinet.ru COMMENT= General knowledge base and commonsense reasoning engine -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - +USE_LINUX= yes +USE_X_PREFIX= yes NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/multimedia/linux-divx4linux/Makefile b/multimedia/linux-divx4linux/Makefile index ea99d0e27262..09deeeb7c794 100644 --- a/multimedia/linux-divx4linux/Makefile +++ b/multimedia/linux-divx4linux/Makefile @@ -21,7 +21,7 @@ RESTRICTED= unsure of licensing issues 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}" @@ -36,9 +36,9 @@ post-patch: do-install: .ifndef(NOPORTDOCS) - @${MKDIR} ${PREFIX}/usr/doc/${PKGNAME} + @${MKDIR} ${PREFIX}/usr/share/doc/${PKGNAME} .for ext in ${DOC_EXT} - @${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/usr/doc/${PKGNAME} + @${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/usr/share/doc/${PKGNAME} .endfor .endif # Header file installation diff --git a/multimedia/linux-divx4linux/pkg-plist b/multimedia/linux-divx4linux/pkg-plist index 75699b08eb64..085d691abea2 100644 --- a/multimedia/linux-divx4linux/pkg-plist +++ b/multimedia/linux-divx4linux/pkg-plist @@ -1,4 +1,4 @@ -%%PORTDOCS%%usr/doc/%%PKGNAME%%/DivX MPEG-4 Codec and Its Interface.htm +%%PORTDOCS%%usr/share/doc/%%PKGNAME%%/DivX MPEG-4 Codec and Its Interface.htm usr/include/divx/decore.h usr/include/divx/encore2.h usr/include/divx/portab.h @@ -7,6 +7,6 @@ usr/lib/libdivxdecore.so.0 usr/lib/libdivxencore.so usr/lib/libdivxencore.so.0 @dirrm usr/include/divx -%%PORTDOCS%%@dirrm usr/doc/%%PKGNAME%% +%%PORTDOCS%%@dirrm usr/share/doc/%%PKGNAME%% @exec %D/sbin/ldconfig @unexec %D/sbin/ldconfig diff --git a/multimedia/linux-divx4linux4/Makefile b/multimedia/linux-divx4linux4/Makefile index 447ee92a1dd9..6b4c1dfe5ebf 100644 --- a/multimedia/linux-divx4linux4/Makefile +++ b/multimedia/linux-divx4linux4/Makefile @@ -21,7 +21,7 @@ RESTRICTED= unsure of licensing issues ONLY_FOR_ARCHS= i386 USE_LINUX_PREFIX= yes -USE_LINUX?= yes +USE_LINUX= yes USE_REINPLACE= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/_.+$//} NO_BUILD= yes @@ -39,9 +39,9 @@ post-patch: do-install: .ifndef(NOPORTDOCS) - @${MKDIR} ${PREFIX}/usr/doc/${PKGNAME} + @${MKDIR} ${PREFIX}/usr/share/doc/${PKGNAME} .for ext in linux txt - @${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/usr/doc/${PKGNAME} + @${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/usr/share/doc/${PKGNAME} .endfor .endif # Header file installation diff --git a/multimedia/linux-divx4linux4/pkg-plist b/multimedia/linux-divx4linux4/pkg-plist index 695fccc4437a..04a47f44f1a8 100644 --- a/multimedia/linux-divx4linux4/pkg-plist +++ b/multimedia/linux-divx4linux4/pkg-plist @@ -1,6 +1,6 @@ -%%PORTDOCS%%usr/doc/%%PKGNAME%%/Codec Core Interface.txt -%%PORTDOCS%%usr/doc/%%PKGNAME%%/license.txt -%%PORTDOCS%%usr/doc/%%PKGNAME%%/RELNOTES.linux +%%PORTDOCS%%usr/share/doc/%%PKGNAME%%/Codec Core Interface.txt +%%PORTDOCS%%usr/share/doc/%%PKGNAME%%/license.txt +%%PORTDOCS%%usr/share/doc/%%PKGNAME%%/RELNOTES.linux usr/include/divx4/decore.h usr/include/divx4/encore2.h usr/include/divx4/mv_hint.h @@ -8,4 +8,4 @@ usr/lib/divx4/libdivxdecore.so usr/lib/divx4/libdivxencore.so @dirrm usr/lib/divx4 @dirrm usr/include/divx4 -%%PORTDOCS%%@dirrm usr/doc/%%PKGNAME%% +%%PORTDOCS%%@dirrm usr/share/doc/%%PKGNAME%% diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index 0fd36f01175a..50c9e55a8813 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/linux-realplayer/Makefile @@ -7,6 +7,7 @@ PORTNAME= linux-realplayer PORTVERSION= 10.0.4 +PORTREVISION= 1 CATEGORIES= multimedia audio linux MASTER_SITES= https://helixcommunity.org/download.php/1145/ DISTNAME= RealPlayer-10.0.4.750-20050401.i586 @@ -21,13 +22,11 @@ RUN_DEPENDS= \ WRKSRC= ${WRKDIR}/usr/local/RealPlayer ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= 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 RABINDIR= ${PREFIX}/bin @@ -73,6 +72,7 @@ do-install: ${MKDIR} ${RADIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${RADIR} ${INSTALL_PROGRAM} ${WRKSRC}/realplay.bin ${RADIR} + ${BRANDELF} -t Linux ${RADIR}/realplay.bin .for dir in codecs common lib plugins share/default share/realplay ${MKDIR} ${RADIR}/${dir} diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile index 467ecc9d72fc..f6b0c6d8a004 100644 --- a/multimedia/linux-xmovie/Makefile +++ b/multimedia/linux-xmovie/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmovie PORTVERSION= 1.9.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia linux MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= heroines @@ -19,23 +19,17 @@ MAINTAINER= lioux@FreeBSD.org 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 --git a/multimedia/mtv/Makefile b/multimedia/mtv/Makefile index c96b9adf8db3..7780417400ce 100644 --- a/multimedia/mtv/Makefile +++ b/multimedia/mtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= mtv PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia linux MASTER_SITES= ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz libSDLx11.so.tar.gz @@ -15,18 +15,19 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz libSDLx11.so.tar.gz 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 @@ do-install: ${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 --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile index a276126d7c75..eaa77651291b 100644 --- a/multimedia/netshow/Makefile +++ b/multimedia/netshow/Makefile @@ -7,7 +7,7 @@ PORTNAME= netshow PORTVERSION= 2.00.251 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia linux net MASTER_SITES= http://www.microsoft.com/netshow/download/en/beta/ DISTNAME= netshow_linux @@ -16,16 +16,13 @@ EXTRACT_SUFX= .gz 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 @@ pre-extract: 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 --git a/net-im/aim/Makefile b/net-im/aim/Makefile index f4c3788f8cbf..8c4452148451 100644 --- a/net-im/aim/Makefile +++ b/net-im/aim/Makefile @@ -7,7 +7,7 @@ PORTNAME= aim PORTVERSION= 1.5.286 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net linux MASTER_SITES= ftp://ftp.newaol.com/aimgen/380469/ DISTNAME= aim-${PORTVERSION} @@ -19,15 +19,14 @@ COMMENT= AOL's Instant Messenger (AIM) client 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/aim (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 @@ -36,7 +35,7 @@ do-install: ${CHMOD} ${BINMODE} ${PREFIX}/bin/aim post-install: -.if !exists(/compat/linux/usr/bin/esdplay) && !exists(${PREFIX}/bin/esdplay) +.if !exists(${LINUXBASE}/usr/bin/esdplay) && !exists(${PREFIX}/bin/esdplay) @${ECHO_MSG} "-----------------------------------------------------------------" @${ECHO_MSG} "Install audio/linux-esound or disable Sounds in aim's Preferences" @${ECHO_MSG} "-----------------------------------------------------------------" diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index 965e7e9852a7..a98ea5d42956 100644 --- a/net-im/skype-devel/Makefile +++ b/net-im/skype-devel/Makefile @@ -15,11 +15,11 @@ MAINTAINER= netchild@FreeBSD.org 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 amd64 diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index 965e7e9852a7..a98ea5d42956 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -15,11 +15,11 @@ MAINTAINER= netchild@FreeBSD.org 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 amd64 diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile index 965e7e9852a7..a98ea5d42956 100644 --- a/net-im/skype20/Makefile +++ b/net-im/skype20/Makefile @@ -15,11 +15,11 @@ MAINTAINER= netchild@FreeBSD.org 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 amd64 diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile index caeb58f690ae..d0831a85a470 100644 --- a/net-p2p/linux-agsatellite/Makefile +++ b/net-p2p/linux-agsatellite/Makefile @@ -7,7 +7,7 @@ PORTNAME= agsatellite PORTVERSION= 0.520 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net audio linux MASTER_SITES= http://www.audiogalaxy.com/downloads/ PKGNAMEPREFIX= linux- @@ -16,19 +16,16 @@ DISTNAME= AGSatellite${PORTVERSION:S/.//}-glibc21 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 @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile index d05dda04e973..f6a53b4c3e60 100644 --- a/net-p2p/linux-edonkey-core/Makefile +++ b/net-p2p/linux-edonkey-core/Makefile @@ -22,7 +22,6 @@ ONLY_FOR_ARCHS= i386 USE_LINUX= yes NO_BUILD= yes NO_WRKSUBDIR= yes -STRIP= BINARY_NAME_OLD?= ${PORTNAME}clc BINARY_NAME= donkey @@ -30,7 +29,6 @@ BINARY_NAME= donkey DOC_FILES= ChangeLog LISEZMOI README changelog.Debian.gz pre-install: - @${BRANDELF} -t Linux ${WRKSRC}/usr/bin/${BINARY_NAME_OLD} do-install: diff --git a/net-p2p/linux-edonkey-server/Makefile b/net-p2p/linux-edonkey-server/Makefile index 56ebe7e9fc78..d6128236f5a1 100644 --- a/net-p2p/linux-edonkey-server/Makefile +++ b/net-p2p/linux-edonkey-server/Makefile @@ -20,21 +20,12 @@ MAINTAINER= ports@FreeBSD.org 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 @@ do-install: .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 --git a/net-p2p/linux-edonkey-tool-recovermet/Makefile b/net-p2p/linux-edonkey-tool-recovermet/Makefile index 35befd2aae5a..06eb58419530 100644 --- a/net-p2p/linux-edonkey-tool-recovermet/Makefile +++ b/net-p2p/linux-edonkey-tool-recovermet/Makefile @@ -20,19 +20,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool that tries to re-create x.part.met files compromised due to crash ONLY_FOR_ARCHS= i386 -USE_LINUX?= yes +USE_LINUX= yes NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/edonkey-tool-recovermet -STRIP= - -STRIP_CMD= ${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?= /usr/bin/brandelf -.else -BRANDELF?= brandelf -.endif BINARY_NAME= ${PORTNAME}${PKGNAMESUFFIX} diff --git a/net-p2p/linux-jigdo/Makefile b/net-p2p/linux-jigdo/Makefile index ca49a96551eb..75b3b712141b 100644 --- a/net-p2p/linux-jigdo/Makefile +++ b/net-p2p/linux-jigdo/Makefile @@ -21,9 +21,8 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget 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 @@ SCRIPTS= jigdo-lite jigdo-mirror 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 --git a/net-p2p/linux-overnet-core/Makefile b/net-p2p/linux-overnet-core/Makefile index 512dd38ea104..6ee5d30d3cfe 100644 --- a/net-p2p/linux-overnet-core/Makefile +++ b/net-p2p/linux-overnet-core/Makefile @@ -18,10 +18,9 @@ MAINTAINER= arundel@h3c.de 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 --git a/net-p2p/peercast/Makefile b/net-p2p/peercast/Makefile index 2886103c43d5..d48dbd357d3c 100644 --- a/net-p2p/peercast/Makefile +++ b/net-p2p/peercast/Makefile @@ -18,7 +18,6 @@ COMMENT= A peer-to-peer network for broadcasting and listening to streams USE_LINUX= yes NO_WRKSUBDIR= yes NO_BUILD= yes -STRIP= # empty: do not strip linux binaries SUB_FILES= peercast.sh diff --git a/net/aim/Makefile b/net/aim/Makefile index f4c3788f8cbf..8c4452148451 100644 --- a/net/aim/Makefile +++ b/net/aim/Makefile @@ -7,7 +7,7 @@ PORTNAME= aim PORTVERSION= 1.5.286 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net linux MASTER_SITES= ftp://ftp.newaol.com/aimgen/380469/ DISTNAME= aim-${PORTVERSION} @@ -19,15 +19,14 @@ COMMENT= AOL's Instant Messenger (AIM) client 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/aim (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 @@ -36,7 +35,7 @@ do-install: ${CHMOD} ${BINMODE} ${PREFIX}/bin/aim post-install: -.if !exists(/compat/linux/usr/bin/esdplay) && !exists(${PREFIX}/bin/esdplay) +.if !exists(${LINUXBASE}/usr/bin/esdplay) && !exists(${PREFIX}/bin/esdplay) @${ECHO_MSG} "-----------------------------------------------------------------" @${ECHO_MSG} "Install audio/linux-esound or disable Sounds in aim's Preferences" @${ECHO_MSG} "-----------------------------------------------------------------" diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 6528556ea0bc..d8e16dc85412 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -7,6 +7,7 @@ PORTNAME= citrix_ica PORTVERSION= 9.00 +PORTREVISION= 1 CATEGORIES= net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} @@ -14,10 +15,11 @@ DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} MAINTAINER= mbr@FreeBSD.org COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes RESTRICTED= "License prohibits redistribution" IS_INTERACTIVE= "Noisy license agreement ignores stdin" @@ -79,5 +81,6 @@ do-install: cd ${WRKSRC} && /bin/sh -c './setupwfc' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile index 6528556ea0bc..d8e16dc85412 100644 --- a/net/citrix_xenapp/Makefile +++ b/net/citrix_xenapp/Makefile @@ -7,6 +7,7 @@ PORTNAME= citrix_ica PORTVERSION= 9.00 +PORTREVISION= 1 CATEGORIES= net comms linux MASTER_SITES= DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} @@ -14,10 +15,11 @@ DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} MAINTAINER= mbr@FreeBSD.org COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes RESTRICTED= "License prohibits redistribution" IS_INTERACTIVE= "Noisy license agreement ignores stdin" @@ -79,5 +81,6 @@ do-install: cd ${WRKSRC} && /bin/sh -c './setupwfc' ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". .include <bsd.port.post.mk> diff --git a/net/linux-agsatellite/Makefile b/net/linux-agsatellite/Makefile index caeb58f690ae..d0831a85a470 100644 --- a/net/linux-agsatellite/Makefile +++ b/net/linux-agsatellite/Makefile @@ -7,7 +7,7 @@ PORTNAME= agsatellite PORTVERSION= 0.520 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net audio linux MASTER_SITES= http://www.audiogalaxy.com/downloads/ PKGNAMEPREFIX= linux- @@ -16,19 +16,16 @@ DISTNAME= AGSatellite${PORTVERSION:S/.//}-glibc21 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 @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ diff --git a/net/linux-edonkey-core/Makefile b/net/linux-edonkey-core/Makefile index d05dda04e973..f6a53b4c3e60 100644 --- a/net/linux-edonkey-core/Makefile +++ b/net/linux-edonkey-core/Makefile @@ -22,7 +22,6 @@ ONLY_FOR_ARCHS= i386 USE_LINUX= yes NO_BUILD= yes NO_WRKSUBDIR= yes -STRIP= BINARY_NAME_OLD?= ${PORTNAME}clc BINARY_NAME= donkey @@ -30,7 +29,6 @@ BINARY_NAME= donkey DOC_FILES= ChangeLog LISEZMOI README changelog.Debian.gz pre-install: - @${BRANDELF} -t Linux ${WRKSRC}/usr/bin/${BINARY_NAME_OLD} do-install: diff --git a/net/linux-edonkey-server/Makefile b/net/linux-edonkey-server/Makefile index 56ebe7e9fc78..d6128236f5a1 100644 --- a/net/linux-edonkey-server/Makefile +++ b/net/linux-edonkey-server/Makefile @@ -20,21 +20,12 @@ MAINTAINER= ports@FreeBSD.org 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 @@ do-install: .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 --git a/net/linux-jigdo/Makefile b/net/linux-jigdo/Makefile index ca49a96551eb..75b3b712141b 100644 --- a/net/linux-jigdo/Makefile +++ b/net/linux-jigdo/Makefile @@ -21,9 +21,8 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget 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 @@ SCRIPTS= jigdo-lite jigdo-mirror 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 --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile index 65dfec9b1d07..a3a608392d28 100644 --- a/net/linux-nx-client/Makefile +++ b/net/linux-nx-client/Makefile @@ -7,7 +7,7 @@ PORTNAME= linux-nx-client PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.nomachine.com/download/nxclient/${PORTVERSION}/Linux-Static-Tar/ DISTNAME= nxclient-${PORTVERSION}-91.i386 @@ -18,17 +18,14 @@ COMMENT= The NoMachine NX client 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 -# 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: @@ -64,6 +61,7 @@ do-install: ${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 --git a/net/linux-overnet-core/Makefile b/net/linux-overnet-core/Makefile index 512dd38ea104..6ee5d30d3cfe 100644 --- a/net/linux-overnet-core/Makefile +++ b/net/linux-overnet-core/Makefile @@ -18,10 +18,9 @@ MAINTAINER= arundel@h3c.de 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 --git a/net/peercast/Makefile b/net/peercast/Makefile index 2886103c43d5..d48dbd357d3c 100644 --- a/net/peercast/Makefile +++ b/net/peercast/Makefile @@ -18,7 +18,6 @@ COMMENT= A peer-to-peer network for broadcasting and listening to streams USE_LINUX= yes NO_WRKSUBDIR= yes NO_BUILD= yes -STRIP= # empty: do not strip linux binaries SUB_FILES= peercast.sh diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile index 965e7e9852a7..a98ea5d42956 100644 --- a/net/skype-devel/Makefile +++ b/net/skype-devel/Makefile @@ -15,11 +15,11 @@ MAINTAINER= netchild@FreeBSD.org 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 amd64 diff --git a/net/skype/Makefile b/net/skype/Makefile index 965e7e9852a7..a98ea5d42956 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -15,11 +15,11 @@ MAINTAINER= netchild@FreeBSD.org 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 amd64 diff --git a/portuguese/staroffice52/Makefile b/portuguese/staroffice52/Makefile index b153e7f65fd6..3cd76d1f31fc 100644 --- a/portuguese/staroffice52/Makefile +++ b/portuguese/staroffice52/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= portuguese editors linux MASTER_SITES= http://ftp.ceat.net/pub/linux/text/office/star_office-5.2/ \ ftp://ftp.puc-rio.br/pub/StarOffice52/ \ @@ -28,9 +28,11 @@ EXTRACT_ONLY= 109939-03.tar.Z MAINTAINER= mbr@FreeBSD.org COMMENT= Sistema integrado de processador de texto/planilha/e muito mais -FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 +FETCH_DEPENDS= ${LINUX_BASE_PORT} ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes NO_CDROM= 'Deve ser obtido diretamente do site da Sun via interface www' CD_MOUNTPT= '/cdrom' IS_INTERACTIVE= yes @@ -180,6 +182,7 @@ do-install: ${CP} -Rv $$file ${PREFIX}/office52/ ; \ done .endif +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". post-install: .for file in setup soffice diff --git a/print/acroread/Makefile b/print/acroread/Makefile index d715e2560ff7..0cd5439b1e6c 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -7,12 +7,11 @@ PORTNAME= acroread PORTVERSION= 5.10 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= print linux MASTER_SITES= http://download.adobe.com/pub/adobe/acrobatreader/unix/5.x/ \ ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/ -.include <bsd.port.pre.mk> DISTNAME= linux-5010 DIST_SUBDIR= acroread RESTRICTED= "Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html" @@ -20,19 +19,20 @@ RESTRICTED= "Must fill out redistribution form at http://www.adobe.com/products/ 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 +.include <bsd.port.pre.mk> + +REINPLACE_ARGS= -i '' -E + do-install: @${MKDIR} ${PREFIX}/Acrobat5 @ReadInstallDir=${PREFIX}/Acrobat5 ${WRKSRC}/INSTALL diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile index 373069c45227..15a51dc0e059 100644 --- a/print/acroread7/Makefile +++ b/print/acroread7/Makefile @@ -21,20 +21,18 @@ COMMENT= View, distribute and print PDF documents BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \ - ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango \ - ${LINUXBASE}/usr/X11R6/lib/libXext.so.6:${PORTSDIR}/x11/linux-XFree86-libs + ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango CONFLICTS= acroread ONLY_FOR_ARCHS= amd64 i386 USE_REINPLACE= yes -USE_LINUX?= yes +USE_LINUX= yes +USE_XLIB= yes # This should be USE_X_PREFIX, doesn't work yet. NO_BUILD= yes REINPLACE_ARGS= -i '' -E -NO_FILTER_SHLIBS= yes -NO_MTREE= yes PLIST= ${WRKDIR}/plist -PREFIX= ${LINUXBASE} +PREFIX?= ${LINUXBASE} # have a look at the USE_XLIB comment pre-install: @kldstat -v | ${GREP} -E 'linux(aout|elf)' >/dev/null ||\ @@ -57,6 +55,7 @@ do-install: --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} || ${TRUE} # disable the PPKLite plugin as it requires an LDAP share lib ${CHMOD} 0 ${PREFIX}/usr/local/Adobe/Acrobat7.0/Reader/intellinux/plug_ins/PPKLite.api +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". post-install: @${REINPLACE_CMD} 's:Linux:FreeBSD|Linux:g' \ diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile index d85be59ac1ee..b14a47207634 100644 --- a/print/bjfiltercom/Makefile +++ b/print/bjfiltercom/Makefile @@ -7,7 +7,7 @@ PORTNAME?= bjfiltercom PORTVERSION?= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print linux MASTER_SITES= ftp://download.canon.jp/pub/driver/bj/linux/ DISTFILES= ${RPMFILE} @@ -43,7 +43,7 @@ PLIST= ${.CURDIR}/pkg-plist 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) @@ -76,6 +76,8 @@ do-build: -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 ${INSTALL_DATA} ${WRKDIR}/usr/lib/bjlib/* ${LINUXBASE}/usr/lib/bjlib diff --git a/sysutils/linux-acu/Makefile b/sysutils/linux-acu/Makefile index 6c90599fcbd9..ec9180a25979 100644 --- a/sysutils/linux-acu/Makefile +++ b/sysutils/linux-acu/Makefile @@ -7,7 +7,7 @@ PORTNAME= acu PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils linux MASTER_SITES= # fetch manually PKGNAMEPREFIX= linux- @@ -30,9 +30,9 @@ IGNORE= may not be automatically fetched due to licensing\ .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}' @@ -55,6 +55,9 @@ post-extract: @${FALSE} .endif +do-build: + @${BRANDELF} -t Linux ${WRKSRC}/utilities/acu + do-install: @${MKDIR} ${PREFIX}/bin @${MKDIR} ${LINUXBASE}/proc/aironet diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile index 319d1eec68d3..973355f41e8b 100644 --- a/sysutils/linux-afaapps/Makefile +++ b/sysutils/linux-afaapps/Makefile @@ -7,7 +7,7 @@ PORTNAME= afaapps PORTVERSION= 2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils linux MASTER_SITES= ftp://ftp.us.dell.com/scsi-raid/ PKGNAMEPREFIX= linux- @@ -26,12 +26,11 @@ RESTRICTED= "binary redistribution license needs clarification" 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.${MACHINE_ARCH} MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} @@ -43,8 +42,9 @@ RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ 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 --git a/textproc/cdsware/Makefile b/textproc/cdsware/Makefile index 806e7b685fcf..4828ab99f74c 100644 --- a/textproc/cdsware/Makefile +++ b/textproc/cdsware/Makefile @@ -7,6 +7,7 @@ PORTNAME= cdsware PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= http://cdsware.cern.ch/download/ @@ -26,7 +27,7 @@ BROKEN= "Conflicting dependencies: apache 1.x and apache 2.x" RUN_DEPENDS+= ${X11BASE}/bin/pdftotext:${PORTSDIR}/graphics/xpdf . endif . if !defined(WITHOUT_ACROREAD) -RUN_DEPENDS+= ${LOCALBASE}/bin/acroread:${PORTSDIR}/print/acroread +RUN_DEPENDS+= ${X11BASE}/bin/acroread5:${PORTSDIR}/print/acroread . endif . if !defined(WITHOUT_WV) RUN_DEPENDS+= ${LOCALBASE}/bin/wvHtml:${PORTSDIR}/textproc/wv diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile index f67f424cf82b..c9bff8771b4c 100644 --- a/textproc/linux-aspell/Makefile +++ b/textproc/linux-aspell/Makefile @@ -27,10 +27,9 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ 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 --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile index d75922d2d94b..d0998ecab7cc 100644 --- a/textproc/linux-expat/Makefile +++ b/textproc/linux-expat/Makefile @@ -7,14 +7,15 @@ PORTNAME= expat PORTVERSION= 1.95.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary port of Expat XML-parsing library -RUN_DEPENDS= ${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8 +RUN_DEPENDS= +USE_LINUX= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 PLIST= ${WRKDIR}/plist diff --git a/textproc/linux-f10-aspell/Makefile b/textproc/linux-f10-aspell/Makefile index f67f424cf82b..c9bff8771b4c 100644 --- a/textproc/linux-f10-aspell/Makefile +++ b/textproc/linux-f10-aspell/Makefile @@ -27,10 +27,9 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ 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 --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile index d75922d2d94b..d0998ecab7cc 100644 --- a/textproc/linux-f10-expat/Makefile +++ b/textproc/linux-f10-expat/Makefile @@ -7,14 +7,15 @@ PORTNAME= expat PORTVERSION= 1.95.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary port of Expat XML-parsing library -RUN_DEPENDS= ${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8 +RUN_DEPENDS= +USE_LINUX= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 PLIST= ${WRKDIR}/plist diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-f10-libxml/Makefile +++ b/textproc/linux-f10-libxml/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-f10-libxml2/Makefile +++ b/textproc/linux-f10-libxml2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/linux-f8-aspell/Makefile b/textproc/linux-f8-aspell/Makefile index f67f424cf82b..c9bff8771b4c 100644 --- a/textproc/linux-f8-aspell/Makefile +++ b/textproc/linux-f8-aspell/Makefile @@ -27,10 +27,9 @@ BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ 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 --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile index d75922d2d94b..d0998ecab7cc 100644 --- a/textproc/linux-f8-expat/Makefile +++ b/textproc/linux-f8-expat/Makefile @@ -7,14 +7,15 @@ PORTNAME= expat PORTVERSION= 1.95.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary port of Expat XML-parsing library -RUN_DEPENDS= ${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8 +RUN_DEPENDS= +USE_LINUX= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 PLIST= ${WRKDIR}/plist diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-f8-libxml/Makefile +++ b/textproc/linux-f8-libxml/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-f8-libxml2/Makefile +++ b/textproc/linux-f8-libxml2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-libxml/Makefile +++ b/textproc/linux-libxml/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile index c9590a2f6ffe..5e8c6f71a020 100644 --- a/textproc/linux-libxml2/Makefile +++ b/textproc/linux-libxml2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 1.8.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/textproc/pocketreader/Makefile b/textproc/pocketreader/Makefile index df639a333b80..b72fb2e0c22f 100644 --- a/textproc/pocketreader/Makefile +++ b/textproc/pocketreader/Makefile @@ -7,7 +7,7 @@ PORTNAME= pocketreader PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc linux MASTER_SITES= http://www.pocketreader.com/download/software/ DISTNAME= linux-bin @@ -16,14 +16,14 @@ EXTRACT_SUFX= _tar.gz 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 --git a/www/aswedit/Makefile b/www/aswedit/Makefile index dd3f7a7bbc9e..2042caced961 100644 --- a/www/aswedit/Makefile +++ b/www/aswedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= asWedit PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www editors linux MASTER_SITES= ftp://sunsite.icm.edu.pl/pub/www/asWedit/ DISTNAME= asWedit-4.0-i386.linux @@ -15,17 +15,19 @@ DISTNAME= asWedit-4.0-i386.linux MAINTAINER= brett@peloton.runet.edu COMMENT= An easy to use HTML and text editor -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - RESTRICTED= "Commercial software" -NO_BUILD= yes ONLY_FOR_ARCHS= i386 +USE_LINUX= yes +USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/asWedit-4.0.1 +do-build: + ${BRANDELF} -t Linux ${WRKSRC}/asWedit + do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/asWedit ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/asWedit ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/asWedit.hlp ${PREFIX}/lib @${MKDIR} ${PREFIX}/share/doc/asWedit ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/asWedit diff --git a/www/flashpluginwrapper/Makefile b/www/flashpluginwrapper/Makefile index 318be952e1d3..5a4782e1b15e 100644 --- a/www/flashpluginwrapper/Makefile +++ b/www/flashpluginwrapper/Makefile @@ -7,6 +7,7 @@ PORTNAME= flashpluginwrapper PORTVERSION= 0.20021113 +PORTREVISION= 1 CATEGORIES= www linux MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://absolutbsd.org/~petef/ @@ -16,7 +17,7 @@ MAINTAINER= brandon@dvalentine.com COMMENT= A wrapper allowing use of linux-flashplugin with native mozilla DEPRECATED= "Please use www/linuxpluginwrapper. This port should be obsoleted. But, I know many people which cannot upgrade by any reason. So I won't remove this." -RUN_DEPENDS= ${LOCALBASE}/lib/flash/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin +RUN_DEPENDS= ${X11BASE}/lib/flash/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin USE_XLIB= yes USE_REINPLACE= yes diff --git a/www/linux-beonex/Makefile b/www/linux-beonex/Makefile index ecba463f02a9..98fe01d2fea7 100644 --- a/www/linux-beonex/Makefile +++ b/www/linux-beonex/Makefile @@ -7,7 +7,7 @@ PORTNAME= beonex PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www linux MASTER_SITES= \ http://ftp.ibiblio.org/pub/packages/infosystems/WWW/clients/beonex/communicator/0.8/\ @@ -27,13 +27,13 @@ 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 +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: @@ -76,6 +76,7 @@ do-install: ${LN} -s ${PREFIX}/lib/linux-beonex/beonex-comm \ ${PREFIX}/bin/linux-beonex ${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${PREFIX}/lib/linux-beonex +# This is missing a ${BRANDELF} -t Linux <executables> post-install: @${ECHO_CMD} \ diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index 0afb7d18a68b..e4205e0e13aa 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -17,16 +17,13 @@ MAINTAINER= voisine@gmail.com 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 amd64 FIREFOX_NAME= ${PKGNAMEPREFIX}${PORTNAME} DESCR= ${.CURDIR}/pkg-descr @@ -34,7 +31,6 @@ MD5_FILE= ${.CURDIR}/distinfo PKGMESSAGE= ${WRKDIR}/pkg-message PLIST= ${WRKDIR}/pkg-plist USE_LINUX= yes -USE_XLIB= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/firefox diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile index 5f6e2b897e42..fbb30dad2fa8 100644 --- a/www/linux-flashplugin/Makefile +++ b/www/linux-flashplugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= flashplugin PORTVERSION= 5.0r51 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www multimedia linux MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/ PKGNAMEPREFIX= linux- @@ -17,13 +17,13 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= ports@brandon.dvalentine.com COMMENT= The official Macromedia Flash Player for Linux Netscape and Opera -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= i386 RESTRICTED= "Redistribution not allowed" NO_BUILD= yes +USE_LINUX= yes +USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/flash_linux LATEST_LINK= flash5 diff --git a/www/linux-flashplugin6/Makefile b/www/linux-flashplugin6/Makefile index 625dba4c3c9d..d76e763f5a76 100644 --- a/www/linux-flashplugin6/Makefile +++ b/www/linux-flashplugin6/Makefile @@ -7,7 +7,7 @@ PORTNAME= flashplugin PORTVERSION= 6.0r79 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www multimedia linux MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/ PKGNAMEPREFIX= linux- @@ -17,9 +17,9 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= ports@brandon.dvalentine.com COMMENT= The official Macromedia Flash Player for Linux Mozilla and Netscape 6+ -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= amd64 i386 +USE_LINUX= yes +USE_X_PREFIX= yes RESTRICTED= "Redistribution not allowed" diff --git a/www/linux-flashplugin7/Makefile b/www/linux-flashplugin7/Makefile index e167c9d74acd..ad624e21f190 100644 --- a/www/linux-flashplugin7/Makefile +++ b/www/linux-flashplugin7/Makefile @@ -7,7 +7,7 @@ PORTNAME= flashplugin PORTVERSION= 7.0r25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www multimedia linux MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/ PKGNAMEPREFIX= linux- @@ -17,9 +17,9 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= jamie@bishopston.net COMMENT= The official Macromedia Flash Player for Linux Mozilla and Netscape 6+ -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= amd64 i386 +USE_LINUX= yes +USE_X_PREFIX= yes RESTRICTED= "Redistribution not allowed" diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile index e167c9d74acd..ad624e21f190 100644 --- a/www/linux-flashplugin9/Makefile +++ b/www/linux-flashplugin9/Makefile @@ -7,7 +7,7 @@ PORTNAME= flashplugin PORTVERSION= 7.0r25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www multimedia linux MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/ PKGNAMEPREFIX= linux- @@ -17,9 +17,9 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= jamie@bishopston.net COMMENT= The official Macromedia Flash Player for Linux Mozilla and Netscape 6+ -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - ONLY_FOR_ARCHS= amd64 i386 +USE_LINUX= yes +USE_X_PREFIX= yes RESTRICTED= "Redistribution not allowed" diff --git a/www/linux-lesstif-ns/Makefile b/www/linux-lesstif-ns/Makefile index f8ee74e43096..9156fa5a715b 100644 --- a/www/linux-lesstif-ns/Makefile +++ b/www/linux-lesstif-ns/Makefile @@ -7,7 +7,7 @@ PORTNAME= lesstif PORTVERSION= 0.92.26 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www x11-toolkits linux MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/obsolete/ \ @@ -22,15 +22,19 @@ PATCH_SITES= http://cgi.shikoku.ne.jp/~fun/srpms/ PATCHFILES= ${DISTNAME}-i18n.patch PATCH_DIST_STRIP= -p1 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Clone of the Motif library mostly for linux-netscape4 -BUILD_DEPENDS= ${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7 -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs +DEPRECATED= No port depends upon this port anymore. +EXPIRATION_DATE= 2005-08-20 +IGNORE= Does not build and nobody seems to complain. + +# XXX: We should use a RPM instead of building it from source. +BUILD_DEPENDS= ${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools USE_BZIP2= yes -USE_LINUX_PREFIX= yes -PREFIX= ${LINUXBASE}${X11BASE} +USE_LINUX= yes +PREFIX?= ${LINUXBASE}${X11BASE} HAS_CONFIGURE= yes CONFIGURE_ARGS= --host=${MACHINE_ARCH}--linux-gnu \ --enable-shared --enable-production \ diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile index 6cc4c0fc56b7..61896201fedb 100644 --- a/www/linux-mozilla-devel/Makefile +++ b/www/linux-mozilla-devel/Makefile @@ -8,7 +8,7 @@ PORTNAME= mozilla PORTVERSION= 1.8a5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= mozilla/releases/mozilla${PORTVERSION}/linux-xpi @@ -24,11 +24,10 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux FORBIDDEN= "multiple suspected security bugs" -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 @@ -90,6 +89,9 @@ do-configure: ${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} ${ECHO_CMD} "@unexec ${FIND} ${FULL_INSTALL_DIR}/plugins \ diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile index 9858d30a7781..0fb29c3907bf 100644 --- a/www/linux-mozilla/Makefile +++ b/www/linux-mozilla/Makefile @@ -8,6 +8,7 @@ PORTNAME= mozilla PORTVERSION= 1.7.8 +PORTREVISION= 1 CATEGORIES= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= mozilla/releases/mozilla${PORTVERSION}/linux-xpi @@ -21,10 +22,10 @@ COMMENT=Browser, HTML editor, MUA and newsreader for use with Linux plugins 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 @@ -109,6 +110,7 @@ do-install: ${CHOWN} -R ${BINOWN}:${BINGRP} ${INSTALL_DIR} ${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_CMD} ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${PREFIX}/lib/linux-mozilla/ +# This is missing a ${BRANDELF} -t Linux <executables> post-install: ${SED} -e 's:PREFIX:${PREFIX}:g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 45305d823950..cf041b08a99a 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= opera PORTVERSION= ${OPERA_VER}.${OPERA_DATE} +PORTREVISION= 1 CATEGORIES= www linux MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \ @@ -24,21 +25,20 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en 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= 8.01 OPERA_DATE= 20050615 diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 45305d823950..cf041b08a99a 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -7,6 +7,7 @@ PORTNAME= opera PORTVERSION= ${OPERA_VER}.${OPERA_DATE} +PORTREVISION= 1 CATEGORIES= www linux MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \ @@ -24,21 +25,20 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en 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= 8.01 OPERA_DATE= 20050615 diff --git a/www/linux-sunbird/Makefile b/www/linux-sunbird/Makefile index c0f7812869da..796f096fa5fe 100644 --- a/www/linux-sunbird/Makefile +++ b/www/linux-sunbird/Makefile @@ -7,6 +7,7 @@ PORTNAME= sunbird PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES?= www linux MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR?=calendar/sunbird/releases/${PORTVERSION} @@ -17,23 +18,19 @@ MAINTAINER= voisine@gmail.com COMMENT= Calendaring application 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 SUNBIRD_NAME= ${PKGNAMEPREFIX}${PORTNAME} DESCR= ${.CURDIR}/pkg-descr MD5_FILE= ${.CURDIR}/distinfo PLIST= ${WRKDIR}/pkg-plist USE_LINUX= yes -USE_XLIB= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/sunbird @@ -46,6 +43,8 @@ pre-install: ${SED} -e 's:^:@dirrm lib/${SUNBIRD_NAME}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${SUNBIRD_NAME} >> ${PLIST} +# XXX: This is missing a "${BRANDELF\ -t Linux <executables>". + do-install: ${MKDIR} ${PREFIX}/lib/${SUNBIRD_NAME} ${CHMOD} 755 ${PREFIX}/lib/${SUNBIRD_NAME} diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile index a858072d6161..dc7e08e53568 100644 --- a/www/linuxpluginwrapper/Makefile +++ b/www/linuxpluginwrapper/Makefile @@ -19,8 +19,8 @@ COMMENT= A wrapper allowing use of linux-plugins with native applications .include <bsd.port.pre.mk> .if !defined(WITHOUT_PLUGINS) -RUN_DEPENDS= ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6 -RUN_DEPENDS+= ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer +RUN_DEPENDS= ${X11BASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6 +RUN_DEPENDS+= ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer .if ${OSVERSION} >= 500000 RUN_DEPENDS+= ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so:${PORTSDIR}/print/acroread7 .else @@ -76,6 +76,12 @@ pre-everything:: .endif .endif +post-patch: + @${REINPLACE_CMD} \ + -e "s:/usr/local/lib/linux-:${X11BASE}/lib/linux-:g" \ + -e "s:/usr/local/Acrobat5:${X11BASE}/Acrobat5:g" \ + ${WRKSRC}/misc/libmap* + post-build: @${SED} -e 's,%%PREFIX%%,${PREFIX},' \ -e 's,%%LOCALBASE%%,${LOCALBASE},' \ @@ -98,13 +104,13 @@ pre-install: @${LN} -sf ${LINUXBASE}/usr/local/Adobe/Acrobat7.0/Browser/intellinux/nppdf.so \ ${X11BASE}/lib/browser_plugins/ .endif - @${LN} -sf ${LOCALBASE}/lib/linux-flashplugin6/flashplayer.xpt \ + @${LN} -sf ${X11BASE}/lib/linux-flashplugin6/flashplayer.xpt \ ${X11BASE}/lib/browser_plugins/ - @${LN} -sf ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so \ + @${LN} -sf ${X11BASE}/lib/linux-flashplugin6/libflashplayer.so \ ${X11BASE}/lib/browser_plugins/ - @${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so \ + @${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \ ${X11BASE}/lib/browser_plugins/ - @${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.xpt \ + @${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \ ${X11BASE}/lib/browser_plugins/ .endif diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index c996b3f75a48..99079159cf47 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index c996b3f75a48..99079159cf47 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index c996b3f75a48..99079159cf47 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= freebsd-emulation@FreeBSD.org diff --git a/x11-fonts/linux-urw-fonts/Makefile b/x11-fonts/linux-urw-fonts/Makefile index 9e4912706bb3..21e0d1c9fe25 100644 --- a/x11-fonts/linux-urw-fonts/Makefile +++ b/x11-fonts/linux-urw-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= urw-fonts PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -25,6 +25,7 @@ pre-install: rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST}; \ ${FIND} -d * -type d | ${GREP} -E 'urw|default' | \ - ${SED} -e 's:^:@dirrm :' >> ${PLIST} + ${SED} -e 's:^:@dirrm :' >> ${PLIST}; \ + ${ECHO_CMD} '@unexec rmdir %D/usr/share/fonts 2>&1 >/dev/null || true' >> ${PLIST} .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile index f89ac222e521..4f9e256e31c5 100644 --- a/x11-fonts/mathfonts/Makefile +++ b/x11-fonts/mathfonts/Makefile @@ -8,6 +8,7 @@ PORTNAME= mathfonts PORTVERSION= 4.1 # Don't upgrade this port if not supported by MathML-enabled Mozilla # # Please check http://www.mozilla.org/projects/mathml/fonts/ +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://support.wolfram.com/mathematica/systems/windows/general/ DISTNAME= MathFonts_TrueType @@ -23,9 +24,9 @@ RESTRICTED= "no distribution of the fonts allowed" NO_CDROM= ${RESTRICTED} .if !defined(WITHOUT_FULLMATHML) -BUILD_DEPENDS+= ${LOCALBASE}/Acrobat5/Resource/Font/Symbol:${PORTSDIR}/print/acroread +BUILD_DEPENDS+= ${X11BASE}/Acrobat5/Resource/Font/Symbol:${PORTSDIR}/print/acroread RUN_DEPENDS+= ${FONTSBASE}/texcm-ttf/cmr10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf \ - ${LOCALBASE}/Acrobat5/Resource/Font/Symbol:${PORTSDIR}/print/acroread + ${X11BASE}/Acrobat5/Resource/Font/Symbol:${PORTSDIR}/print/acroread PLIST_SUB= ACROREAD="" .else PLIST_SUB= ACROREAD="@comment " @@ -57,7 +58,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.ttf ${WRKSRC}/fonts.scale ${WRKSRC}/fonts.dir \ ${FONTSDIR} .if !defined(WITHOUT_FULLMATHML) - ${LN} -fs ${LOCALBASE}/Acrobat5/Resource/Font/Symbol ${FONTSDIR} + ${LN} -fs ${X11BASE}/Acrobat5/Resource/Font/Symbol ${FONTSDIR} .endif post-install: diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile index 7e5ae5708641..62fa6ed0074c 100644 --- a/x11-toolkits/linux-f10-gtk/Makefile +++ b/x11-toolkits/linux-f10-gtk/Makefile @@ -9,7 +9,7 @@ PORTNAME?= gtk PORTVERSION?= 1.2 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= x11-toolkits linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -19,10 +19,14 @@ MAINTAINER?= freebsd-emulation@FreeBSD.org COMMENT?= RPM of the Gtk lib BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm +# XXX: I haven't checked if every port which includes this Makefile needs +# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the +# RPM bits. RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS?= i386 alpha amd64 +USE_LINUX= yes USE_LINUX_PREFIX= yes .include <bsd.port.pre.mk> @@ -34,9 +38,9 @@ RPMFLAGS+= --ignorearch DIST_SUBDIR?= rpm EXTRACT_ONLY= NO_BUILD= yes -NO_FILTER_SHLIBS= yes PLIST?= ${PKGDIR}/pkg-plist.${ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} +LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig # Let's avoid hardcoding 'en' as the language. LANG= en @@ -62,6 +66,7 @@ do-install: ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done + @${LINUX_LDCONFIG} new-plist: @${RM} -rf ${WRKSRC}/tmp diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile index d6256fc5f5df..f18b02bde642 100644 --- a/x11-toolkits/linux-f10-gtk2/Makefile +++ b/x11-toolkits/linux-f10-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits linux MASTER_SITES= http://www.infostrategique.com/linuxrpms/legacy/9/ @@ -22,31 +22,15 @@ BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl ${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \ ${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \ ${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${BUILD_DEPENDS} +RUN_DEPENDS+= ${BUILD_DEPENDS} DIST_SUBDIR= rpm/i386/rh9 -NO_MTREE= yes ONLY_FOR_ARCHS= i386 -PLIST= ${WRKDIR}/plist +PLIST= ${PKGDIR}/pkg-plist +USE_XLIB= yes RESTRICTED= "binaries under GNU LGPL without accompanying source" RPM_SET= gtk2-2.2.1-4.1.legacy.i386.rpm -pre-install: - ${RM} -f ${PLIST} -.for ii in gtk.immodules gdk-pixbuf.loaders - ${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST} -.endfor - ${MKDIR} ${WRKSRC}/tmp - cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \ - ${FIND} * -type f -o -type l >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \ - ${SED} -e 's:^:@dirrm :' >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} locale | \ - ${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \ - >> ${PLIST} - post-install: .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii} diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist new file mode 100644 index 000000000000..0b6a30cde5a2 --- /dev/null +++ b/x11-toolkits/linux-f10-gtk2/pkg-plist @@ -0,0 +1,184 @@ +etc/gtk-2.0/gtk.immodules +etc/gtk-2.0/gdk-pixbuf.loaders +usr/bin/gdk-pixbuf-query-loaders +usr/bin/gtk-demo +usr/bin/gtk-query-immodules-2.0 +usr/bin/testgtk +usr/bin/testtext +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so +usr/lib/libgdk-x11-2.0.so.0 +usr/lib/libgdk-x11-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf-2.0.so.0 +usr/lib/libgdk_pixbuf-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1 +usr/lib/libgtk-x11-2.0.so.0 +usr/lib/libgtk-x11-2.0.so.0.200.1 +usr/share/doc/gtk2-2.2.1/AUTHORS +usr/share/doc/gtk2-2.2.1/COPYING +usr/share/doc/gtk2-2.2.1/ChangeLog +usr/share/doc/gtk2-2.2.1/NEWS +usr/share/doc/gtk2-2.2.1/README +usr/share/gtk-2.0/demo/alphatest.png +usr/share/gtk-2.0/demo/apple-red.png +usr/share/gtk-2.0/demo/appwindow.c +usr/share/gtk-2.0/demo/background.jpg +usr/share/gtk-2.0/demo/button_box.c +usr/share/gtk-2.0/demo/changedisplay.c +usr/share/gtk-2.0/demo/colorsel.c +usr/share/gtk-2.0/demo/dialog.c +usr/share/gtk-2.0/demo/drawingarea.c +usr/share/gtk-2.0/demo/editable_cells.c +usr/share/gtk-2.0/demo/floppybuddy.gif +usr/share/gtk-2.0/demo/gnome-applets.png +usr/share/gtk-2.0/demo/gnome-calendar.png +usr/share/gtk-2.0/demo/gnome-foot.png +usr/share/gtk-2.0/demo/gnome-gimp.png +usr/share/gtk-2.0/demo/gnome-gmush.png +usr/share/gtk-2.0/demo/gnome-gsame.png +usr/share/gtk-2.0/demo/gnu-keys.png +usr/share/gtk-2.0/demo/gtk-logo-rgb.gif +usr/share/gtk-2.0/demo/images.c +usr/share/gtk-2.0/demo/item_factory.c +usr/share/gtk-2.0/demo/list_store.c +usr/share/gtk-2.0/demo/menus.c +usr/share/gtk-2.0/demo/panes.c +usr/share/gtk-2.0/demo/pixbufs.c +usr/share/gtk-2.0/demo/sizegroup.c +usr/share/gtk-2.0/demo/stock_browser.c +usr/share/gtk-2.0/demo/textview.c +usr/share/gtk-2.0/demo/tree_store.c +usr/share/locale/am/LC_MESSAGES/gtk20.mo +usr/share/locale/az/LC_MESSAGES/gtk20.mo +usr/share/locale/be/LC_MESSAGES/gtk20.mo +usr/share/locale/bg/LC_MESSAGES/gtk20.mo +usr/share/locale/ca/LC_MESSAGES/gtk20.mo +usr/share/locale/cs/LC_MESSAGES/gtk20.mo +usr/share/locale/cy/LC_MESSAGES/gtk20.mo +usr/share/locale/da/LC_MESSAGES/gtk20.mo +usr/share/locale/de/LC_MESSAGES/gtk20.mo +usr/share/locale/el/LC_MESSAGES/gtk20.mo +usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo +usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo +usr/share/locale/es/LC_MESSAGES/gtk20.mo +usr/share/locale/et/LC_MESSAGES/gtk20.mo +usr/share/locale/eu/LC_MESSAGES/gtk20.mo +usr/share/locale/fa/LC_MESSAGES/gtk20.mo +usr/share/locale/fi/LC_MESSAGES/gtk20.mo +usr/share/locale/fr/LC_MESSAGES/gtk20.mo +usr/share/locale/ga/LC_MESSAGES/gtk20.mo +usr/share/locale/gl/LC_MESSAGES/gtk20.mo +usr/share/locale/he/LC_MESSAGES/gtk20.mo +usr/share/locale/hi/LC_MESSAGES/gtk20.mo +usr/share/locale/hr/LC_MESSAGES/gtk20.mo +usr/share/locale/hu/LC_MESSAGES/gtk20.mo +usr/share/locale/ia/LC_MESSAGES/gtk20.mo +usr/share/locale/it/LC_MESSAGES/gtk20.mo +usr/share/locale/ja/LC_MESSAGES/gtk20.mo +usr/share/locale/ko/LC_MESSAGES/gtk20.mo +usr/share/locale/lt/LC_MESSAGES/gtk20.mo +usr/share/locale/lv/LC_MESSAGES/gtk20.mo +usr/share/locale/mk/LC_MESSAGES/gtk20.mo +usr/share/locale/mn/LC_MESSAGES/gtk20.mo +usr/share/locale/ms/LC_MESSAGES/gtk20.mo +usr/share/locale/nl/LC_MESSAGES/gtk20.mo +usr/share/locale/nn/LC_MESSAGES/gtk20.mo +usr/share/locale/no/LC_MESSAGES/gtk20.mo +usr/share/locale/pl/LC_MESSAGES/gtk20.mo +usr/share/locale/pt/LC_MESSAGES/gtk20.mo +usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo +usr/share/locale/ro/LC_MESSAGES/gtk20.mo +usr/share/locale/ru/LC_MESSAGES/gtk20.mo +usr/share/locale/sk/LC_MESSAGES/gtk20.mo +usr/share/locale/sl/LC_MESSAGES/gtk20.mo +usr/share/locale/sp/LC_MESSAGES/gtk20.mo +usr/share/locale/sr/LC_MESSAGES/gtk20.mo +usr/share/locale/sv/LC_MESSAGES/gtk20.mo +usr/share/locale/ta/LC_MESSAGES/gtk20.mo +usr/share/locale/tr/LC_MESSAGES/gtk20.mo +usr/share/locale/uk/LC_MESSAGES/gtk20.mo +usr/share/locale/vi/LC_MESSAGES/gtk20.mo +usr/share/locale/wa/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo +usr/share/themes/Default/gtk-2.0-key/gtkrc +usr/share/themes/Emacs/gtk-2.0-key/gtkrc +usr/share/themes/Raleigh/gtk-2.0/gtkrc +@dirrm etc/gtk-2.0 +@dirrm usr/lib/gtk-2.0/2.2.0/immodules +@dirrm usr/lib/gtk-2.0/2.2.0/loaders +@dirrm usr/lib/gtk-2.0/2.2.0 +@dirrm usr/lib/gtk-2.0 +@dirrm usr/share/doc/gtk2-2.2.1 +@dirrm usr/share/gtk-2.0/demo +@dirrm usr/share/gtk-2.0 +@dirrm usr/share/themes/Default/gtk-2.0-key +@dirrm usr/share/themes/Default +@dirrm usr/share/themes/Emacs/gtk-2.0-key +@dirrm usr/share/themes/Emacs +@dirrm usr/share/themes/Raleigh/gtk-2.0 +@dirrm usr/share/themes/Raleigh +@dirrm usr/share/themes +@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile index 40884e0cc17e..610ef74bf61c 100644 --- a/x11-toolkits/linux-f10-openmotif/Makefile +++ b/x11-toolkits/linux-f10-openmotif/Makefile @@ -6,7 +6,7 @@ PORTNAME= openmotif PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 @@ -19,12 +19,12 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Motif toolkit Linux libraries BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS= i386 +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes -NO_FILTER_SHLIBS= yes MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile index bfae1cfb4acb..a37e4a1daa9b 100644 --- a/x11-toolkits/linux-f10-pango/Makefile +++ b/x11-toolkits/linux-f10-pango/Makefile @@ -7,7 +7,7 @@ PORTNAME= pango PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -21,6 +21,7 @@ BUILD_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre RUN_DEPENDS= ${BUILD_DEPENDS} +USE_XLIB= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${PKGDIR}/pkg-plist diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index 7e5ae5708641..62fa6ed0074c 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -9,7 +9,7 @@ PORTNAME?= gtk PORTVERSION?= 1.2 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= x11-toolkits linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -19,10 +19,14 @@ MAINTAINER?= freebsd-emulation@FreeBSD.org COMMENT?= RPM of the Gtk lib BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm +# XXX: I haven't checked if every port which includes this Makefile needs +# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the +# RPM bits. RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS?= i386 alpha amd64 +USE_LINUX= yes USE_LINUX_PREFIX= yes .include <bsd.port.pre.mk> @@ -34,9 +38,9 @@ RPMFLAGS+= --ignorearch DIST_SUBDIR?= rpm EXTRACT_ONLY= NO_BUILD= yes -NO_FILTER_SHLIBS= yes PLIST?= ${PKGDIR}/pkg-plist.${ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} +LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig # Let's avoid hardcoding 'en' as the language. LANG= en @@ -62,6 +66,7 @@ do-install: ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done + @${LINUX_LDCONFIG} new-plist: @${RM} -rf ${WRKSRC}/tmp diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile index d6256fc5f5df..f18b02bde642 100644 --- a/x11-toolkits/linux-f8-gtk2/Makefile +++ b/x11-toolkits/linux-f8-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits linux MASTER_SITES= http://www.infostrategique.com/linuxrpms/legacy/9/ @@ -22,31 +22,15 @@ BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl ${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \ ${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \ ${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${BUILD_DEPENDS} +RUN_DEPENDS+= ${BUILD_DEPENDS} DIST_SUBDIR= rpm/i386/rh9 -NO_MTREE= yes ONLY_FOR_ARCHS= i386 -PLIST= ${WRKDIR}/plist +PLIST= ${PKGDIR}/pkg-plist +USE_XLIB= yes RESTRICTED= "binaries under GNU LGPL without accompanying source" RPM_SET= gtk2-2.2.1-4.1.legacy.i386.rpm -pre-install: - ${RM} -f ${PLIST} -.for ii in gtk.immodules gdk-pixbuf.loaders - ${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST} -.endfor - ${MKDIR} ${WRKSRC}/tmp - cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \ - ${FIND} * -type f -o -type l >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \ - ${SED} -e 's:^:@dirrm :' >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} locale | \ - ${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \ - >> ${PLIST} - post-install: .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii} diff --git a/x11-toolkits/linux-f8-gtk2/pkg-plist b/x11-toolkits/linux-f8-gtk2/pkg-plist new file mode 100644 index 000000000000..0b6a30cde5a2 --- /dev/null +++ b/x11-toolkits/linux-f8-gtk2/pkg-plist @@ -0,0 +1,184 @@ +etc/gtk-2.0/gtk.immodules +etc/gtk-2.0/gdk-pixbuf.loaders +usr/bin/gdk-pixbuf-query-loaders +usr/bin/gtk-demo +usr/bin/gtk-query-immodules-2.0 +usr/bin/testgtk +usr/bin/testtext +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so +usr/lib/libgdk-x11-2.0.so.0 +usr/lib/libgdk-x11-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf-2.0.so.0 +usr/lib/libgdk_pixbuf-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1 +usr/lib/libgtk-x11-2.0.so.0 +usr/lib/libgtk-x11-2.0.so.0.200.1 +usr/share/doc/gtk2-2.2.1/AUTHORS +usr/share/doc/gtk2-2.2.1/COPYING +usr/share/doc/gtk2-2.2.1/ChangeLog +usr/share/doc/gtk2-2.2.1/NEWS +usr/share/doc/gtk2-2.2.1/README +usr/share/gtk-2.0/demo/alphatest.png +usr/share/gtk-2.0/demo/apple-red.png +usr/share/gtk-2.0/demo/appwindow.c +usr/share/gtk-2.0/demo/background.jpg +usr/share/gtk-2.0/demo/button_box.c +usr/share/gtk-2.0/demo/changedisplay.c +usr/share/gtk-2.0/demo/colorsel.c +usr/share/gtk-2.0/demo/dialog.c +usr/share/gtk-2.0/demo/drawingarea.c +usr/share/gtk-2.0/demo/editable_cells.c +usr/share/gtk-2.0/demo/floppybuddy.gif +usr/share/gtk-2.0/demo/gnome-applets.png +usr/share/gtk-2.0/demo/gnome-calendar.png +usr/share/gtk-2.0/demo/gnome-foot.png +usr/share/gtk-2.0/demo/gnome-gimp.png +usr/share/gtk-2.0/demo/gnome-gmush.png +usr/share/gtk-2.0/demo/gnome-gsame.png +usr/share/gtk-2.0/demo/gnu-keys.png +usr/share/gtk-2.0/demo/gtk-logo-rgb.gif +usr/share/gtk-2.0/demo/images.c +usr/share/gtk-2.0/demo/item_factory.c +usr/share/gtk-2.0/demo/list_store.c +usr/share/gtk-2.0/demo/menus.c +usr/share/gtk-2.0/demo/panes.c +usr/share/gtk-2.0/demo/pixbufs.c +usr/share/gtk-2.0/demo/sizegroup.c +usr/share/gtk-2.0/demo/stock_browser.c +usr/share/gtk-2.0/demo/textview.c +usr/share/gtk-2.0/demo/tree_store.c +usr/share/locale/am/LC_MESSAGES/gtk20.mo +usr/share/locale/az/LC_MESSAGES/gtk20.mo +usr/share/locale/be/LC_MESSAGES/gtk20.mo +usr/share/locale/bg/LC_MESSAGES/gtk20.mo +usr/share/locale/ca/LC_MESSAGES/gtk20.mo +usr/share/locale/cs/LC_MESSAGES/gtk20.mo +usr/share/locale/cy/LC_MESSAGES/gtk20.mo +usr/share/locale/da/LC_MESSAGES/gtk20.mo +usr/share/locale/de/LC_MESSAGES/gtk20.mo +usr/share/locale/el/LC_MESSAGES/gtk20.mo +usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo +usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo +usr/share/locale/es/LC_MESSAGES/gtk20.mo +usr/share/locale/et/LC_MESSAGES/gtk20.mo +usr/share/locale/eu/LC_MESSAGES/gtk20.mo +usr/share/locale/fa/LC_MESSAGES/gtk20.mo +usr/share/locale/fi/LC_MESSAGES/gtk20.mo +usr/share/locale/fr/LC_MESSAGES/gtk20.mo +usr/share/locale/ga/LC_MESSAGES/gtk20.mo +usr/share/locale/gl/LC_MESSAGES/gtk20.mo +usr/share/locale/he/LC_MESSAGES/gtk20.mo +usr/share/locale/hi/LC_MESSAGES/gtk20.mo +usr/share/locale/hr/LC_MESSAGES/gtk20.mo +usr/share/locale/hu/LC_MESSAGES/gtk20.mo +usr/share/locale/ia/LC_MESSAGES/gtk20.mo +usr/share/locale/it/LC_MESSAGES/gtk20.mo +usr/share/locale/ja/LC_MESSAGES/gtk20.mo +usr/share/locale/ko/LC_MESSAGES/gtk20.mo +usr/share/locale/lt/LC_MESSAGES/gtk20.mo +usr/share/locale/lv/LC_MESSAGES/gtk20.mo +usr/share/locale/mk/LC_MESSAGES/gtk20.mo +usr/share/locale/mn/LC_MESSAGES/gtk20.mo +usr/share/locale/ms/LC_MESSAGES/gtk20.mo +usr/share/locale/nl/LC_MESSAGES/gtk20.mo +usr/share/locale/nn/LC_MESSAGES/gtk20.mo +usr/share/locale/no/LC_MESSAGES/gtk20.mo +usr/share/locale/pl/LC_MESSAGES/gtk20.mo +usr/share/locale/pt/LC_MESSAGES/gtk20.mo +usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo +usr/share/locale/ro/LC_MESSAGES/gtk20.mo +usr/share/locale/ru/LC_MESSAGES/gtk20.mo +usr/share/locale/sk/LC_MESSAGES/gtk20.mo +usr/share/locale/sl/LC_MESSAGES/gtk20.mo +usr/share/locale/sp/LC_MESSAGES/gtk20.mo +usr/share/locale/sr/LC_MESSAGES/gtk20.mo +usr/share/locale/sv/LC_MESSAGES/gtk20.mo +usr/share/locale/ta/LC_MESSAGES/gtk20.mo +usr/share/locale/tr/LC_MESSAGES/gtk20.mo +usr/share/locale/uk/LC_MESSAGES/gtk20.mo +usr/share/locale/vi/LC_MESSAGES/gtk20.mo +usr/share/locale/wa/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo +usr/share/themes/Default/gtk-2.0-key/gtkrc +usr/share/themes/Emacs/gtk-2.0-key/gtkrc +usr/share/themes/Raleigh/gtk-2.0/gtkrc +@dirrm etc/gtk-2.0 +@dirrm usr/lib/gtk-2.0/2.2.0/immodules +@dirrm usr/lib/gtk-2.0/2.2.0/loaders +@dirrm usr/lib/gtk-2.0/2.2.0 +@dirrm usr/lib/gtk-2.0 +@dirrm usr/share/doc/gtk2-2.2.1 +@dirrm usr/share/gtk-2.0/demo +@dirrm usr/share/gtk-2.0 +@dirrm usr/share/themes/Default/gtk-2.0-key +@dirrm usr/share/themes/Default +@dirrm usr/share/themes/Emacs/gtk-2.0-key +@dirrm usr/share/themes/Emacs +@dirrm usr/share/themes/Raleigh/gtk-2.0 +@dirrm usr/share/themes/Raleigh +@dirrm usr/share/themes +@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile index 40884e0cc17e..610ef74bf61c 100644 --- a/x11-toolkits/linux-f8-openmotif/Makefile +++ b/x11-toolkits/linux-f8-openmotif/Makefile @@ -6,7 +6,7 @@ PORTNAME= openmotif PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 @@ -19,12 +19,12 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Motif toolkit Linux libraries BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS= i386 +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes -NO_FILTER_SHLIBS= yes MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile index bfae1cfb4acb..a37e4a1daa9b 100644 --- a/x11-toolkits/linux-f8-pango/Makefile +++ b/x11-toolkits/linux-f8-pango/Makefile @@ -7,7 +7,7 @@ PORTNAME= pango PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -21,6 +21,7 @@ BUILD_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre RUN_DEPENDS= ${BUILD_DEPENDS} +USE_XLIB= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${PKGDIR}/pkg-plist diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index 7e5ae5708641..62fa6ed0074c 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -9,7 +9,7 @@ PORTNAME?= gtk PORTVERSION?= 1.2 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= x11-toolkits linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- @@ -19,10 +19,14 @@ MAINTAINER?= freebsd-emulation@FreeBSD.org COMMENT?= RPM of the Gtk lib BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm +# XXX: I haven't checked if every port which includes this Makefile needs +# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the +# RPM bits. RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS?= i386 alpha amd64 +USE_LINUX= yes USE_LINUX_PREFIX= yes .include <bsd.port.pre.mk> @@ -34,9 +38,9 @@ RPMFLAGS+= --ignorearch DIST_SUBDIR?= rpm EXTRACT_ONLY= NO_BUILD= yes -NO_FILTER_SHLIBS= yes PLIST?= ${PKGDIR}/pkg-plist.${ARCH} MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} +LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig # Let's avoid hardcoding 'en' as the language. LANG= en @@ -62,6 +66,7 @@ do-install: ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done + @${LINUX_LDCONFIG} new-plist: @${RM} -rf ${WRKSRC}/tmp diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index d6256fc5f5df..f18b02bde642 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits linux MASTER_SITES= http://www.infostrategique.com/linuxrpms/legacy/9/ @@ -22,31 +22,15 @@ BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl ${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \ ${LINUXBASE}/usr/lib/libtiff.so.3.6.1:${PORTSDIR}/graphics/linux-tiff \ ${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \ - ${BUILD_DEPENDS} +RUN_DEPENDS+= ${BUILD_DEPENDS} DIST_SUBDIR= rpm/i386/rh9 -NO_MTREE= yes ONLY_FOR_ARCHS= i386 -PLIST= ${WRKDIR}/plist +PLIST= ${PKGDIR}/pkg-plist +USE_XLIB= yes RESTRICTED= "binaries under GNU LGPL without accompanying source" RPM_SET= gtk2-2.2.1-4.1.legacy.i386.rpm -pre-install: - ${RM} -f ${PLIST} -.for ii in gtk.immodules gdk-pixbuf.loaders - ${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST} -.endfor - ${MKDIR} ${WRKSRC}/tmp - cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \ - ${FIND} * -type f -o -type l >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \ - ${SED} -e 's:^:@dirrm :' >> ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} locale | \ - ${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \ - >> ${PLIST} - post-install: .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii} diff --git a/x11-toolkits/linux-gtk2/pkg-plist b/x11-toolkits/linux-gtk2/pkg-plist new file mode 100644 index 000000000000..0b6a30cde5a2 --- /dev/null +++ b/x11-toolkits/linux-gtk2/pkg-plist @@ -0,0 +1,184 @@ +etc/gtk-2.0/gtk.immodules +etc/gtk-2.0/gdk-pixbuf.loaders +usr/bin/gdk-pixbuf-query-loaders +usr/bin/gtk-demo +usr/bin/gtk-query-immodules-2.0 +usr/bin/testgtk +usr/bin/testtext +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la +usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la +usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la +usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la +usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la +usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la +usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la +usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la +usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so +usr/lib/libgdk-x11-2.0.so.0 +usr/lib/libgdk-x11-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf-2.0.so.0 +usr/lib/libgdk_pixbuf-2.0.so.0.200.1 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0 +usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1 +usr/lib/libgtk-x11-2.0.so.0 +usr/lib/libgtk-x11-2.0.so.0.200.1 +usr/share/doc/gtk2-2.2.1/AUTHORS +usr/share/doc/gtk2-2.2.1/COPYING +usr/share/doc/gtk2-2.2.1/ChangeLog +usr/share/doc/gtk2-2.2.1/NEWS +usr/share/doc/gtk2-2.2.1/README +usr/share/gtk-2.0/demo/alphatest.png +usr/share/gtk-2.0/demo/apple-red.png +usr/share/gtk-2.0/demo/appwindow.c +usr/share/gtk-2.0/demo/background.jpg +usr/share/gtk-2.0/demo/button_box.c +usr/share/gtk-2.0/demo/changedisplay.c +usr/share/gtk-2.0/demo/colorsel.c +usr/share/gtk-2.0/demo/dialog.c +usr/share/gtk-2.0/demo/drawingarea.c +usr/share/gtk-2.0/demo/editable_cells.c +usr/share/gtk-2.0/demo/floppybuddy.gif +usr/share/gtk-2.0/demo/gnome-applets.png +usr/share/gtk-2.0/demo/gnome-calendar.png +usr/share/gtk-2.0/demo/gnome-foot.png +usr/share/gtk-2.0/demo/gnome-gimp.png +usr/share/gtk-2.0/demo/gnome-gmush.png +usr/share/gtk-2.0/demo/gnome-gsame.png +usr/share/gtk-2.0/demo/gnu-keys.png +usr/share/gtk-2.0/demo/gtk-logo-rgb.gif +usr/share/gtk-2.0/demo/images.c +usr/share/gtk-2.0/demo/item_factory.c +usr/share/gtk-2.0/demo/list_store.c +usr/share/gtk-2.0/demo/menus.c +usr/share/gtk-2.0/demo/panes.c +usr/share/gtk-2.0/demo/pixbufs.c +usr/share/gtk-2.0/demo/sizegroup.c +usr/share/gtk-2.0/demo/stock_browser.c +usr/share/gtk-2.0/demo/textview.c +usr/share/gtk-2.0/demo/tree_store.c +usr/share/locale/am/LC_MESSAGES/gtk20.mo +usr/share/locale/az/LC_MESSAGES/gtk20.mo +usr/share/locale/be/LC_MESSAGES/gtk20.mo +usr/share/locale/bg/LC_MESSAGES/gtk20.mo +usr/share/locale/ca/LC_MESSAGES/gtk20.mo +usr/share/locale/cs/LC_MESSAGES/gtk20.mo +usr/share/locale/cy/LC_MESSAGES/gtk20.mo +usr/share/locale/da/LC_MESSAGES/gtk20.mo +usr/share/locale/de/LC_MESSAGES/gtk20.mo +usr/share/locale/el/LC_MESSAGES/gtk20.mo +usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo +usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo +usr/share/locale/es/LC_MESSAGES/gtk20.mo +usr/share/locale/et/LC_MESSAGES/gtk20.mo +usr/share/locale/eu/LC_MESSAGES/gtk20.mo +usr/share/locale/fa/LC_MESSAGES/gtk20.mo +usr/share/locale/fi/LC_MESSAGES/gtk20.mo +usr/share/locale/fr/LC_MESSAGES/gtk20.mo +usr/share/locale/ga/LC_MESSAGES/gtk20.mo +usr/share/locale/gl/LC_MESSAGES/gtk20.mo +usr/share/locale/he/LC_MESSAGES/gtk20.mo +usr/share/locale/hi/LC_MESSAGES/gtk20.mo +usr/share/locale/hr/LC_MESSAGES/gtk20.mo +usr/share/locale/hu/LC_MESSAGES/gtk20.mo +usr/share/locale/ia/LC_MESSAGES/gtk20.mo +usr/share/locale/it/LC_MESSAGES/gtk20.mo +usr/share/locale/ja/LC_MESSAGES/gtk20.mo +usr/share/locale/ko/LC_MESSAGES/gtk20.mo +usr/share/locale/lt/LC_MESSAGES/gtk20.mo +usr/share/locale/lv/LC_MESSAGES/gtk20.mo +usr/share/locale/mk/LC_MESSAGES/gtk20.mo +usr/share/locale/mn/LC_MESSAGES/gtk20.mo +usr/share/locale/ms/LC_MESSAGES/gtk20.mo +usr/share/locale/nl/LC_MESSAGES/gtk20.mo +usr/share/locale/nn/LC_MESSAGES/gtk20.mo +usr/share/locale/no/LC_MESSAGES/gtk20.mo +usr/share/locale/pl/LC_MESSAGES/gtk20.mo +usr/share/locale/pt/LC_MESSAGES/gtk20.mo +usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo +usr/share/locale/ro/LC_MESSAGES/gtk20.mo +usr/share/locale/ru/LC_MESSAGES/gtk20.mo +usr/share/locale/sk/LC_MESSAGES/gtk20.mo +usr/share/locale/sl/LC_MESSAGES/gtk20.mo +usr/share/locale/sp/LC_MESSAGES/gtk20.mo +usr/share/locale/sr/LC_MESSAGES/gtk20.mo +usr/share/locale/sv/LC_MESSAGES/gtk20.mo +usr/share/locale/ta/LC_MESSAGES/gtk20.mo +usr/share/locale/tr/LC_MESSAGES/gtk20.mo +usr/share/locale/uk/LC_MESSAGES/gtk20.mo +usr/share/locale/vi/LC_MESSAGES/gtk20.mo +usr/share/locale/wa/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo +usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo +usr/share/themes/Default/gtk-2.0-key/gtkrc +usr/share/themes/Emacs/gtk-2.0-key/gtkrc +usr/share/themes/Raleigh/gtk-2.0/gtkrc +@dirrm etc/gtk-2.0 +@dirrm usr/lib/gtk-2.0/2.2.0/immodules +@dirrm usr/lib/gtk-2.0/2.2.0/loaders +@dirrm usr/lib/gtk-2.0/2.2.0 +@dirrm usr/lib/gtk-2.0 +@dirrm usr/share/doc/gtk2-2.2.1 +@dirrm usr/share/gtk-2.0/demo +@dirrm usr/share/gtk-2.0 +@dirrm usr/share/themes/Default/gtk-2.0-key +@dirrm usr/share/themes/Default +@dirrm usr/share/themes/Emacs/gtk-2.0-key +@dirrm usr/share/themes/Emacs +@dirrm usr/share/themes/Raleigh/gtk-2.0 +@dirrm usr/share/themes/Raleigh +@dirrm usr/share/themes +@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/cy 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/en@IPA 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/fa 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ia 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lv 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/mk 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile index 40884e0cc17e..610ef74bf61c 100644 --- a/x11-toolkits/linux-openmotif/Makefile +++ b/x11-toolkits/linux-openmotif/Makefile @@ -6,7 +6,7 @@ PORTNAME= openmotif PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 @@ -19,12 +19,12 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Motif toolkit Linux libraries BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs ONLY_FOR_ARCHS= i386 +USE_LINUX= yes USE_LINUX_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes -NO_FILTER_SHLIBS= yes MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile index bfae1cfb4acb..a37e4a1daa9b 100644 --- a/x11-toolkits/linux-pango/Makefile +++ b/x11-toolkits/linux-pango/Makefile @@ -7,7 +7,7 @@ PORTNAME= pango PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -21,6 +21,7 @@ BUILD_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre RUN_DEPENDS= ${BUILD_DEPENDS} +USE_XLIB= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 PLIST= ${PKGDIR}/pkg-plist diff --git a/x11/XFree86/files/patch-e b/x11/XFree86/files/patch-e index cee217ed5cac..e69de29bb2d1 100644 --- a/x11/XFree86/files/patch-e +++ b/x11/XFree86/files/patch-e @@ -1,81 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Wed Jan 9 15:04:16 2002 -+++ config/cf/FreeBSD.cf Wed Jan 9 16:17:59 2002 -@@ -78,7 +78,7 @@ - #endif - - #define CcCmd cc --#define CppCmd /usr/libexec/cpp -+#define CppCmd /usr/bin/cpp - #define PreProcessCmd CppCmd - #define StandardCppDefines -traditional - #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) -@@ -141,12 +141,12 @@ - * reason for FreeBSD to assume that it knows where X libraries are installed - * and they can remove it from the list of directories they add to ld.so.cache - * in their /etc/rc file. -+ * -+ * For the ELF case, we default to the ExtraLoadFlags in bsdLib.rules - */ - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) - #ifndef ExtraLoadFlags --#if UseElfFormat --#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) --#else -+#if !UseElfFormat - #define ExtraLoadFlags -Wl,-R,$(USRLIBDIRPATH) - #endif - #endif -@@ -330,7 +330,13 @@ - # define AsmDefines AsmElfDefines - #endif - -+#ifdef i386Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines -+#endif -+#ifdef AlphaArchitecture -+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -+#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -+#endif - - #define StandardDefines -DCSRG_BASED - -@@ -355,14 +361,14 @@ - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 -+#define DefaultGcc2i386Opt - #endif - #endif - - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags - #endif - - #ifndef PreIncDir -@@ -471,14 +477,18 @@ - #define DlLibrary /**/ - #endif - -+#ifdef AlphaArchitecture -+#define IoLibrary -lio -+#else -+#define IoLibrary /**/ -+#endif -+ - #if BuildDynamicLoading --#define ServerExtraSysLibs DlLibrary -+#define ServerExtraSysLibs DlLibrary IoLibrary - #else --#define ServerExtraSysLibs /**/ -+#define ServerExtraSysLibs IoLibrary - #endif - - #include <bsdLib.rules> - --#ifdef i386Architecture - #include <xfree86.cf> --#endif diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile index ec25e4589a29..8163679953d5 100644 --- a/x11/linux-XFree86-libs/Makefile +++ b/x11/linux-XFree86-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86-libs PORTVERSION= 4.3.99.902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 linux MASTER_SITES= ${MASTER_SITE_SUSE} \ ftp://ftp.in2p3.fr/pub/linux/suse/update/9.1/rpm/i586/ \ @@ -27,13 +27,16 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux CONFLICTS= 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 -PLIST_DIRS= usr/X11R6/lib/X11 +PLIST_DIRS= usr/X11R6/lib/X11 \ + usr/X11R6/lib \ + usr/X11R6/bin \ + usr/X11R6 pre-install: @${RM} -f ${PLIST} diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile index 2abe16032092..a56da1166bf3 100644 --- a/x11/linux-gnomelibs/Makefile +++ b/x11/linux-gnomelibs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomelibs PORTVERSION= 1.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 linux MAINTAINER= freebsd-emulation@FreeBSD.org @@ -17,8 +17,4 @@ RPM_SET= gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" -.if (${MACHINE_ARCH} == "i386") -MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/ -.elif (${MACHINE_ARCH} == "alpha") -MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/alpha/RedHat/RPMS/ -.endif +MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/${MACHINE_ARCH}/RedHat/RPMS/ diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386 index 9f3fbc95a4de..371c3647bf78 100644 --- a/x11/linux-gnomelibs/pkg-plist.i386 +++ b/x11/linux-gnomelibs/pkg-plist.i386 @@ -116,3 +116,15 @@ usr/lib/libzvt.so.2 @dirrm etc/sound/events @dirrm etc/sound @dirrm etc/gnome +@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/eu 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/nn 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>&1 >/dev/null || true +@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>&1 >/dev/null || true diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index ba2f48c63fcc..d7d6c150aaa4 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -56,8 +56,8 @@ PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \ LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} .if !defined(WITHOUT_LINUX) -USE_LINUX?= yes -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +USE_LINUX= yes +USE_XLIB= yes PLIST_SUB+= LINUX="" .else PLIST_SUB+= LINUX="@comment " |