2 files changed, 208 insertions, 194 deletions

diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index c75fe7baee51..089e37768682 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -5,29 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=		cups
-PORTVERSION=		1.1.5
-CATEGORIES=		print
-MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
-			ftp://ftp2.easysw.com/pub/cups/${PORTVERSION}/ \
-			ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
-			ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
-DISTNAME=		${PORTNAME}-${PORTVERSION}-2-source
-
-MAINTAINER=		greid@ukug.uk.freebsd.org
-
-USE_BZIP2=		yes
-
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-GNU_CONFIGURE=		yes
-
-MAN1=			backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
-			lpr.1 lprm.1 lpstat.1
-MAN5=			classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
-			printers.conf.5
-MAN8=			accept.8 cups-lpd.8 cups-polld.8 cupsd.8 disable.8 \
-			enable.8 lpadmin.8 lpc.8 lpinfo.8 lpmove.8
-MLINKS=			accept.8 reject.8
+PORTNAME=	cups
+PORTVERSION=	1.1.5
+PORTREVESION=	1
+CATEGORIES=	print
+MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
+		ftp://ftp2.easysw.com/pub/cups/${PORTVERSION}/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
+		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2-source
+
+MAINTAINER=	greid@ukug.uk.freebsd.org
+
+USE_BZIP2=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+
+MAN1=		backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
+		lpr.1 lprm.1 lpstat.1
+MAN5=		classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
+		printers.conf.5
+MAN8=		accept.8 cups-lpd.8 cups-polld.8 cupsd.8 disable.8 \
+		enable.8 lpadmin.8 lpc.8 lpinfo.8 lpmove.8
+MLINKS=		accept.8 reject.8
+
+post-install:
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/cups-lpr/pkg-plist b/print/cups-lpr/pkg-plist
index 310e915ff21f..d930cc05db71 100644
--- a/print/cups-lpr/pkg-plist
+++ b/print/cups-lpr/pkg-plist
@@ -8,6 +8,12 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
+etc/cups/classes.conf
+etc/cups/client.conf
+etc/cups/cupsd.conf
+etc/cups/mime.convs
+etc/cups/mime.types
+etc/cups/printers.conf
 include/cups/cups.h
 include/cups/http.h
 include/cups/ipp.h
@@ -49,169 +55,169 @@ sbin/lpc
 sbin/lpinfo
 sbin/lpmove
 sbin/reject
-share/cups/pstoraster/Fontmap
-share/cups/pstoraster/gs_wl2_e.ps
-share/cups/pstoraster/gs_wl1_e.ps
-share/cups/pstoraster/gs_wan_e.ps
-share/cups/pstoraster/gs_type1.ps
-share/cups/pstoraster/gs_typ42.ps
-share/cups/pstoraster/gs_typ32.ps
-share/cups/pstoraster/gs_ttf.ps
-share/cups/pstoraster/gs_sym_e.ps
-share/cups/pstoraster/gs_std_e.ps
-share/cups/pstoraster/gs_statd.ps
-share/cups/pstoraster/gs_setpd.ps
-share/cups/pstoraster/gs_res.ps
-share/cups/pstoraster/gs_pfile.ps
-share/cups/pstoraster/gs_mro_e.ps
-share/cups/pstoraster/gs_mex_e.ps
-share/cups/pstoraster/gs_ll3.ps
-share/cups/pstoraster/gs_lev2.ps
-share/cups/pstoraster/gs_ksb_e.ps
-share/cups/pstoraster/gs_kanji.ps
-share/cups/pstoraster/gs_iso_e.ps
-share/cups/pstoraster/gs_init.ps
-share/cups/pstoraster/gs_fonts.ps
-share/cups/pstoraster/gs_fform.ps
-share/cups/pstoraster/gs_epsf.ps
-share/cups/pstoraster/gs_dps.ps
-share/cups/pstoraster/gs_dps2.ps
-share/cups/pstoraster/gs_dps1.ps
-share/cups/pstoraster/gs_dpnxt.ps
-share/cups/pstoraster/gs_diskf.ps
-share/cups/pstoraster/gs_dbt_e.ps
-share/cups/pstoraster/gs_cmdl.ps
-share/cups/pstoraster/gs_cmap.ps
-share/cups/pstoraster/gs_cidfn.ps
-share/cups/pstoraster/gs_cff.ps
-share/cups/pstoraster/gs_ccfnt.ps
-share/cups/pstoraster/gs_btokn.ps
-share/cups/pstoraster/gs_wl5_e.ps
-share/cups/banners/unclassified
-share/cups/banners/topsecret
-share/cups/banners/standard
-share/cups/banners/secret
-share/cups/banners/confidential
 share/cups/banners/classified
