diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2000-04-21 04:00:08 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-04-21 04:00:08 +0000 |
commit | aa8cc2cf03a18a1bd902d5df6038ea138b2c5f9b (patch) | |
tree | fa781a1b031d368925762cfc576ec29230918812 /www | |
parent | Update to 1.5. An alpha binary is now available, too. (diff) |
Unbreak for systems posterior to 4.0-RELEASE:
- Download and install the binary compiled on 2.2.x.
- Recommend to install linux-flashplugin instead for Linux Netscape.
(For old installations)
Define CXXFLAGS in Makefile to build correctly.
Notes
Notes:
svn path=/head/; revision=27832
Diffstat (limited to 'www')
-rw-r--r-- | www/flashplugin/Makefile | 37 | ||||
-rw-r--r-- | www/flashplugin/distinfo | 1 | ||||
-rw-r--r-- | www/flashplugin/files/patch-aa | 11 | ||||
-rw-r--r-- | www/flashplugin/pkg-req | 5 |
4 files changed, 36 insertions, 18 deletions
diff --git a/www/flashplugin/Makefile b/www/flashplugin/Makefile index 93c4ac00b403..bca75e9f604e 100644 --- a/www/flashplugin/Makefile +++ b/www/flashplugin/Makefile @@ -10,19 +10,19 @@ PORTVERSION= 0.4.3 CATEGORIES= www graphics MASTER_SITES= http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \ http://perso.club-internet.fr/odebon/flash/Linux/ -DISTNAME= flash-${PORTVERSION} -EXTRACT_SUFX= .tgz - -PATCH_SITES= http://leed.t.u-tokyo.ac.jp/~yamagata/flash/ -PATCHFILES= flash-0.4.3-fbsd-19990512.patch MAINTAINER= knu@idaemons.org .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 400000 -BROKEN= "This port will only build a broken binary under FreeBSD 4.0 or later. Try pkg_add'ing 3-STABLE's package with compat30 installed." -.endif +.if ${OSVERSION} < 400000 +MASTER_SITES= http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \ + http://perso.club-internet.fr/odebon/flash/Linux/ +DISTNAME= flash-${PORTVERSION} +EXTRACT_SUFX= .tgz + +PATCH_SITES= http://leed.t.u-tokyo.ac.jp/~yamagata/flash/ +PATCHFILES= flash-0.4.3-fbsd-19990512.patch USE_XLIB= yes MAKE_ENV= OBJFORMAT=aout LIBRARY_PATH=${PREFIX}/lib/aout @@ -34,12 +34,29 @@ pre-build: @${CAT} ${FILESDIR}/message.nolib @${FALSE} .endif +.else +MASTER_SITES= http://leed.t.u-tokyo.ac.jp/~yamagata/flash/ +DISTNAME= libswf.so +EXTRACT_SUFX= .gz + +NO_WRKSUBDIR= yes +NO_BUILD= yes + +do-extract: + @${MKDIR} ${WRKDIR} + @${GUNZIP_CMD} -c ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/libswf.so + +do-patch: + @${DO_NADA} +.endif + +TARGETDIR= ${PREFIX}/lib/netscape/plugins do-install: .if !defined(PACKAGE_BUILDING) @PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .endif - ${MKDIR} ${PREFIX}/lib/netscape/plugins - cd ${WRKSRC} && ${SETENV} OBJFORMAT=aout ${INSTALL_PROGRAM} libswf.so ${PREFIX}/lib/netscape/plugins + ${MKDIR} ${TARGETDIR} + ${SETENV} OBJFORMAT=aout ${INSTALL_PROGRAM} ${WRKSRC}/libswf.so ${TARGETDIR} .include <bsd.port.post.mk> diff --git a/www/flashplugin/distinfo b/www/flashplugin/distinfo index 44bd9fb02bc6..e890310ba044 100644 --- a/www/flashplugin/distinfo +++ b/www/flashplugin/distinfo @@ -1,2 +1,3 @@ MD5 (flash-0.4.3.tgz) = 87b855c1ac5ea38bfa668b98a099d3b5 MD5 (flash-0.4.3-fbsd-19990512.patch) = 57784f1045062aa23c584b2f5bbc6483 +MD5 (libswf.so.gz) = 1687562e577bc189c1a2591fcc91da3a diff --git a/www/flashplugin/files/patch-aa b/www/flashplugin/files/patch-aa index db18db307e0e..4f9b0c4058df 100644 --- a/www/flashplugin/files/patch-aa +++ b/www/flashplugin/files/patch-aa @@ -1,10 +1,13 @@ ---- Makefile.orig Sun Oct 3 02:41:07 1999 -+++ Makefile Sun Oct 3 02:41:43 1999 -@@ -1,6 +1,4 @@ +--- Makefile.orig Fri Apr 21 11:47:57 2000 ++++ Makefile Fri Apr 21 11:59:25 2000 +@@ -1,8 +1,6 @@ -CC=cc -CXX=/usr/bin/c++ -CFLAGS=-I/usr/X11R6/include -I./Lib -I./Plugin -fpic -fno-rtti -DXP_UNIX +-CFLAGS+=-O2 +CFLAGS+=-I/usr/X11R6/include -I./Lib -I./Plugin -fpic -fno-rtti -DXP_UNIX - CFLAGS+=-O2 CFLAGS+=-DCHECK_TEXT_PLAIN ++CXXFLAGS+=${CFLAGS} + OBJS = adpcm.o bitmap.o button.o character.o cxform.o \ + displaylist.o flash.o font.o graphic.o matrix.o \ diff --git a/www/flashplugin/pkg-req b/www/flashplugin/pkg-req index 10557afd1fbf..3b10dd00364b 100644 --- a/www/flashplugin/pkg-req +++ b/www/flashplugin/pkg-req @@ -20,10 +20,7 @@ if file $check | grep -qw ELF ; then It seems you are using Netscape for Linux, but the binary that you are going to install is a FreeBSD's a.out. -Go get the Linux binary at: - http://www.geocities.com/TimesSquare/Labyrinth/5084/flash.html - -or use Netscape for FreeBSD with this port. +Install www/linux-flashplugin port instead. **** EOF exit 1 |