diff options
| author | Yukihiro Nakai <nakai@FreeBSD.org> | 2002-02-20 12:04:52 +0000 |
|---|---|---|
| committer | Yukihiro Nakai <nakai@FreeBSD.org> | 2002-02-20 12:04:52 +0000 |
| commit | c636d6cdfeb79436ff9af671fa5d3b93d027e945 (patch) | |
| tree | 4ffe92334c31e2dab1c85e189f879ef7a39392af /x11-wm/icewm | |
| parent | Add FreeBSD Cpu status patch (diff) | |
Add HAVE_ESOUND
PR: ports/30535
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=54972
Diffstat (limited to 'x11-wm/icewm')
| -rw-r--r-- | x11-wm/icewm/Makefile | 19 | ||||
| -rw-r--r-- | x11-wm/icewm/files/patch-aw | 34 | ||||
| -rw-r--r-- | x11-wm/icewm/pkg-plist | 1 |
3 files changed, 46 insertions, 8 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index d57e7f2606a8..4f86aa4b6eb2 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -7,7 +7,7 @@ PORTNAME= icewm PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -35,7 +35,8 @@ CONFIGURE_ARGS= --enable-i18n --enable-nls \ --with-cfgdir=${PREFIX}/share/icewm \ --with-libdir=${PREFIX}/share/icewm \ --with-kdedatadir=${LOCALBASE}/share \ - --with-docdir=${PREFIX}/share/doc + --with-docdir=${PREFIX}/share/doc \ + --with-mkfontdir=${NONEXISTENT} .include <bsd.port.pre.mk> @@ -48,14 +49,22 @@ USE_XPM= yes CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus .endif +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+= --enable-guievents --with-icesound=esound +PLIST_SUB+= ESOUND="" +.else +PLIST_SUB+= ESOUND="@comment " +.endif + post-install: - ${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar + ${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/icewm .for file in CHANGES FAQ INSTALL README TODO - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/icewm + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/icewm + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} .endif ${CHOWN} root.kmem ${PREFIX}/bin/icewm ${CHMOD} 2555 ${PREFIX}/bin/icewm diff --git a/x11-wm/icewm/files/patch-aw b/x11-wm/icewm/files/patch-aw index 9e11d6673f90..2d1adcd7b723 100644 --- a/x11-wm/icewm/files/patch-aw +++ b/x11-wm/icewm/files/patch-aw @@ -1,6 +1,34 @@ ---- src/wmapp.cc.orig Wed Feb 20 20:16:15 2002 -+++ src/wmapp.cc Wed Feb 20 20:16:48 2002 -@@ -1308,6 +1308,9 @@ +--- src/wmapp.cc.orig Tue Oct 9 23:54:03 2001 ++++ src/wmapp.cc Wed Feb 20 20:55:39 2002 +@@ -220,10 +220,10 @@ + char ** fontPath(XGetFontPath(app->display(), &ndirs)); + + char ** newFontPath = new char *[ndirs + 1]; +- newFontPath[0] = fontsdir; ++ newFontPath[ndirs] = fontsdir; + + if (fontPath) +- memcpy(newFontPath + 1, fontPath, ndirs * sizeof (char *)); ++ memcpy(newFontPath, fontPath, ndirs * sizeof (char *)); + else + warn(_("Unable to get current font path.")); + +@@ -245,11 +245,10 @@ + (unsigned char **) &icewmFontPath) == + Success && icewmFontPath) { + if (r_type == XA_STRING && r_format == 8) { +- for (int n(ndirs); n > 0; --n) // ---- remove death paths --- ++ for (int n(ndirs-1); n > 0; --n) // ---- remove death paths --- + if (!strcmp(icewmFontPath, newFontPath[n])) { +- if (n != ndirs) +- memmove(newFontPath + n, newFontPath + n + 1, +- (ndirs - n) * sizeof(char *)); ++ memmove(newFontPath + n, newFontPath + n + 1, ++ (ndirs - n) * sizeof(char *)); + --ndirs; + } + } else +@@ -1308,6 +1307,9 @@ } int main(int argc, char **argv) { diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist index 80cfddee8c50..a87f56aa24bd 100644 --- a/x11-wm/icewm/pkg-plist +++ b/x11-wm/icewm/pkg-plist @@ -1,5 +1,6 @@ bin/genpref bin/icehelp +%%ESOUND%%bin/icesound bin/icesh bin/icewm bin/icewmbg |