-share/cups/charsets/windows-874
-share/cups/charsets/iso-8859-15
-share/cups/charsets/iso-8859-14
-share/cups/charsets/iso-8859-13
+share/cups/banners/confidential
+share/cups/banners/secret
+share/cups/banners/standard
+share/cups/banners/topsecret
+share/cups/banners/unclassified
+share/cups/charsets/iso-8859-1
 share/cups/charsets/iso-8859-10
-share/cups/charsets/iso-8859-9
-share/cups/charsets/iso-8859-8
-share/cups/charsets/iso-8859-7
-share/cups/charsets/iso-8859-6
-share/cups/charsets/iso-8859-5
-share/cups/charsets/iso-8859-4
-share/cups/charsets/iso-8859-3
+share/cups/charsets/iso-8859-13
+share/cups/charsets/iso-8859-14
+share/cups/charsets/iso-8859-15
 share/cups/charsets/iso-8859-2
-share/cups/charsets/iso-8859-1
-share/cups/charsets/windows-1258
-share/cups/charsets/windows-1257
-share/cups/charsets/windows-1256
-share/cups/charsets/windows-1255
-share/cups/charsets/windows-1254
-share/cups/charsets/windows-1253
-share/cups/charsets/windows-1252
-share/cups/charsets/windows-1251
+share/cups/charsets/iso-8859-3
+share/cups/charsets/iso-8859-4
+share/cups/charsets/iso-8859-5
+share/cups/charsets/iso-8859-6
+share/cups/charsets/iso-8859-7
+share/cups/charsets/iso-8859-8
+share/cups/charsets/iso-8859-9
 share/cups/charsets/utf-8
 share/cups/charsets/windows-1250
-share/cups/data/testprint.ps
-share/cups/data/psglyphs
+share/cups/charsets/windows-1251
+share/cups/charsets/windows-1252
+share/cups/charsets/windows-1253
+share/cups/charsets/windows-1254
+share/cups/charsets/windows-1255
+share/cups/charsets/windows-1256
+share/cups/charsets/windows-1257
+share/cups/charsets/windows-1258
+share/cups/charsets/windows-874
 share/cups/data/HPGLprolog
+share/cups/data/psglyphs
+share/cups/data/testprint.ps
 share/cups/fonts/AvantGarde-Book
-share/cups/fonts/ZapfChancery-MediumItalic
-share/cups/fonts/Utopia-Regular
-share/cups/fonts/Utopia-Italic
-share/cups/fonts/Utopia-BoldItalic
-share/cups/fonts/Utopia-Bold
-share/cups/fonts/Times-Roman
-share/cups/fonts/Times-Italic
-share/cups/fonts/Times-BoldItalic
-share/cups/fonts/Times-Bold
-share/cups/fonts/Symbol
-share/cups/fonts/Palatino-Roman
-share/cups/fonts/Palatino-Italic
-share/cups/fonts/Palatino-BoldItalic
-share/cups/fonts/Palatino-Bold
-share/cups/fonts/NewCenturySchlbk-Roman
-share/cups/fonts/NewCenturySchlbk-Italic
-share/cups/fonts/NewCenturySchlbk-BoldItalic
+share/cups/fonts/AvantGarde-BookOblique
+share/cups/fonts/AvantGarde-Demi
+share/cups/fonts/AvantGarde-DemiOblique
+share/cups/fonts/Bookman-Demi
+share/cups/fonts/Bookman-DemiItalic
+share/cups/fonts/Bookman-Light
+share/cups/fonts/Bookman-LightItalic
+share/cups/fonts/Charter-Bold
+share/cups/fonts/Charter-BoldItalic
+share/cups/fonts/Charter-Italic
+share/cups/fonts/Charter-Roman
+share/cups/fonts/Courier
+share/cups/fonts/Courier-Bold
+share/cups/fonts/Courier-BoldOblique
+share/cups/fonts/Courier-Oblique
+share/cups/fonts/Helvetica
 share/cups/fonts/Helvetica-Bold
