[Midnightbsd-cvs] mports [15497] switch to ln in plist.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 22 12:49:31 EDT 2013 

Revision: 15497
          http://svnweb.midnightbsd.org/mports/?rev=15497
Author:   laffer1
Date:     2013-09-22 12:49:30 -0400 (Sun, 22 Sep 2013)
Log Message:
-----------
switch to ln in plist.  this port is a mess

Modified Paths:
--------------
    trunk/misc/kdehier4/Makefile
    trunk/misc/kdehier4/files/mtree-dirlist
    trunk/misc/kdehier4/pkg-plist

Property Changed:
----------------
    trunk/misc/kdehier4/files/dirlist
    trunk/misc/kdehier4/files/make-plist.sh
    trunk/misc/kdehier4/files/mtree-dirlist
    trunk/misc/kdehier4/files/session-kde4.conf.in
    trunk/misc/kdehier4/files/system-kde4.conf.in

Modified: trunk/misc/kdehier4/Makefile
===================================================================
--- trunk/misc/kdehier4/Makefile	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/Makefile	2013-09-22 16:49:30 UTC (rev 15497)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdehier4
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -12,7 +13,6 @@
 LICENSE=	unknown
 
 NO_BUILD=	yes
-USE_LDCONFIG=	${KDE4_PREFIX}/lib
 USE_KDE4=	#
 
 .include <bsd.port.pre.mk>
@@ -29,28 +29,10 @@
 .endif
 
 do-install:
-	@for dir in `${GREP} -v "^@comment" ${FILESDIR}/dirlist`; \
-	do \
-		${MKDIR} ${KDE4_PREFIX}/$${dir}; \
-	done
 .if ${KDE4_PREFIX} != ${LOCALBASE}
