Date: Wed, 13 Aug 2014 03:04:07 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364751 - in head/x11-fm/asfiles: . files Message-ID: <201408130304.s7D347fZ037648@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Aug 13 03:04:07 2014 New Revision: 364751 URL: http://svnweb.freebsd.org/changeset/ports/364751 QAT: https://qat.redports.org/buildarchive/r364751/ Log: 1: Stagify. 2: do not install regexp.3, bump version. Added: head/x11-fm/asfiles/files/patch-Files.ad (contents, props changed) head/x11-fm/asfiles/files/patch-bitmaps__Makefile.in (contents, props changed) head/x11-fm/asfiles/files/patch-pixmaps__Makefile.in (contents, props changed) head/x11-fm/asfiles/files/patch-src__Makefile.in (contents, props changed) head/x11-fm/asfiles/files/patch-src__regexp__Makefile.in (contents, props changed) Deleted: head/x11-fm/asfiles/files/last-patch-aa head/x11-fm/asfiles/pkg-install Modified: head/x11-fm/asfiles/Makefile head/x11-fm/asfiles/pkg-plist Modified: head/x11-fm/asfiles/Makefile ============================================================================== --- head/x11-fm/asfiles/Makefile Wed Aug 13 03:02:49 2014 (r364750) +++ head/x11-fm/asfiles/Makefile Wed Aug 13 03:04:07 2014 (r364751) @@ -3,7 +3,7 @@ PORTNAME= asfiles PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm afterstep windowmaker MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/ASFiles @@ -18,17 +18,15 @@ USES= perl5 GNU_CONFIGURE= yes USE_XORG= xpm USE_PERL5= build -MAN1= files.1 -MAN3= regexp.3 CONFIGURE_ARGS+=--with-dnd-inc=${LOCALBASE}/include \ --with-dnd-lib=${LOCALBASE}/lib -NO_STAGE= yes +post-patch: + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/Files.ad + post-install: - ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/last-patch-aa - ${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${PREFIX}/lib/X11/app-defaults/ - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${MV} ${WRKSRC}/src/Files.ad.orig ${WRKSRC}/src/Files.ad + ${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/ .include <bsd.port.mk> Added: head/x11-fm/asfiles/files/patch-Files.ad ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/asfiles/files/patch-Files.ad Wed Aug 13 03:04:07 2014 (r364751) @@ -0,0 +1,19 @@ +--- src/Files.ad.orig Mon Apr 21 12:55:17 1997 ++++ src/Files.ad Sun Mar 21 21:29:33 1999 +@@ -5,13 +5,13 @@ + !*********************************************************************** + + ! Search paths for icon files +-Files*bitmapPath: /usr/local/include/bitmaps +-Files*pixmapPath: /usr/local/include/pixmaps:/usr/X11/lib/X11/afterstep/icons ++Files*bitmapPath: %%PREFIX%%/include/bitmaps ++Files*pixmapPath: %%PREFIX%%/include/pixmaps:%%PREFIX%%/include/X11/pixmaps + ! A pixmap for the background + !Files*icon box*backgroundPixmap: /usr/local/pixmaps/Files_back.xpm + + ! System-wide Configuration file +-Files*configFile: /usr/local/lib/OffiX/Filesrc ++Files*configFile: %%PREFIX%%/share/OffiX/Filesrc + + ! Double click time in milliseconds + Files*doubleClickTime: 300 Added: head/x11-fm/asfiles/files/patch-bitmaps__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/asfiles/files/patch-bitmaps__Makefile.in Wed Aug 13 03:04:07 2014 (r364751) @@ -0,0 +1,18 @@ +--- bitmaps/Makefile.in.orig 2014-08-13 10:06:22.257001172 +0800 ++++ bitmaps/Makefile.in 2014-08-13 10:06:44.483997380 +0800 +@@ -100,12 +100,12 @@ Makefile: $(top_builddir)/config.status + + install-bitmapDATA: $(bitmap_DATA) + $(NORMAL_INSTALL) +- $(mkinstalldirs) $(bitmapdir) ++ $(mkinstalldirs) $(DESTDIR)$(bitmapdir) + list="$(bitmap_DATA)"; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ +- $(INSTALL_DATA) $(srcdir)/$$p $(bitmapdir)/$$p; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(bitmapdir)/$$p; \ + else if test -f $$p; then \ +- $(INSTALL_DATA) $$p $(bitmapdir)/$$p; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(bitmapdir)/$$p; \ + fi; fi; \ + done + Added: head/x11-fm/asfiles/files/patch-pixmaps__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/asfiles/files/patch-pixmaps__Makefile.in Wed Aug 13 03:04:07 2014 (r364751) @@ -0,0 +1,18 @@ +--- pixmaps/Makefile.in.orig 2014-08-13 10:05:34.480008364 +0800 ++++ pixmaps/Makefile.in 2014-08-13 10:05:56.990002894 +0800 +@@ -75,12 +75,12 @@ Makefile: $(top_builddir)/config.status + + install-pixmapDATA: $(pixmap_DATA) + $(NORMAL_INSTALL) +- $(mkinstalldirs) $(pixmapdir) ++ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) + list="$(pixmap_DATA)"; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ +- $(INSTALL_DATA) $(srcdir)/$$p $(pixmapdir)/$$p; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \ + else if test -f $$p; then \ +- $(INSTALL_DATA) $$p $(pixmapdir)/$$p; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \ + fi; fi; \ + done + Added: head/x11-fm/asfiles/files/patch-src__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/asfiles/files/patch-src__Makefile.in Wed Aug 13 03:04:07 2014 (r364751) @@ -0,0 +1,46 @@ +--- src/Makefile.in.orig 2014-08-13 10:01:12.336035299 +0800 ++++ src/Makefile.in 2014-08-13 10:03:06.196001156 +0800 +@@ -118,10 +118,10 @@ maintainer-clean-binPROGRAMS: + + install-binPROGRAMS: $(bin_PROGRAMS) + $(NORMAL_INSTALL) +- $(mkinstalldirs) $(bindir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + list="$(bin_PROGRAMS)"; for p in $$list; do \ + if test -f $$p; then \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; \ + done + +@@ -147,12 +147,12 @@ files: $(files_OBJECTS) $(files_DEPENDEN + $(LINK) $(files_OBJECTS) $(files_LDADD) $(LIBS) + install-man: $(MANS) + $(NORMAL_INSTALL) +- $(mkinstalldirs) $(mandir)/man1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 + sect=1; \ + inst=`echo "files" | sed '$(transform)'`.1; \ + if test -f $(srcdir)/files.1; then file=$(srcdir)/files.1; \ + else file=files.1; fi; \ +- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst ++ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$$sect/$$inst + + uninstall-man: + inst=`echo "files" | sed '$(transform)'`.1; \ +@@ -161,12 +161,12 @@ uninstall-man: + + install-offixDATA: $(offix_DATA) + $(NORMAL_INSTALL) +- $(mkinstalldirs) $(offixdir) ++ $(mkinstalldirs) $(DESTDIR)$(offixdir) + list="$(offix_DATA)"; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ +- $(INSTALL_DATA) $(srcdir)/$$p $(offixdir)/$$p; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(offixdir)/$$p; \ + else if test -f $$p; then \ +- $(INSTALL_DATA) $$p $(offixdir)/$$p; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(offixdir)/$$p; \ + fi; fi; \ + done + Added: head/x11-fm/asfiles/files/patch-src__regexp__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/asfiles/files/patch-src__regexp__Makefile.in Wed Aug 13 03:04:07 2014 (r364751) @@ -0,0 +1,11 @@ +--- src/regexp/Makefile.in.orig 2014-08-13 10:08:01.168979415 +0800 ++++ src/regexp/Makefile.in 2014-08-13 10:08:19.427980054 +0800 +@@ -174,7 +174,7 @@ install-exec: + install-data: install-man + $(NORMAL_INSTALL) + +-install: install-exec install-data all ++install: install-exec all + @: + + uninstall: uninstall-man Modified: head/x11-fm/asfiles/pkg-plist ============================================================================== --- head/x11-fm/asfiles/pkg-plist Wed Aug 13 03:02:49 2014 (r364750) +++ head/x11-fm/asfiles/pkg-plist Wed Aug 13 03:04:07 2014 (r364751) @@ -221,7 +221,7 @@ include/pixmaps/Workshop.xpm include/pixmaps/interface.xpm include/pixmaps/PDFOmni.xpm lib/X11/app-defaults/Files.ad -@unexec rm -rf %B/Files +man/man1/files.1.gz share/OffiX/FilesMagic share/OffiX/Filesrc @dirrm share/OffiX
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408130304.s7D347fZ037648>