diff options
| author | rafan <rafan@FreeBSD.org> | 2007-02-24 12:55:50 +0800 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2007-02-24 12:55:50 +0800 |
| commit | 36d2936acbe577aa57280c6d00c5ca454b0ffc8e (patch) | |
| tree | 69a90ff9637714b0279d6e123969b04e87e0bfa7 | |
| parent | 5f39edf5441d3e42ee605f4b3fb6425f64854b04 (diff) | |
| download | freebsd-ports-gnome-36d2936acbe577aa57280c6d00c5ca454b0ffc8e.tar.gz freebsd-ports-gnome-36d2936acbe577aa57280c6d00c5ca454b0ffc8e.tar.zst freebsd-ports-gnome-36d2936acbe577aa57280c6d00c5ca454b0ffc8e.zip | |
- Fix build on 7.x. Though I can build it in tinderbox, the error messages
are still there. [1]
- Use EXAMPLESDIR
- Remove NOPORTDOCS condition on EXAMPLESDIR
PR: ports/109450 [1]
Submitted by: Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp>
| -rw-r--r-- | x11-wm/fvwm95-i18n/Makefile | 9 | ||||
| -rw-r--r-- | x11-wm/fvwm95-i18n/files/patch-ak | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm95-i18n/pkg-plist | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index cfc32cce32aa..efaea9ba5e60 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -7,6 +7,7 @@ PORTNAME= fvwm95-i18n PORTVERSION= 2.0.43a +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fvwm95 @@ -38,7 +39,7 @@ MAN1= fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 FvwmTaskBar.1 \ FvwmWinList.1 -SAMPLEDIR= ${PREFIX}/share/examples/fvwm95 +EXAMPLESDIR= ${PREFIX}/share/examples/fvwm95 KITDIR= ${WRKDIR}/${PKGNAME}-portKit OPTIONS= APM "Build APM support (i386 only)" off @@ -64,10 +65,8 @@ post-patch: post-install: @(cd ${WRKSRC} ; ${MAKE} install.man) -.if !defined(NOPORTDOCS) - @${MKDIR} ${SAMPLEDIR} - @${INSTALL_DATA} ${WRKSRC}/example.fvwm95rc ${SAMPLEDIR} -.endif + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/example.fvwm95rc ${EXAMPLESDIR} @${MKDIR} ${PREFIX}/lib/X11/fvwm95/ja_JP.EUC @${INSTALL_DATA} ${KITDIR}/system.fvwm95rc.jp \ ${PREFIX}/lib/X11/fvwm95/ja_JP.EUC/system.fvwm95rc diff --git a/x11-wm/fvwm95-i18n/files/patch-ak b/x11-wm/fvwm95-i18n/files/patch-ak index 7aadddd783cf..deaef774fa76 100644 --- a/x11-wm/fvwm95-i18n/files/patch-ak +++ b/x11-wm/fvwm95-i18n/files/patch-ak @@ -20,7 +20,7 @@ diff -urN ../fvwm95-2.0.43a-Autoconf.orig/modules/FvwmAudio/Makefile.in ./module EXTRA_DEFINES=-DXPM -DSHAPE CC=@CC@ -INCLUDES=-I${top_srcdir}/include ${x_includes} -+INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir} ++INCLUDES=-I${top_srcdir}/include ${x_includes} -I${includedir} CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} MAKEDEPEND=@MAKEDEPEND@ INSTALL=@INSTALL@ diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist index 6e139dee98dd..e9914ad07bbc 100644 --- a/x11-wm/fvwm95-i18n/pkg-plist +++ b/x11-wm/fvwm95-i18n/pkg-plist @@ -243,8 +243,8 @@ lib/X11/fvwm95/pixmaps/xterm-sun.xpm lib/X11/fvwm95/pixmaps/xterm.xpm lib/X11/fvwm95/pixmaps/xv.xpm lib/X11/fvwm95/pixmaps/xview.xpm -share/examples/fvwm95/example.fvwm95rc +%%EXAMPLESDIR%%/example.fvwm95rc @dirrm lib/X11/fvwm95/pixmaps @dirrm lib/X11/fvwm95/ja_JP.EUC @dirrm lib/X11/fvwm95 -@dirrm share/examples/fvwm95 +@dirrm %%EXAMPLESDIR%% |