-share/cups/fonts/NewCenturySchlbk-Bold
-share/cups/fonts/Helvetica-Oblique
-share/cups/fonts/Helvetica-Narrow-Oblique
-share/cups/fonts/Helvetica-Narrow-BoldOblique
-share/cups/fonts/Helvetica-Narrow-Bold
-share/cups/fonts/Helvetica-Narrow
 share/cups/fonts/Helvetica-BoldOblique
-share/cups/fonts/Helvetica
-share/cups/fonts/Courier-Oblique
-share/cups/fonts/Courier-BoldOblique
-share/cups/fonts/Courier-Bold
-share/cups/fonts/Courier
-share/cups/fonts/Charter-Roman
-share/cups/fonts/Charter-Italic
-share/cups/fonts/Charter-BoldItalic
-share/cups/fonts/Charter-Bold
-share/cups/fonts/Bookman-LightItalic
-share/cups/fonts/Bookman-Light
-share/cups/fonts/Bookman-DemiItalic
-share/cups/fonts/Bookman-Demi
-share/cups/fonts/AvantGarde-DemiOblique
-share/cups/fonts/AvantGarde-Demi
-share/cups/fonts/AvantGarde-BookOblique
+share/cups/fonts/Helvetica-Narrow
+share/cups/fonts/Helvetica-Narrow-Bold
+share/cups/fonts/Helvetica-Narrow-BoldOblique
+share/cups/fonts/Helvetica-Narrow-Oblique
+share/cups/fonts/Helvetica-Oblique
+share/cups/fonts/NewCenturySchlbk-Bold
+share/cups/fonts/NewCenturySchlbk-BoldItalic
+share/cups/fonts/NewCenturySchlbk-Italic
+share/cups/fonts/NewCenturySchlbk-Roman
+share/cups/fonts/Palatino-Bold
+share/cups/fonts/Palatino-BoldItalic
+share/cups/fonts/Palatino-Italic
+share/cups/fonts/Palatino-Roman
+share/cups/fonts/Symbol
+share/cups/fonts/Times-Bold
+share/cups/fonts/Times-BoldItalic
+share/cups/fonts/Times-Italic
+share/cups/fonts/Times-Roman
+share/cups/fonts/Utopia-Bold
+share/cups/fonts/Utopia-BoldItalic
+share/cups/fonts/Utopia-Italic
+share/cups/fonts/Utopia-Regular
+share/cups/fonts/ZapfChancery-MediumItalic
 share/cups/fonts/ZapfDingbats
 share/cups/model/deskjet.ppd
-share/cups/model/stcolor.ppd
-share/cups/model/okidat24.ppd
-share/cups/model/okidata9.ppd
-share/cups/model/laserjet.ppd
 share/cups/model/epson24.ppd
 share/cups/model/epson9.ppd
+share/cups/model/laserjet.ppd
+share/cups/model/okidat24.ppd
+share/cups/model/okidata9.ppd
+share/cups/model/stcolor.ppd
 share/cups/model/stphoto.ppd
