diff options
| -rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 28 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/files/patch-bin::Makefile.in | 15 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in | 15 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/pkg-plist | 6 |
4 files changed, 56 insertions, 8 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 4d271ab38ab4..5ae093dbe9a4 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -24,9 +24,11 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes +USE_BZIP2= yes USE_GNOMENG= yes WANT_GNOME= yes -USE_BZIP2= yes + +.include <bsd.port.pre.mk> GNU_CONFIGURE= yes @@ -35,17 +37,29 @@ CONFIGURE_ARGS+= --with-stroke --with-stroke-library=${LOCALBASE}/lib \ --with-stroke-includes=${LOCALBASE}/include .endif -PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" +.if defined(WITHOUT_SESSION_MGMT) +CONFIGURE_ARGS+= --disable-sm +.endif -.include <bsd.port.pre.mk> +.if defined(WITHOUT_SHAPE) +CONFIGURE_ARGS+= --disable-shape +.endif + +PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" .if ${HAVE_GNOME:Mimlib}!="" -USE_GNOME+= imlib +USE_GNOME= imlib PKGNAMESUFFIX= -imlib +CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \ + --enable-gtktest --enable-imlibtest +PLIST_SUB+= GNOMEDATADIR="share/fvwm" PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm" +PLIST_SUB+= GTK="" .else -CONFIGURE_ARGS+= --without-gnome +CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \ + --disable-gtktest --disable-imlibtest PLIST_SUB+= GNOMEDATADIR="share/fvwm" +PLIST_SUB+= GTK="@comment not installed: " .endif MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \ @@ -55,8 +69,8 @@ MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \ FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \ FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \ fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \ - fvwm2.1 xpmroot.1 fvwm-config.1 fvwm-root.1 fvwm-bug.1 \ - fvwm.1 fvwm-convert-2.2.1 fvwm-convert-2.4.1 fvwm-convert-2.6.1 \ + fvwm.1 fvwm-root.1 fvwm-config.1 fvwm-bug.1 \ + fvwm-convert-2.2.1 fvwm-convert-2.4.1 fvwm-convert-2.6.1 \ FvwmPerl.1 fvwm-perllib.1 post-extract: diff --git a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in new file mode 100644 index 000000000000..5dc707c36c48 --- /dev/null +++ b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in @@ -0,0 +1,15 @@ +--- bin/Makefile.in.orig Sun Aug 25 04:34:30 2002 ++++ bin/Makefile.in Tue Sep 10 10:26:39 2002 +@@ -511,9 +511,9 @@ + echo "Minor warning: $(bindir)/xpmroot symlink was not created" + + install-data-local: +- @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1 +- @$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \ +- echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created" ++ @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1.gz ++ @$(LN_S) fvwm-root.1.gz $(DESTDIR)$(mandir)/man1/xpmroot.1.gz || \ ++ echo "Minor warning: $(mandir)/man1/xpmroot.1.gz symlink was not created" + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in new file mode 100644 index 000000000000..0d4abd14687c --- /dev/null +++ b/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in @@ -0,0 +1,15 @@ +--- fvwm/Makefile.in.orig Sun Aug 25 04:34:20 2002 ++++ fvwm/Makefile.in Tue Sep 10 10:21:40 2002 +@@ -919,9 +919,9 @@ + echo "Minor warning: $(bindir)/fvwm2 symlink was not created" + + install-data-local: +- @rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1 +- @$(LN_S) fvwm.1 $(DESTDIR)$(mandir)/man1/fvwm2.1 || \ +- echo "Minor warning: $(mandir)/man1/fvwm2.1 symlink was not created" ++ @rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1.gz ++ @$(LN_S) fvwm.1.gz $(DESTDIR)$(mandir)/man1/fvwm2.1.gz || \ ++ echo "Minor warning: $(mandir)/man1/fvwm2.1.gz symlink was not created" + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist index 920b4b2fbf15..23deeb60afbe 100644 --- a/x11-wm/fvwm2-devel/pkg-plist +++ b/x11-wm/fvwm2-devel/pkg-plist @@ -33,7 +33,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent libexec/fvwm/%%FVWM_VERSION%%/FvwmForm -libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk +%%GTK%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent @@ -51,6 +51,10 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme libexec/fvwm/%%FVWM_VERSION%%/FvwmTile libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList +@comment The following are here because they are symlinks +man/man1/fvwm2.1.gz +man/man1/xpmroot.1.gz +@comment End of symlink list share/fvwm2/pixmaps/Jlock.xpm share/fvwm2/pixmaps/Jnews.xpm share/fvwm2/pixmaps/Jrecycle.xpm |