svn commit: r364866 - head/sysutils/LPRng

[John Marino]

Author: marino
Date: Thu Aug 14 20:43:48 2014
New Revision: 364866
URL: http://svnweb.freebsd.org/changeset/ports/364866
QAT: https://qat.redports.org/buildarchive/r364866/

Log:
  sysutils/LPRng: previous update broke config file locations, so fix them
  
  PR:		192647
  Submitted by:	Adam McDougall
  Approved by:	Nobody; port is unmaintained

Modified:
  head/sysutils/LPRng/Makefile
  head/sysutils/LPRng/pkg-plist

Modified: head/sysutils/LPRng/Makefile
==============================================================================
--- head/sysutils/LPRng/Makefile	Thu Aug 14 20:21:56 2014	(r364865)
+++ head/sysutils/LPRng/Makefile	Thu Aug 14 20:43:48 2014	(r364866)
@@ -3,6 +3,7 @@
 
 PORTNAME=	LPRng
 PORTVERSION=	3.8.C
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}
@@ -22,8 +23,6 @@ GNU_CONFIGURE=	yes
 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"
 MAKE_ARGS=	INSTALLCONFIGEXAMPLES=""
@@ -49,14 +48,13 @@ NLS_CONFIGURE_ENV=	gt_cv_func_gnugettext
 NLS_LDFLAGS=		-lintl
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in lpd.perms printcap
 	(cd ${WRKSRC}/conf && $ ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DATADIR}/${i}.sample)
+		${STAGEDIR}/${PREFIX}/etc/${i}.sample)
 .endfor
 .for i in lpd.conf
 	(cd ${WRKSRC}/src && $ ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DATADIR}/${i}.sample)
+		${STAGEDIR}/${PREFIX}/etc/${i}.sample)
 .endfor
 
 .include <bsd.port.mk>

Modified: head/sysutils/LPRng/pkg-plist
==============================================================================
--- head/sysutils/LPRng/pkg-plist	Thu Aug 14 20:21:56 2014	(r364865)
+++ head/sysutils/LPRng/pkg-plist	Thu Aug 14 20:43:48 2014	(r364866)
@@ -31,12 +31,11 @@ sbin/lpc
 sbin/lpd
 sbin/lprng_certs
 sbin/lprng_index_certs
-%%DATADIR%%/lpd.conf.sample
-%%DATADIR%%/lpd.perms.sample
-%%DATADIR%%/printcap.sample
+ at sample etc/lpd.conf.sample
+ at sample etc/lpd.perms.sample
+ at sample etc/printcap.sample
 %%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
- at dirrm %%DATADIR%%
 @dirrm libexec/filters