Date: Sat, 15 Apr 2006 13:17:20 -0700 (PDT) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cy@FreeBSD.org Subject: ports/95831: [PATCH] x11-wm/fvwm: portlint(1) fixes Message-ID: <200604152017.k3FKHKWD030759@Laptop.mine.box> Resent-Message-ID: <200604152020.k3FKKJVX076386@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95831 >Category: ports >Synopsis: [PATCH] x11-wm/fvwm: portlint(1) fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 20:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexander Botero-Lowry >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb 7 19:06:16 PST >Description: - Rename patches - use @dirrmtry - get rid of USE_REINPLACE - Remove an extra blank line that annoyed portlint Port maintainer (cy@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- fvwm-2.5.16.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/Makefile --- /usr/ports/x11-wm/fvwm/Makefile Sun Feb 12 19:57:40 2006 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/Makefile Sat Apr 15 13:13:58 2006 @@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org @@ -25,7 +24,6 @@ NO_LATEST_LINK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include -USE_REINPLACE= yes USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/Patch-modules_FvwmCommand_FvwmCommand.c /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/Patch-modules_FvwmCommand_FvwmCommand.c --- /usr/ports/x11-wm/fvwm/files/Patch-modules_FvwmCommand_FvwmCommand.c Wed Dec 31 16:00:00 1969 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/Patch-modules_FvwmCommand_FvwmCommand.c Wed Apr 3 06:51:45 2002 @@ -0,0 +1,11 @@ +--- modules/FvwmCommand/FvwmCommand.c.orig Wed Jul 4 22:35:50 2001 ++++ modules/FvwmCommand/FvwmCommand.c Wed Jul 4 22:35:52 2001 +@@ -927,7 +927,7 @@ + { + printf( " %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n", + "new page", +- body[0], body[1], body[2], body[3], body[4]); ++ body[0], body[0], body[2], body[3], body[4]); + } + + /************************************************************************* diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/patch-bin::Makefile.in /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in --- /usr/ports/x11-wm/fvwm/files/patch-bin::Makefile.in Mon Jan 6 20:47:47 2003 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in Wed Dec 31 16:00:00 1969 @@ -1,15 +0,0 @@ ---- bin/Makefile.in.orig Mon Dec 2 05:08:41 2002 -+++ bin/Makefile.in Tue Dec 17 11:29:50 2002 -@@ -592,9 +592,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. - .NOEXPORT: diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/patch-bin_Makefile.in /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-bin_Makefile.in --- /usr/ports/x11-wm/fvwm/files/patch-bin_Makefile.in Wed Dec 31 16:00:00 1969 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-bin_Makefile.in Mon Jan 6 20:47:47 2003 @@ -0,0 +1,15 @@ +--- bin/Makefile.in.orig Mon Dec 2 05:08:41 2002 ++++ bin/Makefile.in Tue Dec 17 11:29:50 2002 +@@ -592,9 +592,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. + .NOEXPORT: diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/patch-fvwm::Makefile.in /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in --- /usr/ports/x11-wm/fvwm/files/patch-fvwm::Makefile.in Mon Jan 6 20:47:47 2003 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in Wed Dec 31 16:00:00 1969 @@ -1,15 +0,0 @@ ---- fvwm/Makefile.in.orig Mon Dec 2 05:08:41 2002 -+++ fvwm/Makefile.in Tue Dec 17 11:31:56 2002 -@@ -645,9 +645,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. - .NOEXPORT: diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/patch-fvwm_Makefile.in /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-fvwm_Makefile.in --- /usr/ports/x11-wm/fvwm/files/patch-fvwm_Makefile.in Wed Dec 31 16:00:00 1969 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-fvwm_Makefile.in Mon Jan 6 20:47:47 2003 @@ -0,0 +1,15 @@ +--- fvwm/Makefile.in.orig Mon Dec 2 05:08:41 2002 ++++ fvwm/Makefile.in Tue Dec 17 11:31:56 2002 +@@ -645,9 +645,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. + .NOEXPORT: diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/files/patch-modules::FvwmCommand::FvwmCommand.c /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-modules::FvwmCommand::FvwmCommand.c --- /usr/ports/x11-wm/fvwm/files/patch-modules::FvwmCommand::FvwmCommand.c Wed Apr 3 06:51:45 2002 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/files/patch-modules::FvwmCommand::FvwmCommand.c Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- modules/FvwmCommand/FvwmCommand.c.orig Wed Jul 4 22:35:50 2001 -+++ modules/FvwmCommand/FvwmCommand.c Wed Jul 4 22:35:52 2001 -@@ -927,7 +927,7 @@ - { - printf( " %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n", - "new page", -- body[0], body[1], body[2], body[3], body[4]); -+ body[0], body[0], body[2], body[3], body[4]); - } - - /************************************************************************* diff -ruN --exclude=CVS /usr/ports/x11-wm/fvwm/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/pkg-plist --- /usr/ports/x11-wm/fvwm/pkg-plist Sat Jan 28 21:53:44 2006 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/x11-wm/fvwm2-devel/pkg-plist Sat Apr 15 13:12:23 2006 @@ -449,8 +449,8 @@ %%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo -@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sv_SE 2>/dev/null || true +@dirrmtry %D/share/locale/sv_SE/LC_MESSAGES +@dirrmtry %D/share/locale/sv_SE @dirrm %%DATADIR%%/perllib/General @dirrm %%DATADIR%%/perllib/FVWM/Tracker @dirrm %%DATADIR%%/perllib/FVWM/Module --- fvwm-2.5.16.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604152017.k3FKHKWD030759>