[Midnightbsd-cvs] mports [23591] trunk/print/cups: update cups to 2.2.6

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jun 10 15:33:22 EDT 2018 

Revision: 23591
          http://svnweb.midnightbsd.org/mports/?rev=23591
Author:   laffer1
Date:     2018-06-10 15:33:22 -0400 (Sun, 10 Jun 2018)
Log Message:
-----------
update cups to 2.2.6

Modified Paths:
--------------
    trunk/print/cups/Makefile
    trunk/print/cups/distinfo
    trunk/print/cups/files/patch-configure
    trunk/print/cups/pkg-descr
    trunk/print/cups/pkg-plist

Added Paths:
-----------
    trunk/print/cups/files/patch-scheduler_client.c
    trunk/print/cups/files/patch-scheduler_subscriptions.c

Modified: trunk/print/cups/Makefile
===================================================================
--- trunk/print/cups/Makefile	2018-06-10 19:11:16 UTC (rev 23590)
+++ trunk/print/cups/Makefile	2018-06-10 19:33:22 UTC (rev 23591)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	cups
-PORTVERSION=	2.1.4
-DISTVERSIONPREFIX=release-
+PORTVERSION=	2.2.6
+DISTVERSIONPREFIX=v
 CATEGORIES=	print
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -10,9 +10,9 @@
 
 LICENSE=	gpl2 lgpl
 LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-
 CONFLICTS=	LPRng-[0-9]*
 
 USE_GITHUB=	yes
@@ -20,11 +20,10 @@
 
 DESTDIRNAME=	DSTROOT
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-dnssd						\
+CONFIGURE_ARGS=	--disable-dnssd						\
 		--disable-gssapi					\
 		--disable-launchd					\
 		--disable-systemd					\
-		--enable-gnutls						\
 		--with-cups-user=${USERS}				\
 		--with-cups-group=${GROUPS}				\
 		--with-system-groups=wheel				\
@@ -37,34 +36,40 @@
 		--with-pam-module="unix"				\
 		ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI=	\
 		ac_cv_path_PHP= ac_cv_path_PYTHON=
-CPPFLAGS+=	-isystem ${LOCALBASE}/include # libpaper mainly
-LIBS+=		-L${LOCALBASE}/lib
-USES=		cpe gmake iconv pkgconfig tar:bzip2
+USES=		cpe gmake iconv localbase pkgconfig
 CPE_VENDOR=	apple
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	cupsd
-WRKSRC=		${WRKDIR}/${PORTNAME}-release-${PORTVERSION}
 
 GROUPS=		cups
 USERS=		cups
 
-OPTIONS_DEFINE=		DBUS DOCS IPPTOOL LIBPAPER NLS X11
-OPTIONS_DEFAULT=	DBUS LIBPAPER
+OPTIONS_DEFINE=		AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11
+OPTIONS_DEFAULT=	AVAHI DBUS GNUTLS LIBPAPER
 OPTIONS_SUB=		yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
+AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
+AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=
+
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 DBUS_SUB_LIST=		DBUS_DAEMON=dbus
 DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
 
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_CONFIGURE_ON=	--enable-gnutls
+GNUTLS_CONFIGURE_OFF=	--disable-ssl
+
 IPPTOOL_DESC=		Internet Printing Protocol testing tool
 
-LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
 LIBPAPER_CONFIGURE_ENABLE=libpaper
 
 X11_DESC=		Install desktop menu item
-X11_BUILD_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
-X11_RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+X11_BUILD_DEPENDS=	xdg-open:devel/xdg-utils
+X11_RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 .if defined(CUPS_OVERWRITE_BASE)
 PLIST_SUB+=	OVERWRITE=""
@@ -72,11 +77,12 @@
 PLIST_SUB+=	OVERWRITE="@comment "
 .endif
 
-.if exists(/usr/lib/libusb.so)
-PLIST_SUB+=	USB=""
-.else
+# TODO: when midnightbsd 1.0 imports new usb lib
+#.if exists(/usr/lib/libusb.so)
+#PLIST_SUB+=	USB=""
+#.else
 PLIST_SUB+=	USB="@comment "
-.endif
+#.endif
 
 .include <bsd.port.pre.mk>
 
