Sun Jan 29 10:11:01 2012 UTC ()
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.


(marino)
diff -r1.3 -r1.4 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile
diff -r1.2 -r1.3 pkgsrc/print/cups-drivers-Magicolor5440DL/distinfo
diff -r1.2 -r1.3 pkgsrc/print/cups-drivers-Magicolor5440DL/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile 2011/01/13 13:39:10 1.3
+++ pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile 2012/01/29 10:11:01 1.4
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.3 2011/01/13 13:39:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2012/01/29 10:11:01 marino Exp $
2# 2#
3 3
4DISTNAME= 5440DL_lin64bit_1_2_1 4DISTNAME= 5440DL_lin64bit_1_2_1
5PKGNAME= cups-drivers-Magicolor5440DL-1.2.1 5PKGNAME= cups-drivers-Magicolor5440DL-1.2.1
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= print 7CATEGORIES= print
8MASTER_SITES= http://printer.konicaminolta.net/drivers/linux/ 8MASTER_SITES= http://printer.konicaminolta.net/drivers/linux/
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://printer.konicaminolta.com/support/current_printers/mc5440dl_sup.htm 12HOMEPAGE= http://printer.konicaminolta.com/support/current_printers/mc5440dl_sup.htm
13COMMENT= CUPS drivers for printer Konica Minolta Magicolor 5440DL 13COMMENT= CUPS drivers for printer Konica Minolta Magicolor 5440DL
14 14
15BUILD_DEPENDS+= jbigkit>=1.6:../../graphics/jbigkit 15BUILD_DEPENDS+= jbigkit>=1.6:../../graphics/jbigkit
16DEPENDS+= cups>=1.1.14:../../print/cups 16DEPENDS+= cups>=1.1.14:../../print/cups
17DEPENDS+= ghostscript>=8.0:../../print/ghostscript 17DEPENDS+= ghostscript>=8.0:../../print/ghostscript
18 18
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
20 20
21WRKSRC= ${WRKDIR}/5440DL_64_v1.2.1/magicolor5440DL-1.2.1/ 21WRKSRC= ${WRKDIR}/5440DL_64_v1.2.1/magicolor5440DL-1.2.1/
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24USE_LANGUAGES= c 24USE_LANGUAGES= c
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26USE_TOOLS+= gmake 26USE_TOOLS+= gmake
27 27
 28LDFLAGS.DragonFly= -lm
 29
