summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhorben <khorben>2016-03-21 17:48:30 +0000
committerkhorben <khorben>2016-03-21 17:48:30 +0000
commit868996c9252e88fd7524157bcabbba40f727cb67 (patch)
tree83337362be5940e6adce784e8fb6992edc47e71d
parenta8e044bb57a8878c649a2501636452197010214f (diff)
downloadpkgsrc-868996c9252e88fd7524157bcabbba40f727cb67.tar.gz
Add support for CFLAGS
This fixes the build with PKGSRC_MKPIE.
-rw-r--r--multimedia/fxtv/distinfo5
-rw-r--r--multimedia/fxtv/patches/patch-aa14
-rw-r--r--multimedia/fxtv/patches/patch-videolib_Makefile16
3 files changed, 27 insertions, 8 deletions
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index a40c35131b4..4d38d87b2f9 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 23:54:24 agc Exp $
+$NetBSD: distinfo,v 1.18 2016/03/21 17:48:30 khorben Exp $
SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
SHA512 (fxtv-1.03.tgz) = 5aa0372227f7c8d5b7bdf4885fead20ce174fcd1102e77febcd5166ecc1a8123f15c9b23ca536b9486bd281ff1c872c96f32845a188d503564de9aebc0d26016
Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 1dcf7033dd1b48d49de56d3d814f506741fd38f9
+SHA1 (patch-aa) = 0a1eeea6abc5818b1ae18116465c40ff2fdf0c45
SHA1 (patch-ab) = 803ef888b8894617b4f3516fc6822784aba314ee
SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
SHA1 (patch-actions_c) = 3b1c75de416c66a9f502d9096a31192363da4ac9
@@ -36,3 +36,4 @@ SHA1 (patch-bg) = 8078acbccbb34bb30251187f56cb2a28db579bf4
SHA1 (patch-ca) = f80c76b57cd6b4be91a432d506141896d6630be5
SHA1 (patch-remotetrans_c) = 87e8cc3ad428c082f89d76c018bcca76298d62cf
SHA1 (patch-tvscreen_c) = 4e9d49674610e827a42ea02fc350698c435162cf
+SHA1 (patch-videolib_Makefile) = a15a33fb4e756d2b2ddfa2e72835b1ffcbcd8c60
diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa
index 3ea6dfbe041..e114b2a3519 100644
--- a/multimedia/fxtv/patches/patch-aa
+++ b/multimedia/fxtv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2011/07/05 03:27:22 dholland Exp $
+$NetBSD: patch-aa,v 1.10 2016/03/21 17:48:30 khorben Exp $
Config for pkgsrc.
---- Makefile.orig 2001-02-12 23:08:59.000000000 +0100
+--- Makefile.orig 2001-02-12 22:08:59.000000000 +0000
+++ Makefile
@@ -4,13 +4,10 @@
@@ -36,7 +36,7 @@ Config for pkgsrc.
# OpenBSD stuff
#
ifeq ($(OS),OpenBSD)
-@@ -50,10 +38,13 @@ endif
+@@ -50,19 +38,22 @@ endif
ifeq ($(OS),NetBSD)
override RPATH_FLAG = -R
endif
@@ -52,12 +52,14 @@ Config for pkgsrc.
endif
#
-@@ -62,7 +53,7 @@ endif
+ # CFLAGS
+ #
ifneq ($(DEBUG),NO)
- override CFLAGS = -DDEBUG -g
+- override CFLAGS = -DDEBUG -g
++ override CFLAGS += -DDEBUG -g
else
- override CFLAGS = -DNDEBUG -O2
-+ override CFLAGS = -DNDEBUG
++ override CFLAGS += -DNDEBUG
endif
C_WARN_FLAG = -Wall
override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS)
diff --git a/multimedia/fxtv/patches/patch-videolib_Makefile b/multimedia/fxtv/patches/patch-videolib_Makefile
new file mode 100644
index 00000000000..c029765fe74
--- /dev/null
+++ b/multimedia/fxtv/patches/patch-videolib_Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-videolib_Makefile,v 1.1 2016/03/21 17:48:30 khorben Exp $
+
+--- videolib/Makefile.orig 2001-02-12 19:04:45.000000000 +0000
++++ videolib/Makefile
+@@ -13,9 +13,9 @@ override INC =
+ # CFLAGS
+ #
+ ifneq ($(DEBUG),NO)
+- override CFLAGS = -DDEBUG -g
++ override CFLAGS += -DDEBUG -g
+ else
+- override CFLAGS = -DNDEBUG -O2
++ override CFLAGS += -DNDEBUG -O2
+ endif
+ C_WARN_FLAG = -Wall
+ override CFLAGS += $(C_WARN_FLAG) $(INC)