sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework kdehier4 port and bump version to 1.1:

Browse source 
Instead of installing into $KDE4_PREFIX, install the port into default
prefix ($LOCALBASE) and create additional hierarchy under $KDE4_PREFIX.

This fixes problems spotted by testing on poudriere.

Reported by:	miwi
This commit is contained in:
Max Brazhnikov 2013-05-11 07:31:11 +00:00
parent d76bf9c69f
commit a9461b93f0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=317851
3 changed files with 1170 additions and 1174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
misc/kdehier4/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= kdehier4
PORTVERSION= 1.0.11
PORTVERSION= 1.1.0
CATEGORIES= misc kde
MASTER_SITES= # none
DISTFILES= # none
@ -10,12 +10,12 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Hierarchy of shared directories for KDE 4 ports
NO_BUILD= yes
NO_WRKSUBDIR= yes
USE_KDE4= kdeprefix
USE_LDCONFIG= ${KDE4_PREFIX}/lib
USE_KDE4= #
.include <bsd.port.pre.mk>
.if ${KDE4_PREFIX} != ${LOCALBASE}
.if ${KDE4_PREFIX} != ${PREFIX}
PLIST_SUB+= MTREE="" \
LDCONFIG_DIR="${LDCONFIG_DIR}" \
LDCONFIG32_DIR="${LDCONFIG32_DIR}"
@ -26,33 +26,29 @@ SUB_LIST= KDE4_PREFIX="${KDE4_PREFIX}"
PLIST_SUB+= MTREE="@comment "
.endif
do-fetch:
@${DO_NADA}
do-install:
@for dir in `${GREP} -v "^@comment" ${FILESDIR}/dirlist`; \
do \
${MKDIR} ${PREFIX}/$${dir}; \
${MKDIR} ${KDE4_PREFIX}/$${dir}; \
done
.if ${KDE4_PREFIX} != ${LOCALBASE}
.if ${KDE4_PREFIX} != ${PREFIX}
@for dir in `${GREP} -v "^@comment" ${FILESDIR}/mtree-dirlist`; \
do \
${MKDIR} ${PREFIX}/$${dir}; \
${MKDIR} ${KDE4_PREFIX}/$${dir}; \
done
${MKDIR} ${LOCALBASE}/etc/dbus-1
${INSTALL_DATA} ${WRKDIR}/session-kde4.conf ${LOCALBASE}/etc/dbus-1
${INSTALL_DATA} ${WRKDIR}/system-kde4.conf ${LOCALBASE}/etc/dbus-1
${MKDIR} ${PREFIX}/etc/dbus-1
${INSTALL_DATA} ${WRKDIR}/session-kde4.conf ${PREFIX}/etc/dbus-1
${INSTALL_DATA} ${WRKDIR}/system-kde4.conf ${PREFIX}/etc/dbus-1
. for dir in pam.d polkit-1 rc.d
${LN} -sf ${LOCALBASE}/etc/${dir} ${KDE4_PREFIX}/etc/
${LN} -sf ${PREFIX}/etc/${dir} ${KDE4_PREFIX}/etc/
. endfor
${LN} -sf ${LOCALBASE}/${LDCONFIG_DIR} ${KDE4_PREFIX}/libdata/
${ECHO_CMD} ${KDE4_PREFIX}/lib > ${LOCALBASE}/${LDCONFIG_DIR}/kdehier4
${LN} -sf ${LOCALBASE}/${LDCONFIG32_DIR} ${KDE4_PREFIX}/libdata/
${LN} -sf ${LOCALBASE}/libdata/pkgconfig ${KDE4_PREFIX}/libdata/
${LN} -sf ${PREFIX}/${LDCONFIG_DIR} ${KDE4_PREFIX}/libdata/
${LN} -sf ${PREFIX}/${LDCONFIG32_DIR} ${KDE4_PREFIX}/libdata/
${LN} -sf ${PREFIX}/libdata/pkgconfig ${KDE4_PREFIX}/libdata/
. for dir in services system-services
${LN} -sf ${LOCALBASE}/share/dbus-1/${dir} ${KDE4_PREFIX}/share/dbus-1/
${LN} -sf ${PREFIX}/share/dbus-1/${dir} ${KDE4_PREFIX}/share/dbus-1/
. endfor
${LN} -sf ${LOCALBASE}/share/polkit-1/actions ${KDE4_PREFIX}/share/polkit-1/
${LN} -sf ${PREFIX}/share/polkit-1/actions ${KDE4_PREFIX}/share/polkit-1/
.endif
maintainer-generate-plist:

18
misc/kdehier4/files/make-plist.sh
View file

@ -9,13 +9,13 @@ fi
echo "@comment Do not edit this file!
@comment It is generated by maintainer-generate-plist target." > ../pkg-plist
echo "%%MTREE%%@cwd %%LOCALBASE%%
%%MTREE%%etc/dbus-1/session-kde4.conf
echo "%%MTREE%%etc/dbus-1/session-kde4.conf
%%MTREE%%etc/dbus-1/system-kde4.conf
%%MTREE%%@dirrmtry etc/dbus-1
%%MTREE%%@cwd %%KDE4_PREFIX%%" >> ../pkg-plist
%%MTREE%%@dirrmtry etc/dbus-1" >> ../pkg-plist
echo "%%MTREE%%etc/pam.d
echo "%%MTREE%%@exec mkdir -p %%KDE4_PREFIX%%
%%MTREE%%@cwd %%KDE4_PREFIX%%
%%MTREE%%etc/pam.d
%%MTREE%%etc/polkit-1
%%MTREE%%etc/rc.d
%%MTREE%%%%LDCONFIG_DIR%%
@ -26,8 +26,8 @@ echo "%%MTREE%%etc/pam.d
%%MTREE%%share/polkit-1/actions" >> ../pkg-plist
(
grep -v "^@comment" dirlist | sed -e "s,^,@exec mkdir -p %D/," ;
grep -v "^@comment" mtree-dirlist | sed -e "s,^,%%MTREE%%@exec mkdir -p %D/,"
grep -v "^@comment" dirlist | sed -e "s,^,@exec mkdir -p %%KDE4_PREFIX%%/," ;
grep -v "^@comment" mtree-dirlist | sed -e "s,^,%%MTREE%%@exec mkdir -p %%KDE4_PREFIX%%/,"
)| sort | uniq >> ../pkg-plist
(
@ -35,5 +35,5 @@ grep -v "^@comment" dirlist | sed -e "s,^,@dirrmtry ," ;
grep -v "^@comment" mtree-dirlist | sed -e "s,^,%%MTREE%%@dirrm ,"
)| sort -r | uniq >> ../pkg-plist
echo "%%MTREE%%@exec echo %D/lib > %%LOCALBASE%%/%%LDCONFIG_DIR%%/kdehier4
%%MTREE%%@unexec [ -f %%LOCALBASE%%/%%LDCONFIG_DIR%%/kdehier4 ] && rm -f %%LOCALBASE%%/%%LDCONFIG_DIR%%/kdehier4 || true" >> ../pkg-plist
echo "%%MTREE%%@cwd /
%%MTREE%%@dirrmtry %%KDE4_PREFIX%%" >> ../pkg-plist

2290
misc/kdehier4/pkg-plist
View file

File diff suppressed because it is too large Load diff