From 53dde9105dde629a7a93b449481e8bc990e08886 Mon Sep 17 00:00:00 2001 From: avsm Date: Tue, 1 Apr 2003 12:35:38 +0000 Subject: [PATCH] Update to LPRng-3.8.20, which unbreaks it Tested by Jeff Bachtel many moons ago --- sysutils/LPRng/Makefile | 28 ++++++------ sysutils/LPRng/distinfo | 6 +-- sysutils/LPRng/patches/patch-src_Makefile_in | 48 ++++++++++++++++++++ sysutils/LPRng/pkg/PFRAG.shared | 3 ++ sysutils/LPRng/pkg/PLIST | 26 ++++------- 5 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 sysutils/LPRng/patches/patch-src_Makefile_in create mode 100644 sysutils/LPRng/pkg/PFRAG.shared diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index 71541037fe3..e8acd2e15a1 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.21 2002/12/29 20:19:10 fgsch Exp $ - -BROKEN= "outdated and with possible security holes" +# $OpenBSD: Makefile,v 1.22 2003/04/01 12:35:38 avsm Exp $ COMMENT= "enhanced printer spooler" -DISTNAME= LPRng-3.7.4 +DISTNAME= LPRng-3.8.20 CATEGORIES= sysutils print -MASTER_SITES= ftp://ftp.astart.com/pub/LPRng/LPRng/ +MASTER_SITES= ftp://ftp.lprng.com/pub/LPRng/LPRng/ \ + ftp://sunsite.ualberta.ca/pub/Mirror/LPRng/ \ + ftp://ftp.mono.org/pub/LPRng/ EXTRACT_SUFX= .tgz MAINTAINER= Jeff Bachtel @@ -16,6 +16,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= No PERMIT_DISTFILES_FTP= Yes +MODULES= gettext iconv LIB_DEPENDS= gdbm.2::databases/gdbm CONFIGURE_STYLE= gnu dest @@ -25,7 +26,9 @@ CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \ --with-lpd_perms_path=${SYSCONFDIR}/LPRng/lpd.perms \ --with-printcap_path=${SYSCONFDIR}/printcap \ --with-cppopts=-I${LOCALBASE}/include \ - --with-ldopts=-L${LOCALBASE}/lib + --with-ldopts=-L${LOCALBASE}/lib \ + --with-libiconv-prefix=${LOCALBASE} \ + --with-libintl-prefix=${LOCALBASE} FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \ FILTER_DIR=${TRUEPREFIX}/libexec/filters \ @@ -33,18 +36,17 @@ FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \ LPD_CONF_PATH=${TRUEPREFIX}/etc/LPRng/lpd.conf \ PRINTCAP_PATH=${TRUEPREFIX}/etc/LPRng/printcap -HTMLFILES= LPRng-HOWTO.html REDIRECT.LPRng.html \ - LPRng.html links.html LPRng.jpg LPRngT-S.jpg \ - lprng-small.png LPRngLOGO100x30.gif \ - LPRng_20logo.gif lprngtool.png \ - LPRngLOGO2.gif bg.gif star1.gif LPRngLOGO334x100.gif \ - linkbanner.gif topbanner.gif LPRngT-L.jpg lisa2000.jpg +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \ + patch-* + +HTMLFILES= LPRng-HOWTO.html # we don't trust LPRng's (pre|post)install scripts pre-fake: mkdir -p ${WRKINST}/etc && mkdir -p ${WRKINST}/etc/LPRng; \ cp ${WRKSRC}/lpd.conf ${WRKSRC}/lpd.perms ${WRKINST}/etc/LPRng; \ - cp ${WRKSRC}/printcap.in ${WRKINST}/etc/LPRng/printcap + cp ${WRKSRC}/printcap ${WRKINST}/etc/LPRng/printcap post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo index cda2521afb2..c2d7474e58c 100644 --- a/sysutils/LPRng/distinfo +++ b/sysutils/LPRng/distinfo @@ -1,3 +1,3 @@ -MD5 (LPRng-3.7.4.tgz) = 77ea78039d3b3a7d853ccc98f2eef33d -RMD160 (LPRng-3.7.4.tgz) = 287bce11b63a6462d1afb1241d0e8b9390e5d4ea -SHA1 (LPRng-3.7.4.tgz) = e6a3a183b13675e96543044c7961b2487cbf7f03 +MD5 (LPRng-3.8.20.tgz) = 84a7dc3c7076a1efb2682c63313fad74 +RMD160 (LPRng-3.8.20.tgz) = 00c99bf1f5f88c27005efa7f07daffa0e8c6754a +SHA1 (LPRng-3.8.20.tgz) = 82a76636fbb1fdd8329d20d076d6771ffbfb0933 diff --git a/sysutils/LPRng/patches/patch-src_Makefile_in b/sysutils/LPRng/patches/patch-src_Makefile_in new file mode 100644 index 00000000000..012def31b0b --- /dev/null +++ b/sysutils/LPRng/patches/patch-src_Makefile_in @@ -0,0 +1,48 @@ +$OpenBSD: patch-src_Makefile_in,v 1.1 2003/04/01 12:35:38 avsm Exp $ +--- src/Makefile.in.orig Mon Aug 5 22:45:54 2002 ++++ src/Makefile.in Mon Jan 20 18:23:08 2003 +@@ -172,7 +172,7 @@ VPATH=..:.:${SRC}/include:${SRC}/common: + ######################################################################## + + .SUFFIXES: .lo .sh +-LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --mode=link $(LDCC) -o $@ + .c.lo: + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< + +@@ -264,25 +264,25 @@ liblpr.la: $(LIBLPR_OBJS) + $(LINK) $(LIBLPR_OBJS) -rpath ${libdir} + + lpd: $(LPD_OBJS) liblpr.la +- $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lpr: $(LPR_OBJS) liblpr.la +- $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lpq: $(LPQ_OBJS) liblpr.la +- $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lpstat: $(LPSTAT_OBJS) liblpr.la +- $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lprm: $(LPRM_OBJS) liblpr.la +- $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lpc: $(LPC_OBJS) liblpr.la +- $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + checkpc: $(CHECKPC_OBJS) liblpr.la +- $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + lpf: $(LPF_OBJS) liblpr.la +- $(LINK) ${LPF_OBJS} $(LIBS) ++ $(LINK) ${LPF_OBJS} $(LIBS) $(LDFLAGS) + lpbanner: $(LPBANNER_OBJS) liblpr.la +- $(LINK) ${LPBANNER_OBJS} $(LIBS) ++ $(LINK) ${LPBANNER_OBJS} $(LIBS) $(LDFLAGS) + monitor: $(MONITOR_OBJS) liblpr.la +- $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) ++ $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) $(LDFLAGS) + + authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh + rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@ diff --git a/sysutils/LPRng/pkg/PFRAG.shared b/sysutils/LPRng/pkg/PFRAG.shared new file mode 100644 index 00000000000..5ec16ebb686 --- /dev/null +++ b/sysutils/LPRng/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2003/04/01 12:35:38 avsm Exp $ +lib/liblpr.so.0.0 +DYNLIBDIR(%B) diff --git a/sysutils/LPRng/pkg/PLIST b/sysutils/LPRng/pkg/PLIST index 8ee46d76b18..3230596f704 100644 --- a/sysutils/LPRng/pkg/PLIST +++ b/sysutils/LPRng/pkg/PLIST @@ -1,10 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.7 2001/06/19 17:26:45 avsm Exp $ +@comment $OpenBSD: PLIST,v 1.8 2003/04/01 12:35:38 avsm Exp $ bin/cancel bin/lp bin/lpq bin/lpr bin/lprm bin/lpstat +lib/liblpr.a +lib/liblpr.la libexec/filters/lpbanner libexec/filters/lpf libexec/filters/pclbanner @@ -16,6 +18,8 @@ man/man1/lpf.1 man/man1/lpq.1 man/man1/lpr.1 man/man1/lprm.1 +man/man1/lprng_certs.1 +man/man1/lprng_index_certs.1 man/man1/lpstat.1 man/man1/monitor.1 man/man1/pclbanner.1 @@ -29,26 +33,12 @@ man/man8/lpd.8 sbin/checkpc sbin/lpc sbin/lpd +sbin/lprng_certs +sbin/lprng_index_certs share/doc/LPRng/LPRng-HOWTO.html -share/doc/LPRng/LPRng.html -share/doc/LPRng/LPRng.jpg -share/doc/LPRng/LPRngLOGO100x30.gif -share/doc/LPRng/LPRngLOGO2.gif -share/doc/LPRng/LPRngLOGO334x100.gif -share/doc/LPRng/LPRngT-L.jpg -share/doc/LPRng/LPRngT-S.jpg -share/doc/LPRng/LPRng_20logo.gif -share/doc/LPRng/REDIRECT.LPRng.html -share/doc/LPRng/bg.gif -share/doc/LPRng/linkbanner.gif -share/doc/LPRng/links.html -share/doc/LPRng/lisa2000.jpg -share/doc/LPRng/lprng-small.png -share/doc/LPRng/lprngtool.png -share/doc/LPRng/star1.gif -share/doc/LPRng/topbanner.gif share/examples/LPRng/lpd.conf share/examples/LPRng/lpd.perms share/examples/LPRng/printcap +%%SHARED%% @dirrm share/examples/LPRng @dirrm share/doc/LPRng