summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarino <marino@FreeBSD.org>2014-08-14 20:43:48 +0000
committermarino <marino@FreeBSD.org>2014-08-14 20:43:48 +0000
commitffe8f867380304a6b93d9201062bbe147b76c625 (patch)
tree794bf258cb2ae881c4ba169ead3806f29e0a140b
parent23f90556480a26af9aa8c48712a503d527397469 (diff)
downloadFreeBSD-ports-ffe8f867380304a6b93d9201062bbe147b76c625.zip
FreeBSD-ports-ffe8f867380304a6b93d9201062bbe147b76c625.tar.gz
sysutils/LPRng: previous update broke config file locations, so fix them
PR: 192647 Submitted by: Adam McDougall Approved by: Nobody; port is unmaintained
-rw-r--r--sysutils/LPRng/Makefile8
-rw-r--r--sysutils/LPRng/pkg-plist7
2 files changed, 6 insertions, 9 deletions
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 39bec96..7cdc5a9 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -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_gnugettext1_libc=yes \
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>
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index 12822fe..c9f5ef2 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -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
+@sample etc/lpd.conf.sample
+@sample etc/lpd.perms.sample
+@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
-@dirrm %%DATADIR%%
@dirrm libexec/filters
OpenPOWER on IntegriCloud