summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorgrant <grant>2003-05-06 19:52:43 +0000
committergrant <grant>2003-05-06 19:52:43 +0000
commit372cf72024568b0afdd55976c1e7cceb9d513f08 (patch)
tree3224db61f17f97e0cc37e3fd0275bd55de646ae4 /sysutils
parent94a61cfc64fc560df98dffbc93f91f0f11c96404 (diff)
downloadpkgsrc-372cf72024568b0afdd55976c1e7cceb9d513f08.tar.gz
make this build on Solaris.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cdrecord/Makefile8
-rw-r--r--sysutils/cdrecord/distinfo4
-rw-r--r--sysutils/cdrecord/patches/patch-ac8
3 files changed, 14 insertions, 6 deletions
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 7b95c871e9e..dc6e958f380 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/03/08 08:16:58 grant Exp $
+# $NetBSD: Makefile,v 1.48 2003/05/06 19:52:43 grant Exp $
DISTNAME= cdrtools-2.0
PKGNAME= cdrecord-2.0
@@ -29,6 +29,12 @@ MAKE_ENV+= MAKEPROG="gmake"
MAKE_ENV+= COPTX="${CFLAGS}"
MAKE_ENV+= LDOPTX="${LDFLAGS}"
+# if we're using a gcc which is named gcc, we need to set CCOM=gcc
+# in MAKE_ENV so the make infrastructure picks the right options.
+.if !empty(CC:M*gcc*)
+MAKE_ENV+= CCOM="gcc"
+.endif
+
# allow us to override the default /etc/default/cdrecord by patching
# the documentation appropriately. Additionally, we also provide a
# MESSAGE stating the reasons we do this, as required by the license.
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index 79b60a2952f..adeb007c746 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2003/03/08 08:16:58 grant Exp $
+$NetBSD: distinfo,v 1.10 2003/05/06 19:52:44 grant Exp $
SHA1 (cdrtools-2.0.tar.gz) = a6645d541a40a0374d6ebffae699555273e41cb0
Size (cdrtools-2.0.tar.gz) = 1583252 bytes
-SHA1 (patch-ac) = 52622d8fc4170a9c0310c810badc74bb3b9c9df8
+SHA1 (patch-ac) = 9e091493ccce1a78d3bf764fae89cf040f22045a
SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
index 753ebb242e7..00a0cae35fe 100644
--- a/sysutils/cdrecord/patches/patch-ac
+++ b/sysutils/cdrecord/patches/patch-ac
@@ -1,16 +1,18 @@
-$NetBSD: patch-ac,v 1.13 2003/01/03 16:27:10 lukem Exp $
+$NetBSD: patch-ac,v 1.14 2003/05/06 19:52:44 grant Exp $
--- include/btorder.h.orig Mon Dec 10 10:54:27 2001
+++ include/btorder.h
-@@ -28,6 +28,7 @@
+@@ -28,6 +28,9 @@
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
#define _INCL_SYS_TYPES_H
#endif
++#ifdef __NetBSD__
+#include <machine/endian.h>
++#endif
#ifndef _MCONFIG_H
#include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
-@@ -108,7 +109,7 @@ error Only one of _BIT_FIELDS_LTOH or _
+@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)