Make CUPS_SERVERBIN points to $PREFIX/libexec/cups for solaris too

Correct man extentions for solaris.
Use ${PKGLOCALEDIR} in PLIST for locale directories.

3 files changed, 58 insertions, 22 deletions

diff --git a/print/cups/PLIST b/print/cups/PLIST
index 699bad1d23d..32ff1a873e5 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/10/20 18:57:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/10/25 10:49:03 bouyer Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -429,27 +429,27 @@ share/examples/cups/cupsd.conf
 share/examples/cups/mime.convs
 share/examples/cups/mime.types
 share/examples/cups/printers.conf
-share/locale/C/cups_C
-share/locale/be/cups_be
-share/locale/cs/cups_cs
-share/locale/de/cups_de
-share/locale/en/cups_en
-share/locale/es/cups_es
-share/locale/fr/cups_fr
-share/locale/he/cups_he
-share/locale/it/cups_it
-share/locale/ru_RU.cp1251/cups_ru_RU.cp1251
-share/locale/ru_RU.koi8r/cups_ru_RU.koi8r
-share/locale/sv/cups_sv
-share/locale/uk/cups_uk
-share/locale/uk_UA.cp1251/cups_uk_UA.cp1251
-share/locale/zh_CN/cups_zh_CN
+${PKGLOCALEDIR}/locale/C/cups_C
+${PKGLOCALEDIR}/locale/be/cups_be
+${PKGLOCALEDIR}/locale/cs/cups_cs
+${PKGLOCALEDIR}/locale/de/cups_de
+${PKGLOCALEDIR}/locale/en/cups_en
+${PKGLOCALEDIR}/locale/es/cups_es
+${PKGLOCALEDIR}/locale/fr/cups_fr
+${PKGLOCALEDIR}/locale/he/cups_he
+${PKGLOCALEDIR}/locale/it/cups_it
+${PKGLOCALEDIR}/locale/ru_RU.cp1251/cups_ru_RU.cp1251
+${PKGLOCALEDIR}/locale/ru_RU.koi8r/cups_ru_RU.koi8r
+${PKGLOCALEDIR}/locale/sv/cups_sv
+${PKGLOCALEDIR}/locale/uk/cups_uk
+${PKGLOCALEDIR}/locale/uk_UA.cp1251/cups_uk_UA.cp1251
+${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN
 share/cups/charsets/windows-874
-@unexec ${RMDIR} %D/share/locale/uk_UA.cp1251 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/ru_RU.koi8r 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/ru_RU.cp1251 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/be 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/locale/C 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/uk_UA.cp1251 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.koi8r 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.cp1251 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/be 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/C 2>/dev/null || ${TRUE}
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
 @dirrm share/doc/html/cups/fr/images
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 9a78156d800..79ee16bfe6c 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2002/10/20 18:57:37 jlam Exp $
+$NetBSD: distinfo,v 1.18 2002/10/25 10:49:03 bouyer Exp $
 
 SHA1 (cups-1.1.16-source.tar.bz2) = 648beac667f0757d046840b8a812252aa8667487
 Size (cups-1.1.16-source.tar.bz2) = 3394088 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ai) = b2d4d3d8d916c0ef3c22b93fe3b93a7d11f77632
 SHA1 (patch-aj) = cfdb158f11ad55236cbc68e49447c4ee2f9585b8
 SHA1 (patch-ak) = 7884b204e0b21226bb9159c712d8b3e5f0fc107c
 SHA1 (patch-al) = 3928fd2348678b25b1607eb7317576d86eaf35df
+SHA1 (patch-am) = 9209b5366315951b4e5663f9d5e52d940faaf145
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
new file mode 100644
index 00000000000..1f3361bf333
--- /dev/null
+++ b/print/cups/patches/patch-am
@@ -0,0 +1,35 @@
+$NetBSD: patch-am,v 1.3 2002/10/25 10:49:03 bouyer Exp $
+
+--- configure.orig	Mon Oct  7 17:40:29 2002
++++ configure	Fri Oct 25 12:23:54 2002
+@@ -5963,9 +5963,9 @@
+ 	*)
+ 		# All others
+ 		INSTALL_SYSV="install-sysv"
+-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
++		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+ 		cat >>confdefs.h <<_ACEOF
+-#define CUPS_SERVERBIN "$exec_prefix/lib/cups"
++#define CUPS_SERVERBIN "$exec_prefix/libexec/cups"
+ _ACEOF
+ 
+ 		;;
+@@ -6085,12 +6085,12 @@
+ 		;;
+ 	SunOS* | HP-UX*)
+ 		# Solaris and HP-UX
+-		CAT1EXT=1
+-		CAT3EXT=3
+-		CAT5EXT=5
+-		CAT8EXT=1m
+-		MAN8EXT=1m
+-		MAN8DIR=1m
++		CAT1EXT=0
++		CAT3EXT=0
++		CAT5EXT=0
++		CAT8EXT=0
++		MAN8EXT=8
++		MAN8DIR=8
+ 		;;
+ 	*)
+ 		# All others