pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/cups-drivers-Magicolor5440DL print/cups-drivers-...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0bed3dfd83f7
branches:  trunk
changeset: 598729:0bed3dfd83f7
user:      marino <marino%pkgsrc.org@localhost>
date:      Sun Jan 29 10:11:01 2012 +0000

description:
print/cups-drivers-Magicolor5440DL: Fix PLIST problem on DragonFly

The configure script was looking for BSD in the uname, which DragonFly
does not have, and as a result was installing the driver in the wrong
directory.

Also indirect linking was removed for DragonFly only.

diffstat:

 print/cups-drivers-Magicolor5440DL/Makefile         |   6 ++++--
 print/cups-drivers-Magicolor5440DL/distinfo         |   4 ++--
 print/cups-drivers-Magicolor5440DL/patches/patch-aa |  11 ++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r db57c4f8fa98 -r 0bed3dfd83f7 print/cups-drivers-Magicolor5440DL/Makefile
--- a/print/cups-drivers-Magicolor5440DL/Makefile       Sun Jan 29 10:09:29 2012 +0000
+++ b/print/cups-drivers-Magicolor5440DL/Makefile       Sun Jan 29 10:11:01 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/01/13 13:39:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/29 10:11:01 marino Exp $
 #
 
 DISTNAME=      5440DL_lin64bit_1_2_1
 PKGNAME=       cups-drivers-Magicolor5440DL-1.2.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  http://printer.konicaminolta.net/drivers/linux/
 EXTRACT_SUFX=  .zip
@@ -25,6 +25,8 @@
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake
 
+LDFLAGS.DragonFly=     -lm
+
 post-extract:
        cd ${WRKDIR}/5440DL_64_v1.2.1/; \
                extract_file=src/magicolor5440DL-1.2.1.tar.gz; ${EXTRACT_CMD}
diff -r db57c4f8fa98 -r 0bed3dfd83f7 print/cups-drivers-Magicolor5440DL/distinfo
--- a/print/cups-drivers-Magicolor5440DL/distinfo       Sun Jan 29 10:09:29 2012 +0000
+++ b/print/cups-drivers-Magicolor5440DL/distinfo       Sun Jan 29 10:11:01 2012 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/07/12 22:06:07 jym Exp $
+$NetBSD: distinfo,v 1.3 2012/01/29 10:11:01 marino Exp $
 
 SHA1 (5440DL_lin64bit_1_2_1.zip) = 130092a9345ec32a2681bacafaeadcc85563f1fa
 RMD160 (5440DL_lin64bit_1_2_1.zip) = a0a5a51eef1a7798d0f8b8d07873bd60ac2cba9b
 Size (5440DL_lin64bit_1_2_1.zip) = 767491 bytes
-SHA1 (patch-aa) = 0be07006869dfa0537082afdf484ddf0ba037613
+SHA1 (patch-aa) = 0b4566cd0b7c286eb2b59ebc66ee9b8d7bfb842b
diff -r db57c4f8fa98 -r 0bed3dfd83f7 print/cups-drivers-Magicolor5440DL/patches/patch-aa
--- a/print/cups-drivers-Magicolor5440DL/patches/patch-aa       Sun Jan 29 10:09:29 2012 +0000
+++ b/print/cups-drivers-Magicolor5440DL/patches/patch-aa       Sun Jan 29 10:11:01 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2010/07/12 22:06:07 jym Exp $
+$NetBSD: patch-aa,v 1.3 2012/01/29 10:11:01 marino Exp $
 - fix a typo about LDFLAGS
 - fix paths, some of them being hardcoded.
 --- configure.orig     2007-02-28 23:33:11.000000000 +0100
@@ -21,6 +21,15 @@
                CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/sw/include"
                KM_DATADIR=/Library/Printers/KONICA_MINOLTA/mc5440DL
  
+@@ -2980,7 +2980,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+                 ;;
+-        *BSD*)
++        *BSD* | DragonFly*)
+                 # *BSD
+                 CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+ 
 @@ -2988,7 +2988,7 @@ cat >>confdefs.h <<_ACEOF
  #define CUPS_SERVERBIN "$exec_prefix/libexec/cups"
  _ACEOF



Home | Main Index | Thread Index | Old Index