summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2000-12-21 16:59:31 +0000
committerjlam <jlam@pkgsrc.org>2000-12-21 16:59:31 +0000
commit1bb4b8cfc62463d75f0864439c82344bfe4bbe4b (patch)
tree4a97d6aa12de4a02607d91b3894bf3ea3206a450 /print
parent01168ffc8287cac32312df8e18af76f80400568d (diff)
downloadpkgsrc-1bb4b8cfc62463d75f0864439c82344bfe4bbe4b.tar.gz
Update cups to 1.1.5.1. Changes from version 1.1.5 are only fixes to the
build process.
Diffstat (limited to 'print')
-rw-r--r--print/cups/Makefile19
-rw-r--r--print/cups/files/md54
-rw-r--r--print/cups/files/patch-sum8
-rw-r--r--print/cups/patches/patch-ab11
-rw-r--r--print/cups/patches/patch-ac17
-rw-r--r--print/cups/patches/patch-af82
6 files changed, 46 insertions, 95 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 35e2727f40a..808c175c1ec 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2000/12/21 14:59:37 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2000/12/21 16:59:31 jlam Exp $
#
-DISTNAME= cups-1.1.5-source
-PKGNAME= ${DISTNAME:S/-source//}
-VERS= ${PKGNAME:S/cups-//}
-WRKSRC= ${WRKDIR}/${PKGNAME}
+DISTNAME= cups-${VERS}-1-source
+PKGNAME= cups-${VERS}.1
+VERS= 1.1.5
+WRKSRC= ${WRKDIR}/cups-${VERS}
CATEGORIES= print
MASTER_SITES= ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
ftp://ftp.easysw.com/pub/cups/${VERS}/ \
@@ -75,16 +75,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL
DOCDIR= ${PREFIX}/share/doc/cups
EGDIR= ${PREFIX}/share/examples/cups
-# The Okidata PPD files are missing, but on the CUPS mailing list,
-# Michael Sweet says that the following should work.
-#
post-extract:
- ${SED} -e "s,EPSON24,OKIDAT24,g" \
- -e "s,EPSON,OKIDATA,g" \
- < ${WRKSRC}/ppd/epson24.ppd > ${WRKSRC}/ppd/okidat24.ppd
- ${SED} -e "s,EPSON9,OKIDATA9,g" \
- -e "s,EPSON,OKIDATA,g" \
- < ${WRKSRC}/ppd/epson9.ppd > ${WRKSRC}/ppd/okidata9.ppd
cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in
pre-configure:
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index 1814eee5d60..c8aeaeeecbf 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: md5,v 1.5 2000/12/21 16:59:32 jlam Exp $
-MD5 (cups-1.1.5-source.tar.bz2) = 380f9c5c299a026f4f6a4ead11ee709f
+MD5 (cups-1.1.5-1-source.tar.bz2) = 2e96691f5ed846f9d1c005fd0b5a5417
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index 8477a870253..b81d0c1e2f5 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.7 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-sum,v 1.8 2000/12/21 16:59:32 jlam Exp $
MD5 (patch-aa) = 53110457446460159d9c4c25d31d2c91
-MD5 (patch-ab) = 72eaff562a210e099db8e2d56d541fb5
-MD5 (patch-ac) = fc28a0c6645a8b196c4fe47fada597bc
+MD5 (patch-ab) = 2f1eaecaa15170102f2338d7e63f3bb6
+MD5 (patch-ac) = 7ef2e9cff08d5157ecfffb7fe6a0d151
MD5 (patch-ad) = 4ea2faaf4cf0ef1a75a3b35d964683e1
MD5 (patch-ae) = c50a8a409a9706f320784a294d082c50
-MD5 (patch-af) = 0f5879a4848e4bbb960f2001d9b0d130
+MD5 (patch-af) = d5f1fc6b8b42a6594de5fbaaa936f0fc
MD5 (patch-ag) = 6ec463d6b203a2e539f17b61461c8c2a
MD5 (patch-ah) = 116f451ad6bcb3a503de727b1197ea07
MD5 (patch-ai) = 721ac5183c1746596fbeaff662f68c62
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 98746e55f1a..ed0cd005e16 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2000/12/21 16:59:32 jlam Exp $
---- Makefile.orig Sun Dec 10 23:40:31 2000
+--- Makefile.orig Thu Dec 21 08:45:21 2000
+++ Makefile
@@ -60,8 +60,8 @@
echo Installing in $$dir... ;\
@@ -13,12 +13,7 @@ $NetBSD: patch-ab,v 1.5 2000/12/21 14:59:38 jlam Exp $
echo Installing in data...
(cd data; $(MAKE) $(MFLAGS) install)
echo Installing in doc...
-@@ -71,11 +71,11 @@
- echo Installing in locale...
- (cd locale; $(MAKE) $(MFLAGS) install)
- echo Installing in ppd...
--\ (cd ppd; $(MAKE) $(MFLAGS) install)
-+ (cd ppd; $(MAKE) $(MFLAGS) install)
+@@ -75,7 +75,7 @@
echo Installing in templates...
(cd templates; $(MAKE) $(MFLAGS) install)
echo Installing startup script...
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index 9e555f73b84..b68e6cb0123 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2000/12/21 16:59:32 jlam Exp $
---- backend/serial.c.orig Wed Dec 6 17:56:08 2000
+--- backend/serial.c.orig Thu Dec 21 08:45:21 2000
+++ backend/serial.c
@@ -48,9 +48,9 @@
# include <unistd.h>
@@ -18,11 +18,11 @@ $NetBSD: patch-ac,v 1.4 2000/12/21 14:59:38 jlam Exp $
void
list_devices(void)
{
--#if defined(__hpux) || defined(__sgi) || defined(__sun)
+-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
static char *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
/* Funky hex numbering used for some devices */
--#endif /* __hpux || __sgi || __sun */
+-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
#ifdef __linux
@@ -36,11 +36,11 @@ $NetBSD: patch-ac,v 1.4 2000/12/21 14:59:38 jlam Exp $
int i, j; /* Looping vars */
int fd; /* File descriptor */
char device[255]; /* Device filename */
-@@ -800,6 +800,42 @@
+@@ -800,6 +800,43 @@
device, i + 1);
}
}
-+#elif defined(__NetBSD__)
+++#elif defined(__NetBSD__)
+ int i, j; /* Looping vars */
+ int fd; /* File descriptor */
+ char device[255]; /* Device filename */
@@ -72,10 +72,11 @@ $NetBSD: patch-ac,v 1.4 2000/12/21 14:59:38 jlam Exp $
+ if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+ {
+ close(fd);
-+ printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
-+ device, i, j + 1);
++ printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Prt #%d\"\n",
++ device, i, j + 1);
+ }
+ }
++
#endif
}
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index f7ce9ee4136..8b528e51482 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-af,v 1.4 2000/12/21 16:59:32 jlam Exp $
---- configure.in.orig Wed Dec 20 13:46:14 2000
+--- configure.in.orig Thu Dec 21 08:45:21 2000
+++ configure.in
@@ -117,4 +117,12 @@
AC_ARG_WITH(fontpath, [ --with-fontpath set font path for pstoraster],fontpath="$withval",fontpath="")
@@ -15,20 +15,20 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+
dnl Checks for programs...
AC_PROG_AWK
-@@ -197,8 +205,25 @@
+@@ -201,9 +209,24 @@
+ SAVELIBS="$LIBS"
- if test "$enable_ssl" = "yes"; then
+- LIBS="-lcrypto $LIBS"
- AC_CHECK_LIB(ssl,SSL_new,
- SSLLIBS="-lssl -lcrypto"
- AC_DEFINE(HAVE_LIBSSL)
- )
-+ #
-+ # Some ELF systems can't resolve all the symbols in libcrypto
-+ # if libcrypto was linked against RSAREF, and fail to link the
-+ # test program correctly, even though a correct installation
-+ # of OpenSSL exists. So we test the linking three times in
-+ # case the RSAREF libraries are needed.
-+ #
++ dnl Some ELF systems can't resolve all the symbols in libcrypto
++ dnl if libcrypto was linked against RSAREF, and fail to link the
++ dnl test program correctly, even though a correct installation
++ dnl of OpenSSL exists. So we test the linking three times in
++ dnl case the RSAREF libraries are needed.
++ dnl
+ for libcrypto in \
+ "-lcrypto" \
+ "-lcrypto -lrsaref" \
@@ -43,52 +43,22 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+ break
+ fi
+ done
- fi
-@@ -250,4 +275,5 @@
+ LIBS="$SAVELIBS"
+@@ -257,4 +280,5 @@
AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H))
AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
+AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
dnl Checks for string functions.
-@@ -384,10 +410,6 @@
-
- dnl Fix "datadir" variable if it hasn't been specified...
--if test "$datadir" = "\${prefix}/share"; then
-- if test "$prefix" = "/"; then
-- datadir="/usr/share"
-- else
-- datadir="$prefix/share"
+@@ -396,5 +420,5 @@
+ else
+ datadir="$prefix/share"
- fi
-+if test "$datadir" = "\${prefix}/share" -a "$prefix" = "/"; then
-+ datadir="/usr/share"
- fi
-
-@@ -398,19 +420,11 @@
-
- dnl Fix "localstatedir" variable if it hasn't been specified...
--if test "$localstatedir" = "\${prefix}/var"; then
-- if test "$prefix" = "/"; then
-- localstatedir="/var"
-- else
-- localstatedir="$prefix/var"
-- fi
-+if test "$localstatedir" = "\${prefix}/var" -a "$prefix" = "/"; then
-+ localstatedir="/var"
++ fi
fi
- dnl Fix "sysconfdir" variable if it hasn't been specified...
--if test "$sysconfdir" = "\${prefix}/etc"; then
-- if test "$prefix" = "/"; then
-- sysconfdir="/etc"
-- else
-- sysconfdir="$prefix/etc"
-- fi
-+if test "$sysconfdir" = "\${prefix}/etc" -a "$prefix" = "/"; then
-+ sysconfdir="/etc"
- fi
-
-@@ -422,14 +436,23 @@
+@@ -429,9 +453,18 @@
dnl Fix "mandir" variable...
if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
- if test "$uname" = "IRIX"; then
@@ -112,13 +82,7 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+ esac
fi
- dnl Fix "fontpath" variable...
- if test "x$fontpath" = "x"; then
-- fontpath="$datadir/cups/fonts"
-+ fontpath="$exec_prefix/share/cups/fonts"
- fi
-
-@@ -503,11 +526,11 @@
+@@ -510,11 +543,11 @@
dnl Setup default locations...
-CUPS_SERVERROOT='${prefix}/etc/cups'
@@ -137,16 +101,16 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
dnl See what directory to put server executables...
-@@ -560,6 +583,6 @@
+@@ -567,6 +600,6 @@
dnl Set the CUPS_DOCROOT directory...
-CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
-+CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups'
-+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups")
++CUPS_DOCROOT='${datadir}/doc/html/cups'
++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
AC_SUBST(CUPS_DOCROOT)
-@@ -567,5 +590,5 @@
+@@ -574,5 +607,5 @@
AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
-AC_OUTPUT(Makedefs cups.sh)