+share/cups/pstoraster/Fontmap
+share/cups/pstoraster/gs_btokn.ps
+share/cups/pstoraster/gs_ccfnt.ps
+share/cups/pstoraster/gs_cff.ps
+share/cups/pstoraster/gs_cidfn.ps
+share/cups/pstoraster/gs_cmap.ps
+share/cups/pstoraster/gs_cmdl.ps
+share/cups/pstoraster/gs_dbt_e.ps
+share/cups/pstoraster/gs_diskf.ps
+share/cups/pstoraster/gs_dpnxt.ps
+share/cups/pstoraster/gs_dps.ps
+share/cups/pstoraster/gs_dps1.ps
+share/cups/pstoraster/gs_dps2.ps
+share/cups/pstoraster/gs_epsf.ps
+share/cups/pstoraster/gs_fform.ps
+share/cups/pstoraster/gs_fonts.ps
+share/cups/pstoraster/gs_init.ps
+share/cups/pstoraster/gs_iso_e.ps
+share/cups/pstoraster/gs_kanji.ps
+share/cups/pstoraster/gs_ksb_e.ps
+share/cups/pstoraster/gs_lev2.ps
+share/cups/pstoraster/gs_ll3.ps
+share/cups/pstoraster/gs_mex_e.ps
+share/cups/pstoraster/gs_mro_e.ps
+share/cups/pstoraster/gs_pfile.ps
+share/cups/pstoraster/gs_res.ps
+share/cups/pstoraster/gs_setpd.ps
+share/cups/pstoraster/gs_statd.ps
+share/cups/pstoraster/gs_std_e.ps
+share/cups/pstoraster/gs_sym_e.ps
+share/cups/pstoraster/gs_ttf.ps
+share/cups/pstoraster/gs_typ32.ps
+share/cups/pstoraster/gs_typ42.ps
+share/cups/pstoraster/gs_type1.ps
+share/cups/pstoraster/gs_wan_e.ps
+share/cups/pstoraster/gs_wl1_e.ps
+share/cups/pstoraster/gs_wl2_e.ps
+share/cups/pstoraster/gs_wl5_e.ps
 share/cups/templates/add-class.tmpl
-share/cups/templates/test-page.tmpl
-share/cups/templates/printer-stop.tmpl
-share/cups/templates/printer-start.tmpl
-share/cups/templates/printer-reject.tmpl
-share/cups/templates/printer-modified.tmpl
-share/cups/templates/printer-deleted.tmpl
-share/cups/templates/printer-confirm.tmpl
-share/cups/templates/printer-configured.tmpl
-share/cups/templates/printer-added.tmpl
-share/cups/templates/printer-accept.tmpl
-share/cups/templates/printers.tmpl
-share/cups/templates/option-trailer.tmpl
-share/cups/templates/option-pickone.tmpl
-share/cups/templates/option-pickmany.tmpl
-share/cups/templates/option-header.tmpl
-share/cups/templates/option-boolean.tmpl
-share/cups/templates/modify-printer.tmpl
-share/cups/templates/modify-class.tmpl
-share/cups/templates/job-release.tmpl
-share/cups/templates/job-hold.tmpl
+share/cups/templates/add-printer.tmpl
+share/cups/templates/admin-op.tmpl
+share/cups/templates/admin.tmpl
+share/cups/templates/choose-device.tmpl
+share/cups/templates/choose-make.tmpl
+share/cups/templates/choose-members.tmpl
+share/cups/templates/choose-model.tmpl
+share/cups/templates/choose-serial.tmpl
+share/cups/templates/choose-uri.tmpl
+share/cups/templates/class-added.tmpl
+share/cups/templates/class-confirm.tmpl
+share/cups/templates/class-deleted.tmpl
+share/cups/templates/class-modified.tmpl
+share/cups/templates/classes.tmpl
+share/cups/templates/config-printer.tmpl
+share/cups/templates/config-printer2.tmpl
+share/cups/templates/error.tmpl
+share/cups/templates/header.tmpl
 share/cups/templates/job-cancel.tmpl
+share/cups/templates/job-hold.tmpl
+share/cups/templates/job-release.tmpl
 share/cups/templates/jobs.tmpl
