summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-05-11 17:43:21 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-05-11 17:43:21 +0000
commit8888d3ed3104fe5511f78b7104fc2c8862556f68 (patch)
tree0cf9be0fe6a9a494f2ab06c11e8add584249bab8 /x11
parent95dcfacc436d8b431e3dd9b5bf29ff2e838376ac (diff)
downloadpkgsrc-8888d3ed3104fe5511f78b7104fc2c8862556f68.tar.gz
Don't unconditionally try and include:
lib/kde2/libkcm_energy.so lib/kde2/libkcm_screensaver.so in PLIST because on some systems (i386), /usr/X11R6/lib/libXdpms.so does not exist (only the static lib) and hence the above shared libs are not built.
Diffstat (limited to 'x11')
-rw-r--r--x11/kdebase2/Makefile14
-rw-r--r--x11/kdebase2/pkg/PLIST4
2 files changed, 13 insertions, 5 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 460dc5d6181..7a778480c9d 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/04 11:26:06 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/11 17:43:21 dmcmahill Exp $
DISTNAME= kdebase-2.1
CATEGORIES= x11 kde
@@ -40,6 +40,7 @@ PLIST_SRC= ${WRKDIR}/PLIST
PLIST_DIRS= share/kde/applnk \
share/kde/apps/kappfinder
+
post-configure:
${MKDIR} ${IMAKEDIR}
${LN} -fs ${FILESDIR}/Imakefile ${IMAKEDIR}
@@ -47,11 +48,20 @@ post-configure:
${XMKMF} && ${MAKE} hasxdmauth >>${WRKSRC}/kdm/kdm-config.h
${RM} -rf ${IMAKEDIR}
+pre-install:
+ @# on some systems we only have libXdpms.a which makes libkcm_energy and
+ @# libkcm_screensaver to only build static libs.
+ ${RM} -f ${PLIST_SRC}
+.if !exists(${X11BASE}/lib/libXdpms.a) || exists(${X11BASE}/lib/libXdpms.so)
+ ${ECHO} "lib/kde2/libkcm_energy.so" >> ${PLIST_SRC}
+ ${ECHO} "lib/kde2/libkcm_screensaver.so" >>${PLIST_SRC}
+.endif
+ ${CAT} ${PLIST_INIT} >> ${PLIST_SRC}
+
post-install:
@${CHMOD} u+s ${PREFIX}/bin/konsole_grantpty
@${CHMOD} u+s ${PREFIX}/bin/*.kss
@${CHMOD} u+s ${PREFIX}/bin/ksysguardd
- @${CP} ${PLIST_INIT} ${PLIST_SRC}
@(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} \! -type d | sort >>${PLIST_SRC})
@(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} -type d | sort -r | \
${SED} "s/^/\@dirrm /" >>${PLIST_SRC})
diff --git a/x11/kdebase2/pkg/PLIST b/x11/kdebase2/pkg/PLIST
index 45448bd2a36..79f8ba1f08f 100644
--- a/x11/kdebase2/pkg/PLIST
+++ b/x11/kdebase2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/05/08 15:58:05 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/05/11 17:43:22 dmcmahill Exp $
bin/appletproxy
bin/chooser
bin/conttest
@@ -209,7 +209,6 @@ lib/kde2/libkcm_email.la
lib/kde2/libkcm_email.so
lib/kde2/libkcm_energy.a
lib/kde2/libkcm_energy.la
-lib/kde2/libkcm_energy.so
lib/kde2/libkcm_filetypes.a
lib/kde2/libkcm_filetypes.la
lib/kde2/libkcm_filetypes.so
@@ -269,7 +268,6 @@ lib/kde2/libkcm_samba.la
lib/kde2/libkcm_samba.so
lib/kde2/libkcm_screensaver.a
lib/kde2/libkcm_screensaver.la
-lib/kde2/libkcm_screensaver.so
lib/kde2/libkcm_smserver.a
lib/kde2/libkcm_smserver.la
lib/kde2/libkcm_smserver.so