summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/windowmaker/Makefile47
1 files changed, 25 insertions, 22 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index f14a490f784..e849804d40d 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2009/05/01 13:39:31 zafer Exp $
+# $NetBSD: Makefile,v 1.79 2009/05/19 10:52:33 wiz Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://windowmaker.info/pub/source/release/ \
ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
@@ -19,13 +19,20 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-usermenu
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX:Q}/share/GNUstep
-CONFIGURE_ARGS+= --with-nlsdir=${PREFIX:Q}/${PKGLOCALEDIR:Q}/locale
+CONFIGURE_ARGS+= --enable-xinerama
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep
+CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ENV+= LINGUAS=yes
CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
REPLACE_PERL+= util/wkdemenu.pl
+PKG_DESTDIR_SUPPORT= user-destdir
+
+INSTALLATION_DIRS= share/WindowMaker/SoundSets
+INSTALLATION_DIRS+= share/WindowMaker/Sounds
+INSTALLATION_DIRS+= share/doc/WindowMaker
+
.include "../../mk/compiler.mk"
.if ${MACHINE_ARCH} != "i386"
@@ -40,7 +47,7 @@ PKG_SYSCONFSUBDIR= WindowMaker
EGDIR= ${PREFIX}/share/examples/WindowMaker
CONF_FILES=
.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
-CONF_FILES+= ${EGDIR:Q}/${f:Q} ${PKG_SYSCONFDIR:Q}/${f:Q}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
@@ -56,21 +63,21 @@ WINDOWMAKER_OPTIONS?= gnome kde openlook vdesktop
BUILD_DEFS+= WINDOWMAKER_OPTIONS
.for option in ${WINDOWMAKER_OPTIONS}
-CONFIGURE_ARGS+= --enable-${option:Q}
+CONFIGURE_ARGS+= --enable-${option}
.endfor
post-extract:
- ${RM} -f ${WRKSRC:Q}/WindowMaker/Defaults/WMState \
- ${WRKSRC:Q}/WindowMaker/Defaults/WMWindowAttributes \
- ${WRKSRC:Q}/WindowMaker/Defaults/WindowMaker \
- ${WRKSRC:Q}/po/zh_TW.Big5.po
+ ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
+ ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
+ ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
+ ${WRKSRC}/po/zh_TW.Big5.po
set -e; \
- for manfile in ${WRKSRC:Q}/doc/*.1x ${WRKSRC:Q}/doc/*/*.1x; \
+ for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
do \
${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
done;
set -e; \
- cd ${WRKSRC:Q} && \
+ cd ${WRKSRC} && \
for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \
${SED} -e "s|/usr/local|${PREFIX}|g" \
@@ -80,17 +87,12 @@ post-extract:
done
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/SoundSets
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/Sounds
- ${TOUCH} ${PREFIX:Q}/share/WindowMaker/SoundSets/.directory
- ${TOUCH} ${PREFIX:Q}/share/WindowMaker/Sounds/.directory
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/WindowMaker
- cd ${WRKSRC:Q} && \
+ ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory
+ ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory
+ cd ${WRKSRC} && \
${INSTALL_DATA} \
README README.definable-cursor FAQ FAQ.I18N \
- ${PREFIX:Q}/share/doc/WindowMaker
-
-BUILDLINK_DEPMETHOD.libXt?= build
+ ${DESTDIR}${PREFIX}/share/doc/WindowMaker
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -103,6 +105,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"