-share/cups/templates/header.tmpl
-share/cups/templates/error.tmpl
-share/cups/templates/config-printer2.tmpl
-share/cups/templates/config-printer.tmpl
-share/cups/templates/classes.tmpl
-share/cups/templates/class-modified.tmpl
-share/cups/templates/class-deleted.tmpl
-share/cups/templates/class-confirm.tmpl
-share/cups/templates/class-added.tmpl
-share/cups/templates/choose-uri.tmpl
-share/cups/templates/choose-serial.tmpl
-share/cups/templates/choose-model.tmpl
-share/cups/templates/choose-members.tmpl
-share/cups/templates/choose-make.tmpl
-share/cups/templates/choose-device.tmpl
-share/cups/templates/admin.tmpl
-share/cups/templates/admin-op.tmpl
-share/cups/templates/add-printer.tmpl
+share/cups/templates/modify-class.tmpl
+share/cups/templates/modify-printer.tmpl
+share/cups/templates/option-boolean.tmpl
+share/cups/templates/option-header.tmpl
+share/cups/templates/option-pickmany.tmpl
+share/cups/templates/option-pickone.tmpl
+share/cups/templates/option-trailer.tmpl
+share/cups/templates/printer-accept.tmpl
+share/cups/templates/printer-added.tmpl
+share/cups/templates/printer-configured.tmpl
+share/cups/templates/printer-confirm.tmpl
+share/cups/templates/printer-deleted.tmpl
+share/cups/templates/printer-modified.tmpl
+share/cups/templates/printer-reject.tmpl
+share/cups/templates/printer-start.tmpl
+share/cups/templates/printer-stop.tmpl
+share/cups/templates/printers.tmpl
+share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/doc/cups/cmp.html
 share/doc/cups/cmp.pdf
@@ -220,27 +226,6 @@ share/doc/cups/cupsdoc.css
 share/doc/cups/documentation.html
 share/doc/cups/idd.html
 share/doc/cups/idd.pdf
-share/doc/cups/index.html
-share/doc/cups/ipp.html
-share/doc/cups/ipp.pdf
-share/doc/cups/overview.html
-share/doc/cups/overview.pdf
-share/doc/cups/sam.html
-share/doc/cups/sam.pdf
-share/doc/cups/sdd.html
-share/doc/cups/sdd.pdf
-share/doc/cups/spm.html
-share/doc/cups/spm.pdf
-share/doc/cups/sps.html
-share/doc/cups/sps.pdf
-share/doc/cups/ssr.html
-share/doc/cups/ssr.pdf
-share/doc/cups/stp.html
-share/doc/cups/stp.pdf
-share/doc/cups/sum.html
-share/doc/cups/sum.pdf
-share/doc/cups/svd.html
-share/doc/cups/svd.pdf
 share/doc/cups/images/accept-jobs.gif
 share/doc/cups/images/add-class.gif
 share/doc/cups/images/add-printer.gif
@@ -280,28 +265,53 @@ share/doc/cups/images/start-class.gif
 share/doc/cups/images/start-printer.gif
 share/doc/cups/images/stop-class.gif
 share/doc/cups/images/stop-printer.gif
+share/doc/cups/index.html
+share/doc/cups/ipp.html
+share/doc/cups/ipp.pdf
+share/doc/cups/overview.html
+share/doc/cups/overview.pdf
+share/doc/cups/sam.html
+share/doc/cups/sam.pdf
+share/doc/cups/sdd.html
+share/doc/cups/sdd.pdf
+share/doc/cups/spm.html
+share/doc/cups/spm.pdf
+share/doc/cups/sps.html
+share/doc/cups/sps.pdf
+share/doc/cups/ssr.html
+share/doc/cups/ssr.pdf
+share/doc/cups/stp.html
+share/doc/cups/stp.pdf
+share/doc/cups/sum.html
+share/doc/cups/sum.pdf
+share/doc/cups/svd.html
+share/doc/cups/svd.pdf
 share/locale/C/cups_C
 share/locale/de/cups_de
 share/locale/en/cups_en
 share/locale/es/cups_es
 share/locale/fr/cups_fr
 share/locale/it/cups_it
+@dirrm etc/cups/certs
+@dirrm etc/cups/interfaces
+@dirrm etc/cups/ppd
+@dirrm etc/cups
 @dirrm include/cups
 @dirrm libexec/cups/backend
 @dirrm libexec/cups/cgi-bin
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/filter
 @dirrm libexec/cups
-@dirrm share/doc/cups/images
-@dirrm share/doc/cups
-@dirrm share/cups/pstoraster
 @dirrm share/cups/banners
 @dirrm share/cups/charsets
 @dirrm share/cups/data
 @dirrm share/cups/fonts
 @dirrm share/cups/model
+@dirrm share/cups/pstoraster
 @dirrm share/cups/templates
 @dirrm share/cups
+@dirrm share/doc/cups/images
+@dirrm share/doc/cups
 @dirrm share/locale/C
 @dirrm share/locale/de
 @dirrm share/locale/en