28post-extract: 30post-extract:
29 cd ${WRKDIR}/5440DL_64_v1.2.1/; \ 31 cd ${WRKDIR}/5440DL_64_v1.2.1/; \
30 extract_file=src/magicolor5440DL-1.2.1.tar.gz; ${EXTRACT_CMD} 32 extract_file=src/magicolor5440DL-1.2.1.tar.gz; ${EXTRACT_CMD}
31 33
32.include "../../graphics/lcms/buildlink3.mk" 34.include "../../graphics/lcms/buildlink3.mk"
33.include "../../graphics/jbigkit/buildlink3.mk" 35.include "../../graphics/jbigkit/buildlink3.mk"
34.include "../../print/cups/buildlink3.mk" 36.include "../../print/cups/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-drivers-Magicolor5440DL/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups-drivers-Magicolor5440DL/distinfo 2010/07/12 22:06:07 1.2
+++ pkgsrc/print/cups-drivers-Magicolor5440DL/distinfo 2012/01/29 10:11:01 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2010/07/12 22:06:07 jym Exp $ 1$NetBSD: distinfo,v 1.3 2012/01/29 10:11:01 marino Exp $
2 2
3SHA1 (5440DL_lin64bit_1_2_1.zip) = 130092a9345ec32a2681bacafaeadcc85563f1fa 3SHA1 (5440DL_lin64bit_1_2_1.zip) = 130092a9345ec32a2681bacafaeadcc85563f1fa
4RMD160 (5440DL_lin64bit_1_2_1.zip) = a0a5a51eef1a7798d0f8b8d07873bd60ac2cba9b 4RMD160 (5440DL_lin64bit_1_2_1.zip) = a0a5a51eef1a7798d0f8b8d07873bd60ac2cba9b
5Size (5440DL_lin64bit_1_2_1.zip) = 767491 bytes 5Size (5440DL_lin64bit_1_2_1.zip) = 767491 bytes
6SHA1 (patch-aa) = 0be07006869dfa0537082afdf484ddf0ba037613 6SHA1 (patch-aa) = 0b4566cd0b7c286eb2b59ebc66ee9b8d7bfb842b
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-drivers-Magicolor5440DL/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/cups-drivers-Magicolor5440DL/patches/patch-aa 2010/07/12 22:06:07 1.2
+++ pkgsrc/print/cups-drivers-Magicolor5440DL/patches/patch-aa 2012/01/29 10:11:01 1.3
@@ -1,36 +1,45 @@ @@ -1,36 +1,45 @@
1$NetBSD: patch-aa,v 1.2 2010/07/12 22:06:07 jym Exp $ 1$NetBSD: patch-aa,v 1.3 2012/01/29 10:11:01 marino Exp $
2- fix a typo about LDFLAGS 2- fix a typo about LDFLAGS
3- fix paths, some of them being hardcoded. 3- fix paths, some of them being hardcoded.
4--- configure.orig 2007-02-28 23:33:11.000000000 +0100 4--- configure.orig 2007-02-28 23:33:11.000000000 +0100
5+++ configure 5+++ configure
6@@ -2957,7 +2957,7 @@ fi 6@@ -2957,7 +2957,7 @@ fi
7 echo "$as_me: libdir is $libdir" >&6;} 7 echo "$as_me: libdir is $libdir" >&6;}
8 #filterdir=/usr/lib/cups/filter 8 #filterdir=/usr/lib/cups/filter
9 #AC_SUBST(filterdir) 9 #AC_SUBST(filterdir)
10-KM_PPDDIR=/usr/share/cups/model/KONICA_MINOLTA 10-KM_PPDDIR=/usr/share/cups/model/KONICA_MINOLTA
11+KM_PPDDIR=${datadir}/cups/model/KONICA_MINOLTA 11+KM_PPDDIR=${datadir}/cups/model/KONICA_MINOLTA
12  12
13  13
14 UNAME=`(uname) 2>/dev/null || echo unknown` 14 UNAME=`(uname) 2>/dev/null || echo unknown`
15@@ -2971,7 +2971,7 @@ cat >>confdefs.h <<_ACEOF 15@@ -2971,7 +2971,7 @@ cat >>confdefs.h <<_ACEOF
16 #define CUPS_SERVERBIN "$exec_prefix/libexec/cups" 16 #define CUPS_SERVERBIN "$exec_prefix/libexec/cups"
17 _ACEOF 17 _ACEOF
18  18
19- LDFLAGS="$LDFALGS -L/usr/local/lib" 19- LDFLAGS="$LDFALGS -L/usr/local/lib"
20+ LDFLAGS="$LDFLAGS -L/usr/local/lib" 20+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
21 CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/sw/include" 21 CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/sw/include"
22 KM_DATADIR=/Library/Printers/KONICA_MINOLTA/mc5440DL 22 KM_DATADIR=/Library/Printers/KONICA_MINOLTA/mc5440DL
23  23
 24@@ -2980,7 +2980,7 @@ cat >>confdefs.h <<_ACEOF
 25 _ACEOF
 26
 27 ;;
 28- *BSD*)
 29+ *BSD* | DragonFly*)
 30 # *BSD
 31 CUPS_SERVERBIN="$exec_prefix/libexec/cups"
 32
24@@ -2988,7 +2988,7 @@ cat >>confdefs.h <<_ACEOF 33@@ -2988,7 +2988,7 @@ cat >>confdefs.h <<_ACEOF
25 #define CUPS_SERVERBIN "$exec_prefix/libexec/cups" 34 #define CUPS_SERVERBIN "$exec_prefix/libexec/cups"
26 _ACEOF 35 _ACEOF
27  36
28- LDFLAGS="$LDFALGS -L/usr/local/lib" 37- LDFLAGS="$LDFALGS -L/usr/local/lib"
29+ LDFLAGS="$LDFLAGS -L/usr/local/lib" 38+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
30 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 39 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
31 KM_DATADIR="$datadir/KONICA_MINOLTA/mc5440DL" 40 KM_DATADIR="$datadir/KONICA_MINOLTA/mc5440DL"
32  41
33@@ -3239,7 +3239,7 @@ elif test -f "/usr/lib/libjbig.a"; then 42@@ -3239,7 +3239,7 @@ elif test -f "/usr/lib/libjbig.a"; then
34 elif test -f "/usr/local/lib64/libjbig.a"; then 43 elif test -f "/usr/local/lib64/libjbig.a"; then
35 LIBJBIG="/usr/local/lib64/libjbig.a" 44 LIBJBIG="/usr/local/lib64/libjbig.a"
36 else 45 else