summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2001-12-01 00:28:09 +0000
committerhubertf <hubertf@pkgsrc.org>2001-12-01 00:28:09 +0000
commitfa49666dcb5594cd98c46a756af1904835a0e168 (patch)
tree412926c1c7d45f05ac0067e13cbcf495d886899c
parent7b7cc0c08752133b5ff89f699baab8f54c7777da (diff)
downloadpkgsrc-fa49666dcb5594cd98c46a756af1904835a0e168.tar.gz
Bump to libflash-0.4.10nb1:
Add a patch needed for moz-flash so this package can also be used from X11BASE. Patch contributed by Johan Danielsson <joda@pdc.kth.se> in PR #14794
-rw-r--r--graphics/libflash/Makefile3
-rw-r--r--graphics/libflash/distinfo4
-rw-r--r--graphics/libflash/patches/patch-ae26
3 files changed, 26 insertions, 7 deletions
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 73d27b6163f..a6ec37fdd54 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/11/23 14:38:27 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/01 00:28:09 hubertf Exp $
#
PKGNAME= lib${DISTNAME}
+PKGREVISION= 1
COMMENT= open source flash(tm) library
diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index 9b3824c5f93..760fde08b4c 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/01 00:28:09 hubertf Exp $
SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
Size (flash-0.4.10.tgz) = 358995 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 084064cfd3d4e650f98b93dd07404a1c52828848
SHA1 (patch-ab) = e67474d893793b58cdf544722046d91e6cb2044b
SHA1 (patch-ac) = d2157455ce48225a8fc796262bc0a0585da854c5
SHA1 (patch-ad) = 177bb07d1377c1923f8548cdece23292c2b897b8
-SHA1 (patch-ae) = b0aa8935be57d383124305ec78574328974aa8e0
+SHA1 (patch-ae) = 5692f9b9e856799b6ef6a64545d1c111845857f8
SHA1 (patch-af) = 918bfd3f9f021dded65f8379bec3b42deb30cf65
SHA1 (patch-ag) = 74b9b37cd22be89dbbfba30ec37bb3b0caf3ead7
SHA1 (patch-ah) = 7765691da9862ec07ae5fa8d6551e0cbdb16567a
diff --git a/graphics/libflash/patches/patch-ae b/graphics/libflash/patches/patch-ae
index e924145ab04..e9263d9fbbc 100644
--- a/graphics/libflash/patches/patch-ae
+++ b/graphics/libflash/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-ae,v 1.2 2001/12/01 00:28:09 hubertf Exp $
---- Plugin/Makefile.orig Fri Aug 25 17:12:47 2000
-+++ Plugin/Makefile Fri Aug 25 17:15:15 2000
+--- Plugin/Makefile.orig Tue Sep 28 14:13:38 1999
++++ Plugin/Makefile Fri Nov 30 17:40:12 2001
+@@ -21,7 +21,7 @@
+
+ PLUGIN_DEFINES= -DXP_UNIX
+ OPTIMIZER=
+-FLASH=../Lib
++FLASH=${LOCALBASE}/include/flash
+
+ # Solaris
+ #LIBCXX=/usr/lib/libC.so
@@ -31,12 +31,12 @@
# Solaris (Sun compiler/linker)
#SHARED=-G
@@ -15,7 +24,16 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
-CFLAGS= $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
-LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
+CFLAGS= $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I${X11BASE}/include
-+LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) -L${LOCALBASE}/lib -R${LOCALBASE}/lib -ljpeg -lz
++LDFLAGS= -lflash $(LIBCXX) -L${LOCALBASE}/lib -R${LOCALBASE}/lib -ljpeg -lz
SRC= plugin.c npunix.c
OBJ= plugin.o npunix.o
+@@ -48,7 +48,7 @@
+ $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
+ $(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
+
+-plugin.o: $(FLASH)/flash.h
++plugin.o: ${LOCALBASE}/include/flash/flash.h
+
+ clean:
+ $(RM) $(OBJ) $(SHAREDTARGET)