Date: Wed, 30 Jul 2014 20:26:22 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363514 - in head/sysutils/LPRng: . files Message-ID: <201407302026.s6UKQMO6020609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Jul 30 20:26:21 2014 New Revision: 363514 URL: http://svnweb.freebsd.org/changeset/ports/363514 QAT: https://qat.redports.org/buildarchive/r363514/ Log: sysutils/LPRng: Update version 3.8.35 => 3.8.C and stage This version change requires and epoch. The patch from the PR was still using :L instead of :tl modifiers, otherwise it was correct. PR: 145149 Submitted by: Ports Fury Added: head/sysutils/LPRng/files/patch-src__common__lpd.c (contents, props changed) Deleted: head/sysutils/LPRng/files/pkg-install.in Modified: head/sysutils/LPRng/Makefile head/sysutils/LPRng/distinfo head/sysutils/LPRng/pkg-descr head/sysutils/LPRng/pkg-plist Modified: head/sysutils/LPRng/Makefile ============================================================================== --- head/sysutils/LPRng/Makefile Wed Jul 30 20:25:51 2014 (r363513) +++ head/sysutils/LPRng/Makefile Wed Jul 30 20:26:21 2014 (r363514) @@ -2,117 +2,61 @@ # $FreeBSD$ PORTNAME= LPRng -PORTVERSION= 3.8.35 -PORTREVISION= 1 +PORTVERSION= 3.8.C +PORTEPOCH= 1 CATEGORIES= sysutils print -MASTER_SITES= ftp://ftp.lprng.com/pub/%SUBDIR%/ \ - ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/%SUBDIR%/ \ - ftp://ftp.informatik.uni-hamburg.de/pub/os/unix/utils/%SUBDIR%/ \ - ftp://ftp.uni-paderborn.de/pub/unix/printer/%SUBDIR%/ -MASTER_SITE_SUBDIR= LPRng/LPRng +MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl} +DISTNAME= ${PORTNAME:tl}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced Printer Spooler -LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm +LICENSE= ART10 GPLv2 +LICENSE_COMB= dual -CONFLICTS= cups-base-1.[2-9]* +LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm +USES= gmake +USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -USE_RC_SUBR= ${PORTNAME:tl} - -SUB_FILES= pkg-message pkg-install -SUB_LIST= SYSCONFDIR="${SYSCONFDIR}" - -PKGDEINSTALL= ${PKGINSTALL} - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= \ - --with-sbindir=${PREFIX}/sbin \ +CONFIGURE_ARGS= --with-config_subdir="" \ --with-filterdir=${PREFIX}/libexec/filters \ --with-filter_path="${PREFIX}/bin:/bin:/usr/bin:${PREFIX}/sbin:/sbin:/usr/sbin" \ --with-lpd_conf_path=${SYSCONFDIR}/lpd.conf \ --with-lpd_perms_path=${SYSCONFDIR}/lpd.perms \ --with-printcap_path=/etc/printcap \ - --with-ld_library_path="${PREFIX}/lib:/lib:/usr/lib:/${LOCALBASE}/lib" \ - --enable-gdbm=${LOCALBASE} \ - --disable-werror - -.if defined(PORT_REPLACES_BASE_LPR) -PREFIX= /usr -SYSCONFDIR= /etc -.endif - -.if defined(SYSCONFDIR) -CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}" -PLIST_SUB+= CWD="" SYSCONFDIR="${SYSCONFDIR:S,^/,,}" -.else -SYSCONFDIR= ${PREFIX}/etc -PLIST_SUB+= CWD="@comment " SYSCONFDIR="${SYSCONFDIR:S,^${PREFIX}/,,}" -.endif - -MAN1= lpf.1 psbanner.1 lp.1 cancel.1 lprng_certs.1 lprng_index_certs.1 \ - lpstat.1 lpq.1 lpr.1 lprm.1 monitor.1 pclbanner.1 lpbanner.1 -MAN5= printcap.5 lpd.conf.5 lpd.perms.5 -MAN8= lpc.8 checkpc.8 lpd.8 - -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext tar:tgz -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -pre-everything:: - @${ECHO_MSG} "If you want to replace the default printing system with LPRng, use:" - @${ECHO_MSG} " make PORT_REPLACES_BASE_LPR=yes clean all install" - @${ECHO_MSG} " OR" - @${ECHO_MSG} " make CONFIGURE_SCRIPT=STANDARD_configuration clean all install" - @if [ "${PREFIX}" = "/usr" -a ! -d /usr/man ] ; then \ - ${ECHO_MSG} "The man pages will be installed in /usr/man." ; \ - ${ECHO_MSG} "You should make a symbolic link /usr/share/man from /usr/man"; \ - ${ECHO_MSG} " ln -s /usr/share/man /usr/man"; \ - ${ECHO_MSG} "If you do not, you will retain the old FreeBSD man pages."; \ - ${ECHO_MSG} "See the hier(7) man page for details of the FreeBSD file system"; \ - ${ECHO_MSG} "layout. Configure is not equipped to determine the location of"; \ - ${ECHO_MSG} 'man pages and defaults to $${PREFIX}/man, which is incorrect for FreeBSD.'; \ - fi - -post-patch: - @${ECHO} "#! /bin/sh" > ${WRKSRC}/postinstall.freebsd.sh - @${REINPLACE_CMD} -e 's,$${INSTALL} $$$$i $${DATADIR}/$$$$i.sample,true &,' \ - ${WRKSRC}/Makefile.in + --with-ld_library_path="${PREFIX}/lib:/lib:/usr/lib:/${LOCALBASE}/lib" +MAKE_ARGS= INSTALLCONFIGEXAMPLES="" +USE_LDCONFIG= yes +USE_RC_SUBR= ${PORTNAME:tl} + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +SUB_FILES= pkg-message -pre-install: apply-slist - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +CONFLICTS= cups-base-1.[2-9]* + +OPTIONS_DEFINE= LIBWRAP NLS +OPTIONS_DEFAULT= LIBWRAP +OPTIONS_SUB= yes + +LIBWRAP_CONFIGURE_ENABLE= tcpwrappers +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ENV= gt_cv_func_gnugettext1_libc=yes \ + ac_cv_func_ngettext=yes +NLS_LDFLAGS= -lintl post-install: - @${INSTALL_DATA} ${WRKSRC}/lpd.conf ${SYSCONFDIR}/lpd.conf.sample - @${INSTALL_DATA} ${WRKSRC}/lpd.perms ${SYSCONFDIR}/lpd.perms.sample - @${INSTALL_DATA} ${WRKSRC}/printcap ${SYSCONFDIR}/printcap.sample -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR} - @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/Reference - @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/PrintingCookbook -.for ext in html pdf ppt ps txt gif jpg png - @for i in `${LS} ${WRKSRC}/DOCS | ${GREP} "\.${ext}$$"`; \ - do ${INSTALL_DATA} ${WRKSRC}/DOCS/$$i ${DOCSDIR}; done - @for i in `${LS} ${WRKSRC}/PrintingCookbook/HTML | ${GREP} "\.${ext}$$"`; \ - do ${INSTALL_DATA} ${WRKSRC}/PrintingCookbook/HTML/$$i ${DOCSDIR}/PrintingCookbook; done; + @${MKDIR} ${STAGEDIR}${DATADIR} +.for i in lpd.perms printcap + (cd ${WRKSRC}/conf && $ ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DATADIR}/${i}.sample) +.endfor +.for i in lpd.conf + (cd ${WRKSRC}/src && $ ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DATADIR}/${i}.sample) .endfor -.endif - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/sysutils/LPRng/distinfo ============================================================================== --- head/sysutils/LPRng/distinfo Wed Jul 30 20:25:51 2014 (r363513) +++ head/sysutils/LPRng/distinfo Wed Jul 30 20:26:21 2014 (r363514) @@ -1,2 +1,2 @@ -SHA256 (LPRng-3.8.35.tgz) = c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37 -SIZE (LPRng-3.8.35.tgz) = 12512453 +SHA256 (lprng-3.8.C.tar.gz) = 694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10 +SIZE (lprng-3.8.C.tar.gz) = 865165 Added: head/sysutils/LPRng/files/patch-src__common__lpd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/LPRng/files/patch-src__common__lpd.c Wed Jul 30 20:26:21 2014 (r363514) @@ -0,0 +1,18 @@ +--- src/common/lpd.c.orig ++++ src/common/lpd.c +@@ -979,7 +979,6 @@ + * libwrap/tcp_wrappers: + * draht@suse.de, Mon Jan 28 2002 + */ +- if( !unix_socket ){ + struct request_info wrap_req; + + request_init(&wrap_req, RQ_DAEMON, "lpd" , RQ_FILE, newsock, NULL); +@@ -993,7 +992,6 @@ + close( newsock ); + return; + } +- } + #endif + + pid = Start_worker( "server", Service_connection, &args, newsock ); Modified: head/sysutils/LPRng/pkg-descr ============================================================================== --- head/sysutils/LPRng/pkg-descr Wed Jul 30 20:25:51 2014 (r363513) +++ head/sysutils/LPRng/pkg-descr Wed Jul 30 20:26:21 2014 (r363514) @@ -8,4 +8,4 @@ diagnostics; multiple printers serving a do not need to run SUID root; greatly enhanced security checks; and a greatly improved permission and authorization mechanism. -WWW: http://www.lprng.com/ +WWW: http://lprng.sourceforge.net/ Modified: head/sysutils/LPRng/pkg-plist ============================================================================== --- head/sysutils/LPRng/pkg-plist Wed Jul 30 20:25:51 2014 (r363513) +++ head/sysutils/LPRng/pkg-plist Wed Jul 30 20:26:21 2014 (r363514) @@ -4,69 +4,39 @@ bin/lpq bin/lpr bin/lprm bin/lpstat -lib/liblpr.a -lib/liblpr.la libexec/filters/lpbanner libexec/filters/lpf libexec/filters/pclbanner libexec/filters/psbanner +man/man1/cancel.1.gz +man/man1/lp.1.gz +man/man1/lpbanner.1.gz +man/man1/lpf.1.gz +man/man1/lpq.1.gz +man/man1/lpr.1.gz +man/man1/lprm.1.gz +man/man1/lprng_certs.1.gz +man/man1/lprng_index_certs.1.gz +man/man1/lpstat.1.gz +man/man1/pclbanner.1.gz +man/man1/psbanner.1.gz +man/man5/lpd.conf.5.gz +man/man5/lpd.perms.5.gz +man/man5/printcap.5.gz +man/man8/checkpc.8.gz +man/man8/lpc.8.gz +man/man8/lpd.8.gz sbin/checkpc sbin/lpc sbin/lpd sbin/lprng_certs sbin/lprng_index_certs -%%NLS%%share/locale/de/LC_MESSAGES/LPRng.mo -%%NLS%%share/locale/fr/LC_MESSAGES/LPRng.mo -%%DATADIR%%/lpd.perms.sample -%%DATADIR%%/lprng.sh.sample %%DATADIR%%/lpd.conf.sample +%%DATADIR%%/lpd.perms.sample %%DATADIR%%/printcap.sample -%%DATADIR%%/postinstall.sample -%%PORTDOCS%%%%DOCSDIR%%/LISA98.ppt -%%PORTDOCS%%%%DOCSDIR%%/LPRng-Reference.html -%%PORTDOCS%%%%DOCSDIR%%/LPRng-Reference.pdf -%%PORTDOCS%%%%DOCSDIR%%/LPRng.jpg -%%PORTDOCS%%%%DOCSDIR%%/LPRng.png -%%PORTDOCS%%%%DOCSDIR%%/LPRngT-L.jpg -%%PORTDOCS%%%%DOCSDIR%%/LPRngT-L.png -%%PORTDOCS%%%%DOCSDIR%%/LPRngT-S.jpg -%%PORTDOCS%%%%DOCSDIR%%/LPRngT-S.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRng.jpg -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRngT-L.jpg -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRngT-S.jpg -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/chooser.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/clients.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/configfiles.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/filter.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/index.html -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/network.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/parallel.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/pooling.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/printserver.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/samba.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/serial.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/spooler.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_add.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_advanced.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_checkpc.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_edit.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_ifhpfilter.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_nup.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_open.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_printcaps.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_reread.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_results.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_smb.png -%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_write.png -%%PORTDOCS%%%%DOCSDIR%%/license.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc1179.txt -%%PORTDOCS%%%%DOCSDIR%%/y2k.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Reference -%%PORTDOCS%%@dirrm %%DOCSDIR%%/PrintingCookbook -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/filters +%%NLS%%share/locale/de/LC_MESSAGES/LPRng.mo +%%NLS%%share/locale/fr/LC_MESSAGES/LPRng.mo +%%NLS%%share/locale/pl/LC_MESSAGES/LPRng.mo +%%NLS%%share/locale/vi/LC_MESSAGES/LPRng.mo @dirrm %%DATADIR%% -%%CWD%%@cwd / -%%SYSCONFDIR%%/lpd.conf.sample -%%SYSCONFDIR%%/lpd.perms.sample -%%SYSCONFDIR%%/printcap.sample +@dirrm libexec/filters
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407302026.s6UKQMO6020609>