aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--biology/clustalw/Makefile4
-rw-r--r--devel/dotconf/Makefile6
-rw-r--r--games/etuxracer/Makefile39
-rw-r--r--games/tuxracer-commercial/Makefile39
-rw-r--r--games/tuxracer/Makefile39
-rw-r--r--irc/infobot/Makefile6
-rw-r--r--japanese/hns/Makefile8
-rw-r--r--lang/gforth/Makefile6
-rw-r--r--mail/faces/Makefile4
-rw-r--r--net/dictd/Makefile4
-rw-r--r--textproc/latex2html/Makefile2
-rw-r--r--www/p5-Apache-MP3/Makefile5
-rw-r--r--www/tclhttpd/Makefile14
-rw-r--r--x11/xdialog/Makefile4
14 files changed, 87 insertions, 93 deletions
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index 25796a835ef0..384f12477c37 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -20,7 +20,7 @@ ALL_TARGET= # empty
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/clustalw ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/share/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/clustalw_help ${PREFIX}/share/${PORTNAME}
+ @${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/clustalw_help ${DATADIR}
.include <bsd.port.mk>
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index e5bab9018f8f..8d0f969a6ee3 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -19,12 +19,12 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
post-install:
- ${MKDIR} ${PREFIX}/share/${PORTNAME}
+ ${MKDIR} ${DATADIR}
.if !defined(NOPORTDOCS)
.for f in dotconf-api.txt dotconf-features.txt
- @${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/${PORTNAME}
+ @${INSTALL_DATA} ${WRKSRC}/doc/$f ${DATADIR}
.endfor
.endif
- ${CP} -R ${WRKSRC}/examples ${PREFIX}/share/${PORTNAME}
+ ${CP} -R ${WRKSRC}/examples ${DATADIR}
.include <bsd.port.mk>
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 199668cfce20..077c5eec9e92 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -32,30 +32,29 @@ CONFIGURE_ARGS+=--with-tcl-inc="${LOCALBASE}/include/tcl8.2" \
CFLAGS+= -L${X11BASE}/lib
WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
-SHAREDIR= ${PREFIX}/share/${PORTNAME}
COURSEDIRS= 1 2 3 4 5 6 7 8 9 10 11
post-install:
- ${MKDIR} ${SHAREDIR}/courses
+ ${MKDIR} ${DATADIR}/courses
.for i in ${COURSEDIRS}
- ${MKDIR} ${SHAREDIR}/courses/${i}
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${SHAREDIR}/courses/${i}/
+ ${MKDIR} ${DATADIR}/courses/${i}
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${DATADIR}/courses/${i}/
.endfor
- ${MKDIR} ${SHAREDIR}/courses/common
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${SHAREDIR}/
+ ${MKDIR} ${DATADIR}/courses/common
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${DATADIR}/
.include <bsd.port.mk>
diff --git a/games/tuxracer-commercial/Makefile b/games/tuxracer-commercial/Makefile
index 199668cfce20..077c5eec9e92 100644
--- a/games/tuxracer-commercial/Makefile
+++ b/games/tuxracer-commercial/Makefile
@@ -32,30 +32,29 @@ CONFIGURE_ARGS+=--with-tcl-inc="${LOCALBASE}/include/tcl8.2" \
CFLAGS+= -L${X11BASE}/lib
WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
-SHAREDIR= ${PREFIX}/share/${PORTNAME}
COURSEDIRS= 1 2 3 4 5 6 7 8 9 10 11
post-install:
- ${MKDIR} ${SHAREDIR}/courses
+ ${MKDIR} ${DATADIR}/courses
.for i in ${COURSEDIRS}
- ${MKDIR} ${SHAREDIR}/courses/${i}
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${SHAREDIR}/courses/${i}/
+ ${MKDIR} ${DATADIR}/courses/${i}
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${DATADIR}/courses/${i}/
.endfor
- ${MKDIR} ${SHAREDIR}/courses/common
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${SHAREDIR}/
+ ${MKDIR} ${DATADIR}/courses/common
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${DATADIR}/
.include <bsd.port.mk>
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 199668cfce20..077c5eec9e92 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -32,30 +32,29 @@ CONFIGURE_ARGS+=--with-tcl-inc="${LOCALBASE}/include/tcl8.2" \
CFLAGS+= -L${X11BASE}/lib
WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
-SHAREDIR= ${PREFIX}/share/${PORTNAME}
COURSEDIRS= 1 2 3 4 5 6 7 8 9 10 11
post-install:
- ${MKDIR} ${SHAREDIR}/courses
+ ${MKDIR} ${DATADIR}/courses
.for i in ${COURSEDIRS}
- ${MKDIR} ${SHAREDIR}/courses/${i}
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${SHAREDIR}/courses/${i}/
- ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${SHAREDIR}/courses/${i}/
+ ${MKDIR} ${DATADIR}/courses/${i}
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/course.tcl ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/elev.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/terrain.rgb ${DATADIR}/courses/${i}/
+ ${INSTALL_DATA} ${WORKDATA}/courses/${i}/trees.rgb ${DATADIR}/courses/${i}/
.endfor
- ${MKDIR} ${SHAREDIR}/courses/common
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${SHAREDIR}/courses/common/
- ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${SHAREDIR}/
+ ${MKDIR} ${DATADIR}/courses/common
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background1.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background2.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/background3.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/ice.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/rock.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/snow.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/standard_light.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree.rgb ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tree_polyhedron.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_moonwalk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/courses/common/tux_walk.tcl ${DATADIR}/courses/common/
+ ${INSTALL_DATA} ${WORKDATA}/tux.tcl ${DATADIR}/
.include <bsd.port.mk>
diff --git a/irc/infobot/Makefile b/irc/infobot/Makefile
index c878b79951f1..42cb7353f337 100644
--- a/irc/infobot/Makefile
+++ b/irc/infobot/Makefile
@@ -21,9 +21,9 @@ NO_BUILD= yes
PLIST_SUB+= VERSION="${PORTVERSION}"
do-install:
- @if [ ! -d ${PREFIX}/share/${DISTNAME} ]; then \
- ${MKDIR} ${PREFIX}/share/${PORTNAME}-${PORTVERSION}; \
+ @if [ ! -d ${DATADIR}-${PORTVERSION} ]; then \
+ ${MKDIR} ${DATADIR}-${PORTVERSION}; \
fi
- ${CP} -R ${WRKSRC}/* ${PREFIX}/share/${PORTNAME}-${PORTVERSION}/
+ ${CP} -R ${WRKSRC}/* ${DATADIR}-${PORTVERSION}/
.include <bsd.port.mk>
diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile
index 02750fba2132..134ada314126 100644
--- a/japanese/hns/Makefile
+++ b/japanese/hns/Makefile
@@ -19,10 +19,10 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
do-install:
- @if [ -d ${PREFIX}/share/${PORTNAME} ]; then ${RM} -rf ${PREFIX}/share/${PORTNAME}; fi
- ${MKDIR} ${PREFIX}/share/${PORTNAME}
- ${CP} -pR ${WRKSRC}/ ${PREFIX}/share/${PORTNAME}
- ${CHOWN} -R 0:0 ${PREFIX}/share/${PORTNAME}
+ @if [ -d ${DATADIR} ]; then ${RM} -rf ${DATADIR}; fi
+ ${MKDIR} ${DATADIR}
+ ${CP} -pR ${WRKSRC}/ ${DATADIR}
+ ${CHOWN} -R 0:0 ${DATADIR}
${INSTALL_SCRIPT} ${WRKDIR}/hns-setup ${PREFIX}/bin/hns-setup
${INSTALL_SCRIPT} ${WRKSRC}/contrib/todayhns/todayhns ${PREFIX}/bin/todayhns
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 6ac5319b69cb..a50176f5fbe8 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -42,14 +42,12 @@ INFO_DIR= ${PREFIX}/info
EMACS_FILES= gforth.el
EMACS_DIR= ${PREFIX}/share/emacs/site-lisp
-SHARE_DIR= ${PREFIX}/share/${PORTNAME}
-
EMPTY_FILES= siteinit.fs
-FORTH_DIR= ${SHARE_DIR}/site-forth
+FORTH_DIR= ${DATADIR}/site-forth
EMPTY_DIRS= 4stack 6502 8086 avr c165 generic h8 \
hppa ia64 m68k misc power shboom sparc
-ARCH_DIR= ${SHARE_DIR}/${PORTVERSION}/arch
+ARCH_DIR= ${DATADIR}/${PORTVERSION}/arch
#
# Post-extract
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 9a82c225d92e..a7ac33282650 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -57,9 +57,9 @@ post-install:
${CP} -f ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}; \
${CP} -f ${WRKSRC}/scripts/README.kinzler ${PREFIX}/share/doc/${PORTNAME}; \
${CP} -f ${WRKSRC}/scripts/from.allrc-eg ${PREFIX}/share/doc/${PORTNAME}; \
- ${MKDIR} ${PREFIX}/share/${PORTNAME}/lib; \
+ ${MKDIR} ${DATADIR}/lib; \
${ECHO} ";# See ${PREFIX}/share/doc/${PORTNAME}/from.allrc-eg for an example" \
- > ${PREFIX}/share/${PORTNAME}/lib/allrc; \
+ > ${DATADIR}/lib/allrc; \
fi
.endif
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 915fab21ee92..9ce5488a11f5 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -36,9 +36,9 @@ post-patch:
@${PERL} -pi -e "s|[\ \t]T_USER| T_USERNAME|g" ${WRKSRC}/*.[chly]
post-install:
- @${MKDIR} ${PREFIX}/share/${PORTNAME}
+ @${MKDIR} ${DATADIR}
.for i in example.conf example.dictrc example.site example2.conf example3.conf
- ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
.endfor
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.sh > ${PREFIX}/etc/rc.d/${PORTNAME}.sh
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 5d699935ee60..73c538e44ca6 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -23,7 +23,7 @@ USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl=${PERL} \
--disable-gif \
- --libdir=${PREFIX}/share/${PORTNAME}
+ --libdir=${DATADIR}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index c2041ecf2c63..225f1d90176f 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -27,9 +27,8 @@ MAN3= Apache::MP3.3 \
Apache::MP3::Resample.3 \
Apache::MP3::Sorted.3
-PKGDATADIR= ${PREFIX}/share/${PORTNAME}
post-install:
- ${MKDIR} ${PKGDATADIR}
- ${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${PKGDATADIR}
+ ${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${DATADIR}
.include <bsd.port.mk>
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 4ac69f0ae000..61c92fa538ec 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -38,24 +38,24 @@ do-build:
FILESDIR="${FILESDIR}" -f "${FILESDIR}/Makefile.lib"
pre-install:
- ${MKDIR} ${LOCALBASE}/tclhttpd/custom
+ ${MKDIR} ${PREFIX}/tclhttpd/custom
post-install:
test -e ${RCD} || ${SED} \
"s%COMMAND_LINE%${LOCALBASE}/bin/tclsh${TCL_DVER} ${PREFIX}/bin/httpd.tcl%" \
< ${FILESDIR}/tclhttpd.sh > ${RCD}
- ${CHOWN} -R nobody ${LOCALBASE}/share/${PORTNAME}${PORTVERSION}
+ ${CHOWN} -R nobody ${DATADIR}${PORTVERSION}
${CHMOD} +x ${RCD}
${INSTALL_DATA} ${WRKSRC}/${SHLIB_NAME} \
- ${LOCALBASE}/lib/${PORTNAME}${PORTVERSION}/${SHLIB_NAME}
+ ${PREFIX}/lib/${PORTNAME}${PORTVERSION}/${SHLIB_NAME}
${INSTALL_SCRIPT} ${WRKSRC}/bin/httpd.tcl \
- ${WRKSRC}/bin/httpdthread.tcl ${LOCALBASE}/bin/
+ ${WRKSRC}/bin/httpdthread.tcl ${PREFIX}/bin/
${SED} 's%@VER@%${PORTVERSION}%g' < ${WRKSRC}/bin/tclhttpd.rc \
- > ${LOCALBASE}/etc/tclhttpd.rc.default
- cd ${LOCALBASE}/etc; test -e tclhttpd.rc || \
+ > ${PREFIX}/etc/tclhttpd.rc.default
+ cd ${PREFIX}/etc; test -e tclhttpd.rc || \
${CP} -p tclhttpd.rc.default tclhttpd.rc
${SED} 's%@LIB@%${SHLIB_NAME}%g' < \
${FILESDIR}/pkgIndex.tcl >> \
- ${LOCALBASE}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl
+ ${PREFIX}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl
.include <bsd.port.post.mk>
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index b02ea4d983af..9483b00e554b 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -26,9 +26,9 @@ MAN1= Xdialog.1
.if !defined(NOPORTDOCS)
post-install:
- ${MKDIR} ${PREFIX}/share/${PORTNAME}
+ ${MKDIR} ${DATADIR}
@(cd ${WRKSRC}/doc ; \
- ${CP} *.html *.png ${PREFIX}/share/${PORTNAME})
+ ${CP} *.html *.png ${DATADIR})
.endif
.include <bsd.port.mk>