@@ -89,13 +95,8 @@
 	@${REINPLACE_CMD} 's/usblp/ulpt/g' ${WRKSRC}/backend/usb-libusb.c
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
 		-e 's/-fstack-protector//' ${WRKSRC}/configure
-	@${REINPLACE_CMD} 's|http://www.cups.org|https://cups.org|' \
-		${WRKSRC}/doc/index.html.in \
-		${WRKSRC}/doc/??/index.html.in \
-		${WRKSRC}/templates/header.tmpl.in \
-		${WRKSRC}/templates/??/header.tmpl.in \
-		${WRKSRC}/templates/help-header.tmpl \
-		${WRKSRC}/templates/??/help-header.tmpl
+	@${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \
+		's|http://www.cups.org|https://www.cups.org|g' {} +
 	@${REINPLACE_CMD} '/stripopt=/s/-x//' ${WRKSRC}/install-sh
 	@${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \
 		${WRKSRC}/man/*.man*
@@ -102,19 +103,16 @@
 	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
 		${WRKSRC}/cgi-bin/admin.c\
 		${WRKSRC}/conf/Makefile
+.if !empty(ARCH:Mpowerpc*)
+	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||g' ${WRKSRC}/Makedefs.in
+.endif
 
 post-patch-DOCS-off:
 # Link to online documentation.
-	@${REINPLACE_CMD} \
-		's|"/*help/|"https://cups.org/documentation.php/doc-${PORTVERSION:R}/|' \
-		${WRKSRC}/doc/index.html.in \
-		${WRKSRC}/doc/??/index.html.in \
-		${WRKSRC}/templates/choose-uri.tmpl \
-		${WRKSRC}/templates/??/choose-uri.tmpl \
-		${WRKSRC}/templates/header.tmpl.in \
-		${WRKSRC}/templates/??/header.tmpl.in \
-		${WRKSRC}/templates/samba-export.tmpl \
-		${WRKSRC}/templates/??/samba-export.tmpl
+	@${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \
+		-e 's|[Hh][Rr][Ee][Ff]="/*help/\([{"]\)|href="https://www.cups.org/documentation.html\1|g' \
+		-e '/have_gssapi/s|[Hh][Rr][Ee][Ff]="/*help/|href="https\\://www.cups.org/doc/|g' \
+		-e 's|[Hh][Rr][Ee][Ff]="/*help/|href="https://www.cups.org/doc/|g' {} +
 
 post-install:
 	${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups

Modified: trunk/print/cups/distinfo
===================================================================
--- trunk/print/cups/distinfo	2018-06-10 19:11:16 UTC (rev 23590)
+++ trunk/print/cups/distinfo	2018-06-10 19:33:22 UTC (rev 23591)
@@ -1,2 +1,3 @@
-SHA256 (cups-release-2.1.4_GH0.tar.bz2) = 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301
-SIZE (cups-release-2.1.4_GH0.tar.bz2) = 9572653
+TIMESTAMP = 1528659106
+SHA256 (cups-v2.2.6_GH0.tar.gz) = bf75b33755be92ffe11642dc54365d876c57cee13d6e12507645a8c2d570033a
+SIZE (cups-v2.2.6_GH0.tar.gz) = 10317889

Modified: trunk/print/cups/files/patch-configure
===================================================================
--- trunk/print/cups/files/patch-configure	2018-06-10 19:11:16 UTC (rev 23590)
+++ trunk/print/cups/files/patch-configure	2018-06-10 19:33:22 UTC (rev 23591)
@@ -1,19 +1,5 @@
 --- configure.orig	2016-02-05 17:22:09 UTC
 +++ configure
-@@ -5390,6 +5390,13 @@ $as_echo "yes" >&6; }
- 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
- 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
- 			USBQUIRKS="\$(DATADIR)/usb"
-+		elif test -f /usr/lib/libusb.so; then
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+			$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
-+
-+			LIBUSB="-lusb"
-+			USBQUIRKS="\$(DATADIR)/usb"
- 		else
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
 @@ -5656,7 +5663,6 @@ if test "${with_dbusdir+set}" = set; the
  fi
  

Added: trunk/print/cups/files/patch-scheduler_client.c
===================================================================
--- trunk/print/cups/files/patch-scheduler_client.c	                        (rev 0)
+++ trunk/print/cups/files/patch-scheduler_client.c	2018-06-10 19:33:22 UTC (rev 23591)
@@ -0,0 +1,13 @@
+--- scheduler/client.c.orig	2016-10-03 19:55:40 UTC
++++ scheduler/client.c
+@@ -3818,8 +3818,8 @@ pipe_command(cupsd_client_t *con,	/* I -
+   * Then execute the command...
+   */
+ 
+-  if (cupsdStartProcess(command, argv, envp, infile, fds[1], CGIPipes[1],
+-			-1, -1, root, DefaultProfile, NULL, &pid) < 0)
++  if (!cupsdStartProcess(command, argv, envp, infile, fds[1], CGIPipes[1],
++			 -1, -1, root, DefaultProfile, NULL, &pid))
+   {
+    /*
+     * Error - can't fork!


Property changes on: trunk/print/cups/files/patch-scheduler_client.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-scheduler_subscriptions.c
===================================================================
--- trunk/print/cups/files/patch-scheduler_subscriptions.c	                        (rev 0)
+++ trunk/print/cups/files/patch-scheduler_subscriptions.c	2018-06-10 19:33:22 UTC (rev 23591)
@@ -0,0 +1,13 @@
+--- scheduler/subscriptions.c.orig	2016-10-03 19:55:40 UTC
++++ scheduler/subscriptions.c
+@@ -1561,8 +1561,8 @@ cupsd_start_notifier(
+   * Create the notifier process...
+   */
+ 
+-  if (cupsdStartProcess(command, argv, envp, fds[0], -1, NotifierPipes[1],
+-			-1, -1, 0, DefaultProfile, NULL, &pid) < 0)
++  if (!cupsdStartProcess(command, argv, envp, fds[0], -1, NotifierPipes[1],
++			 -1, -1, 0, DefaultProfile, NULL, &pid))
+   {
+    /*
+     * Error - can't fork!


Property changes on: trunk/print/cups/files/patch-scheduler_subscriptions.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/cups/pkg-descr
===================================================================
--- trunk/print/cups/pkg-descr	2018-06-10 19:11:16 UTC (rev 23590)
+++ trunk/print/cups/pkg-descr	2018-06-10 19:33:22 UTC (rev 23591)
@@ -1,4 +1,4 @@
 CUPS is a standards-based, open source printing system.  It uses the Internet
 Printing Protocol (IPP) to support printing to local and network printers.
 
-WWW: https://cups.org/
+WWW: https://www.cups.org/

Modified: trunk/print/cups/pkg-plist
===================================================================
--- trunk/print/cups/pkg-plist	2018-06-10 19:11:16 UTC (rev 23590)
+++ trunk/print/cups/pkg-plist	2018-06-10 19:33:22 UTC (rev 23591)
@@ -12,7 +12,7 @@
 bin/cups-config
 bin/cupstestdsc
 bin/cupstestppd
- at comment TODO: fix bin/ippfind
+%%AVAHI%%bin/ippfind
 %%IPPTOOL%%bin/ipptool
 bin/lp
 bin/lpoptions
@@ -35,17 +35,13 @@
 include/cups/adminutil.h
 include/cups/array.h
 include/cups/backend.h
-include/cups/cgi.h
 include/cups/cups.h
 include/cups/dir.h
 include/cups/file.h
-include/cups/help-index.h
 include/cups/http.h
 include/cups/ipp.h
 include/cups/language.h
-include/cups/mime.h
 include/cups/ppd.h
-include/cups/ppdc.h
 include/cups/pwg.h
 include/cups/raster.h
 include/cups/sidechannel.h
@@ -62,14 +58,14 @@
 lib/libcupsppdc.so
 lib/libcupsppdc.so.1
 libexec/cups/backend/http
-libexec/cups/backend/https
+%%GNUTLS%%libexec/cups/backend/https
 libexec/cups/backend/ipp
-libexec/cups/backend/ipps
+%%GNUTLS%%libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 %%USB%%libexec/cups/backend/usb
-libexec/cups/backend/dnssd
+%%AVAHI%%libexec/cups/backend/dnssd
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
@@ -97,7 +93,7 @@
 man/man1/cupstestdsc.1.gz
 man/man1/cupstestppd.1.gz
 man/man1/cups.1.gz
- at comment TODO FIX man/man1/ippfind.1.gz
+%%AVAHI%%man/man1/ippfind.1.gz
 %%IPPTOOL%%man/man1/ipptool.1.gz
 man/man1/lp.1.gz
 man/man1/lpoptions.1.gz
@@ -372,6 +368,76 @@
 %%NLS%%%%DATADIR%%/templates/es/test-page.tmpl
 %%NLS%%%%DATADIR%%/templates/es/trailer.tmpl
 %%NLS%%%%DATADIR%%/templates/es/users.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/add-class.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/add-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/add-rss-subscription.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/admin.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/choose-device.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/choose-make.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/choose-model.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/choose-serial.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/choose-uri.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class-added.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/class.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/classes-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/classes.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/command.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/edit-config.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/error-op.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/error.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-cancel.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-hold.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-move.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-moved.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-release.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/job-restart.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/list-available-printers.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/modify-class.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/modify-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/norestart.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-boolean.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-conflict.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-pickmany.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-pickone.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/option-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/pager.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-accept.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-cancel-jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-configured.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-default.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-reject.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-start.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer-stop.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printers-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/printers.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/samba-export.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/samba-exported.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/search.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/set-printer-options-header.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/subscription-added.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/subscription-canceled.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/test-page.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/fr/users.tmpl
 %%DATADIR%%/templates/header.tmpl
 %%DATADIR%%/templates/help-header.tmpl
 %%DATADIR%%/templates/help-printable.tmpl
@@ -503,6 +569,8 @@
 %%NLS%%%%DATADIR%%/templates/pt_BR/error.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/header.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/help-trailer.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/job-cancel.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/job-hold.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/job-move.tmpl
@@ -524,6 +592,7 @@
 %%NLS%%%%DATADIR%%/templates/pt_BR/pager.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/printer-accept.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/printer-cancel-jobs.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/printer-configured.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/printer-confirm.tmpl
 %%NLS%%%%DATADIR%%/templates/pt_BR/printer-default.tmpl
@@ -635,19 +704,13 @@
 %%NLS%%%%DOCSDIR%%/de/index.html
 %%NLS%%%%DOCSDIR%%/es/index.html
 %%PORTDOCS%%%%DOCSDIR%%/help/accounting.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-array.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-cgi.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-cups.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-driver.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-filedir.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-admin.html
 %%PORTDOCS%%%%DOCSDIR%%/help/api-filter.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-httpipp.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-mime.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-overview.html
 %%PORTDOCS%%%%DOCSDIR%%/help/api-ppd.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-ppdc.html
 %%PORTDOCS%%%%DOCSDIR%%/help/api-raster.html
 %%PORTDOCS%%%%DOCSDIR%%/help/cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/help/cupspm.html
+%%PORTDOCS%%%%DOCSDIR%%/help/encryption.html
 %%PORTDOCS%%%%DOCSDIR%%/help/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/help/kerberos.html
 %%PORTDOCS%%%%DOCSDIR%%/help/license.html
@@ -703,7 +766,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/help/security.html
 %%PORTDOCS%%%%DOCSDIR%%/help/sharing.html
 %%PORTDOCS%%%%DOCSDIR%%/help/spec-banner.html
-%%PORTDOCS%%%%DOCSDIR%%/help/spec-cmp.html
 %%PORTDOCS%%%%DOCSDIR%%/help/spec-command.html
 %%PORTDOCS%%%%DOCSDIR%%/help/spec-design.html
 %%PORTDOCS%%%%DOCSDIR%%/help/spec-ipp.html
@@ -748,7 +810,7 @@
 %%NLS%%share/locale/ja/cups_ja.po
 %%NLS%%share/locale/pt_BR/cups_pt_BR.po
 %%NLS%%share/locale/ru/cups_ru.po
- at dir(,cups,) %%ETCDIR%%/interfaces
+%%NLS%%share/locale/zh_CN/cups_zh_CN.po
 @dir(,cups,) %%ETCDIR%%/ppd
 @dir(,cups,700) %%ETCDIR%%/ssl
 @dir(,cups,) %%ETCDIR%%

More information about the Midnightbsd-cvs mailing list