-	@for dir in `${GREP} -v "^@comment" ${FILESDIR}/mtree-dirlist`; \
-	do \
-		${MKDIR} ${KDE4_PREFIX}/$${dir}; \
-	done
 	${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 ${PREFIX}/etc/${dir} ${KDE4_PREFIX}/etc/
-. endfor
-	${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 ${PREFIX}/share/dbus-1/${dir} ${KDE4_PREFIX}/share/dbus-1/
-. endfor
-	${LN} -sf ${PREFIX}/share/polkit-1/actions ${KDE4_PREFIX}/share/polkit-1/
 .endif
 
 maintainer-generate-plist:

Index: trunk/misc/kdehier4/files/dirlist
===================================================================
--- trunk/misc/kdehier4/files/dirlist	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/files/dirlist	2013-09-22 16:49:30 UTC (rev 15497)

Property changes on: trunk/misc/kdehier4/files/dirlist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/misc/kdehier4/files/make-plist.sh
===================================================================
--- trunk/misc/kdehier4/files/make-plist.sh	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/files/make-plist.sh	2013-09-22 16:49:30 UTC (rev 15497)

Property changes on: trunk/misc/kdehier4/files/make-plist.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/misc/kdehier4/files/mtree-dirlist
===================================================================
--- trunk/misc/kdehier4/files/mtree-dirlist	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/files/mtree-dirlist	2013-09-22 16:49:30 UTC (rev 15497)
@@ -1,9 +1,6 @@
 @comment BSD.local.dist mtree replacement (used only if KDE4_PREFIX != LOCALBASE)
 bin
 etc
- at comment the following commented dirs will be linked from the corresponding LOCALBASE dirs
- at comment-dir etc/pam.d
- at comment-dir etc/rc.d
 include
 include/X11
 info
@@ -13,10 +10,6 @@
 lib/X11/fonts
 lib/X11/fonts/local
 libdata
- at comment the following commented dirs will be linked from the corresponding LOCALBASE dirs
- at comment-dir libdata/ldconfig
- at comment-dir libdata/ldconfig32
- at comment-dir libdata/pkgconfig
 libexec
 man
 man/cat1


Property changes on: trunk/misc/kdehier4/files/mtree-dirlist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/misc/kdehier4/files/session-kde4.conf.in
===================================================================
--- trunk/misc/kdehier4/files/session-kde4.conf.in	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/files/session-kde4.conf.in	2013-09-22 16:49:30 UTC (rev 15497)

Property changes on: trunk/misc/kdehier4/files/session-kde4.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/misc/kdehier4/files/system-kde4.conf.in
===================================================================
--- trunk/misc/kdehier4/files/system-kde4.conf.in	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/files/system-kde4.conf.in	2013-09-22 16:49:30 UTC (rev 15497)

Property changes on: trunk/misc/kdehier4/files/system-kde4.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/misc/kdehier4/pkg-plist
===================================================================
--- trunk/misc/kdehier4/pkg-plist	2013-09-22 15:23:00 UTC (rev 15496)
+++ trunk/misc/kdehier4/pkg-plist	2013-09-22 16:49:30 UTC (rev 15497)
@@ -5,15 +5,6 @@
 %%MTREE%%@dirrmtry etc/dbus-1
 %%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%%
-%%MTREE%%%%LDCONFIG32_DIR%%
-%%MTREE%%libdata/pkgconfig
-%%MTREE%%share/dbus-1/services
-%%MTREE%%share/dbus-1/system-services
-%%MTREE%%share/polkit-1/actions
 %%MTREE%%@exec mkdir -p %%KDE4_PREFIX%%/bin
 %%MTREE%%@exec mkdir -p %%KDE4_PREFIX%%/etc
 %%MTREE%%@exec mkdir -p %%KDE4_PREFIX%%/include
@@ -1162,6 +1153,24 @@
 @exec mkdir -p %%KDE4_PREFIX%%/share/templates
 @exec mkdir -p %%KDE4_PREFIX%%/share/templates/.source
 @exec mkdir -p %%KDE4_PREFIX%%/share/wallpapers
+ at exec ln -sf /usr/local/etc/pam.d %%KDE4_PREFIX%%/etc/
+ at exec ln -sf /usr/local/etc/polkit-1 %%KDE4_PREFIX%%/etc/
+ at exec ln -sf /usr/local/etc/rc.d %%KDE4_PREFIX%%/etc/
+ at exec ln -sf /usr/local/libdata/ldconfig32 %%KDE4_PREFIX%%/libdata/
+ at exec ln -sf /usr/local/libdata/ldconfig %%KDE4_PREFIX%%/libdata/
+ at exec ln -sf /usr/local/libdata/pkgconfig %%KDE4_PREFIX%%/libdata/
+ at exec ln -sf /usr/local/share/dbus-1/services %%KDE4_PREFIX%%/share/dbus-1/
+ at exec ln -sf /usr/local/share/dbus-1/system-services %%KDE4_PREFIX%%/share/dbus-1/
+ at exec ln -sf /usr/local/share/polkit-1/actions %%KDE4_PREFIX%%/share/polkit-1/
+ at unexec unlink %%KDE4_PREFIX%%/etc/pam.d
+ at unexec unlink %%KDE4_PREFIX%%/etc/polkit-1
+ at unexec unlink %%KDE4_PREFIX%%/etc/rc.d
+ at unexec unlink %%KDE4_PREFIX%%/libdata/ldconfig32
+ at unexec unlink %%KDE4_PREFIX%%/libdata/ldconfig
+ at unexec unlink %%KDE4_PREFIX%%/libdata/pkgconfig
+ at unexec unlink %%KDE4_PREFIX%%/share/dbus-1/services
+ at unexec unlink %%KDE4_PREFIX%%/share/dbus-1/system-services
+ at unexec unlink %%KDE4_PREFIX%%/share/polkit-1/actions
 @dirrmtry share/wallpapers
 @dirrmtry share/templates/.source
 @dirrmtry share/templates

More information about the Midnightbsd-cvs mailing list