summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-01 03:27:00 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-05-01 03:27:00 +0800
commitb20c2e41ae9be275965645fa85510255234fe794 (patch)
treea11745af8a489bfb5c126d9c691a3de82f904812 /x11
parentb72a1068c33f8d3f2c84c7568268422614f273a2 (diff)
downloadmarcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar.gz
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar.bz2
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar.lz
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar.xz
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.tar.zst
marcuscom-ports-b20c2e41ae9be275965645fa85510255234fe794.zip
- Change where xscreensaver .desktop files are installed so they can
be detected. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6182 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-screensaver/Makefile15
-rw-r--r--x11/gnome-screensaver/pkg-plist1
2 files changed, 6 insertions, 10 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index f243a34c2..17c4f7c3e 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.39 2006/04/30 18:51:04 ahze Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.40 2006/04/30 19:01:23 ahze Exp $
#
PORTNAME= gnome-screensaver
PORTVERSION= 2.15.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,13 +31,12 @@ CONFIGURE_ARGS= --disable-pam \
--with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
GCONF_SCHEMAS= gnome-screensaver.schemas
PLIST= ${WRKDIR}/pkg-plist
XSCREENSAVER_DIR= ${X11BASE}/share/xscreensaver/config
-
+SCREENSAVER_DIR= share/gnome/applications/screensavers
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -47,11 +46,9 @@ BROKEN= Does not build on 4.X
pre-install:
@${CP} ${.CURDIR}/pkg-plist ${PLIST}
@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
- ${SED} -e 's:^:share/gnome/gnome-screensaver/themes/xscreensaver/:' | \
+ ${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes/xscreensaver >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver >> ${PLIST}
+ @${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
post-patch:
@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
@@ -61,7 +58,7 @@ post-install:
${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
${MKDIR} ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver
- cd ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver && \
+ cd ${PREFIX}/${SCREENSAVER_DIR} && \
${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index e544b7d31..6d69bb613 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -71,5 +71,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrm share/gnome/pixmaps/backgrounds/cosmos
-@dirrm share/gnome/pixmaps/backgrounds
@dirrm libexec/gnome-screensaver