Index: head/games/oneko/Makefile =================================================================== --- head/games/oneko/Makefile (revision 385448) +++ head/games/oneko/Makefile (revision 385449) @@ -1,39 +1,38 @@ # Created by: asami # $FreeBSD$ PORTNAME= oneko PORTVERSION= 2.0b PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.3bit.co.jp/~sasaki/oneko/ \ http://www.net24.ne.jp/~ryo2/archives/:ryo2 \ http://www2u.biglobe.ne.jp/~hsaka/distfiles/:hsaka DISTFILES= oneko-2.0b.tar.gz \ oneko-2.0b-pop1.1-patch.tar.gz \ oneko-2.0b-tip1.7.tar.gz:ryo2 \ oneko-2.0b-sender0.5.tar.gz:hsaka \ oneko-2.0b-bsd0.2.tar.gz:hsaka DIST_SUBDIR= ${PORTNAME} MAINTAINER= candy@kgc.co.jp COMMENT= Cat chasing a mouse all over the screen BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf CONFLICTS= oneko-1.* GNU_CONFIGURE= yes USE_XORG= x11 xpm xmu WRKSRC= ${WRKDIR}/${PORTNAME} INSTALL_TARGET= install install.man MAKE_ARGS= MANSUFFIX=6 \ MANDIR=${PREFIX}/man/man6 \ JMANDIR=${PREFIX}/man/ja/man6 EXTRA_PATCHES= ${WRKDIR}/oneko-2.0b-pop1.1.patch:-p1 \ ${WRKSRC}/oneko-2.0b-tip1.7.patch:-p1 \ ${WRKDIR}/oneko-2.0b-sender0.5.patch:-p1 \ - ${WRKDIR}/oneko-2.0b-bsd0.2.patch:-p1 \ - ${FILESDIR}/extrapatch-Makefile.in + ${WRKDIR}/oneko-2.0b-bsd0.2.patch:-p1 .include Index: head/games/oneko/files/extrapatch-Makefile.in =================================================================== --- head/games/oneko/files/extrapatch-Makefile.in (revision 385448) +++ head/games/oneko/files/extrapatch-Makefile.in (nonexistent) @@ -1,127 +0,0 @@ ---- Makefile.in.orig 2014-06-05 23:02:11.350393257 +0200 -+++ Makefile.in 2014-06-05 23:03:17.447389221 +0200 -@@ -100,19 +100,19 @@ - $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) - - install:: oneko -- @if [ -d $(BINDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(BINDIR)); fi -- $(INSTALL_PROGRAM) oneko $(BINDIR) -+ @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi -+ $(INSTALL_PROGRAM) oneko $(DESTDIR)$(BINDIR) - - install.man:: oneko.man oneko.man.jp $(MAN_EUC) -- @if [ -d $(MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(MANDIR)); fi -- $(INSTALL_MAN) oneko.man $(MANDIR)/oneko.$(MANSUFFIX) -+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi -+ $(INSTALL_MAN) oneko.man $(DESTDIR)$(MANDIR)/oneko.$(MANSUFFIX) - @if [ x$(LANG) != x -a x$(MAN_EUC) != x ]; then \ -- if [ -d $(JMANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(JMANDIR)); fi; \ -- $(INSTALL_MAN) $(MAN_EUC) $(JMANDIR)/oneko.$(MANSUFFIX); \ -- echo "$(INSTALL_MAN) $(MAN_EUC) $(JMANDIR)/oneko.$(MANSUFFIX)"; \ -+ if [ -d $(DESTDIR)$(JMANDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JMANDIR)); fi; \ -+ $(INSTALL_MAN) $(MAN_EUC) $(DESTDIR)$(JMANDIR)/oneko.$(MANSUFFIX); \ -+ echo "$(INSTALL_MAN) $(MAN_EUC) $(DESTDIR)$(JMANDIR)/oneko.$(MANSUFFIX)"; \ - fi - - -@@ -122,66 +122,66 @@ - clean:: - $(RM) oneko - --install:: $(BINDIR)/oneko -- $(RM) $(BINDIR)/tora -+install:: $(DESTDIR)$(BINDIR)/oneko -+ $(RM) $(DESTDIR)$(BINDIR)/tora - - install:: $(HELPFILE) -- @if [ -d $(ONEKOLIBDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(ONEKOLIBDIR)); fi -+ @if [ -d $(DESTDIR)$(ONEKOLIBDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(ONEKOLIBDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(HELPFILE); do \ -- (set -x; $(INSTALL_DATA) $$i $(ONEKOLIBDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(ONEKOLIBDIR)); \ - done - - install:: $(BMFILES) -- @if [ -d $(BMDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(BMDIR)); fi -+ @if [ -d $(DESTDIR)$(BMDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BMDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(BMFILES); do \ -- (set -x; $(INSTALL_DATA) $$i $(BMDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BMDIR)); \ - done - - install:: $(TORA_BMFILES) -- @if [ -d $(TORA_BMDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(TORA_BMDIR)); fi -+ @if [ -d $(DESTDIR)$(TORA_BMDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(TORA_BMDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(TORA_BMFILES); do \ -- (set -x; $(INSTALL_DATA) $$i $(TORA_BMDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(TORA_BMDIR)); \ - done - - install:: $(BSD_BMFILES) -- @if [ -d $(BSD_BMDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(BSD_BMDIR)); fi -+ @if [ -d $(DESTDIR)$(BSD_BMDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BSD_BMDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(BSD_BMFILES); do \ -- (set -x; $(INSTALL_DATA) $$i $(BSD_BMDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BSD_BMDIR)); \ - done - - install:: $(BSD_PMFILES) -- @if [ -d $(BSD_PMDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(BSD_PMDIR)); fi -+ @if [ -d $(DESTDIR)$(BSD_PMDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BSD_PMDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(BSD_PMFILES); do \ -- (set -x; $(INSTALL_DATA) $$i $(BSD_PMDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BSD_PMDIR)); \ - done - - install:: $(CURSORFILES) -- @if [ -d $(ONEKOLIBDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(ONEKOLIBDIR)); fi -+ @if [ -d $(DESTDIR)$(ONEKOLIBDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(ONEKOLIBDIR)); fi - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for i in $(CURSORFILES); do \ -- (set -x; $(INSTALL_DATA) $$i $(ONEKOLIBDIR)); \ -+ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(ONEKOLIBDIR)); \ - done - - install:: $(RESOURCES) -- @if [ -d $(XAPPLOADDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(XAPPLOADDIR)); fi -- $(INSTALL_DATA) Oneko.ad $(XAPPLOADDIR)/Oneko -- @if [ x$(LANG) = x -o -d $(XAPPJLOADDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(XAPPJLOADDIR)); fi -- @if [ x$(LANG) != x -o -d $(XAPPJLOADDIR) ]; then (set +x; \ -- $(INSTALL_DATA) Oneko-uj.ad $(XAPPJLOADDIR)/Oneko); \ -- echo "$(INSTALL_DATA) Oneko-uj.ad $(XAPPJLOADDIR)/Oneko"; fi -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi -+ $(INSTALL_DATA) Oneko.ad $(DESTDIR)$(XAPPLOADDIR)/Oneko -+ @if [ x$(LANG) = x -o -d $(DESTDIR)$(XAPPJLOADDIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPJLOADDIR)); fi -+ @if [ x$(LANG) != x -o -d $(DESTDIR)$(XAPPJLOADDIR) ]; then (set +x; \ -+ $(INSTALL_DATA) Oneko-uj.ad $(DESTDIR)$(XAPPJLOADDIR)/Oneko); \ -+ echo "$(INSTALL_DATA) Oneko-uj.ad $(DESTDIR)$(XAPPJLOADDIR)/Oneko"; fi - - clean:: - $(RM) Oneko.ad Oneko-uj.ad Property changes on: head/games/oneko/files/extrapatch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/oneko/files/patch-Makefile.in =================================================================== --- head/games/oneko/files/patch-Makefile.in (nonexistent) +++ head/games/oneko/files/patch-Makefile.in (revision 385449) @@ -0,0 +1,127 @@ +--- Makefile.in.orig 2014-06-05 23:02:11.350393257 +0200 ++++ Makefile.in 2014-06-05 23:03:17.447389221 +0200 +@@ -100,19 +100,19 @@ + $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) + + install:: oneko +- @if [ -d $(BINDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(BINDIR)); fi +- $(INSTALL_PROGRAM) oneko $(BINDIR) ++ @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi ++ $(INSTALL_PROGRAM) oneko $(DESTDIR)$(BINDIR) + + install.man:: oneko.man oneko.man.jp $(MAN_EUC) +- @if [ -d $(MANDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(MANDIR)); fi +- $(INSTALL_MAN) oneko.man $(MANDIR)/oneko.$(MANSUFFIX) ++ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi ++ $(INSTALL_MAN) oneko.man $(DESTDIR)$(MANDIR)/oneko.$(MANSUFFIX) + @if [ x$(LANG) != x -a x$(MAN_EUC) != x ]; then \ +- if [ -d $(JMANDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(JMANDIR)); fi; \ +- $(INSTALL_MAN) $(MAN_EUC) $(JMANDIR)/oneko.$(MANSUFFIX); \ +- echo "$(INSTALL_MAN) $(MAN_EUC) $(JMANDIR)/oneko.$(MANSUFFIX)"; \ ++ if [ -d $(DESTDIR)$(JMANDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JMANDIR)); fi; \ ++ $(INSTALL_MAN) $(MAN_EUC) $(DESTDIR)$(JMANDIR)/oneko.$(MANSUFFIX); \ ++ echo "$(INSTALL_MAN) $(MAN_EUC) $(DESTDIR)$(JMANDIR)/oneko.$(MANSUFFIX)"; \ + fi + + +@@ -122,66 +122,66 @@ + clean:: + $(RM) oneko + +-install:: $(BINDIR)/oneko +- $(RM) $(BINDIR)/tora ++install:: $(DESTDIR)$(BINDIR)/oneko ++ $(RM) $(DESTDIR)$(BINDIR)/tora + + install:: $(HELPFILE) +- @if [ -d $(ONEKOLIBDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(ONEKOLIBDIR)); fi ++ @if [ -d $(DESTDIR)$(ONEKOLIBDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(ONEKOLIBDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(HELPFILE); do \ +- (set -x; $(INSTALL_DATA) $$i $(ONEKOLIBDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(ONEKOLIBDIR)); \ + done + + install:: $(BMFILES) +- @if [ -d $(BMDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(BMDIR)); fi ++ @if [ -d $(DESTDIR)$(BMDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BMDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(BMFILES); do \ +- (set -x; $(INSTALL_DATA) $$i $(BMDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BMDIR)); \ + done + + install:: $(TORA_BMFILES) +- @if [ -d $(TORA_BMDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(TORA_BMDIR)); fi ++ @if [ -d $(DESTDIR)$(TORA_BMDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(TORA_BMDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(TORA_BMFILES); do \ +- (set -x; $(INSTALL_DATA) $$i $(TORA_BMDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(TORA_BMDIR)); \ + done + + install:: $(BSD_BMFILES) +- @if [ -d $(BSD_BMDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(BSD_BMDIR)); fi ++ @if [ -d $(DESTDIR)$(BSD_BMDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BSD_BMDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(BSD_BMFILES); do \ +- (set -x; $(INSTALL_DATA) $$i $(BSD_BMDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BSD_BMDIR)); \ + done + + install:: $(BSD_PMFILES) +- @if [ -d $(BSD_PMDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(BSD_PMDIR)); fi ++ @if [ -d $(DESTDIR)$(BSD_PMDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BSD_PMDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(BSD_PMFILES); do \ +- (set -x; $(INSTALL_DATA) $$i $(BSD_PMDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(BSD_PMDIR)); \ + done + + install:: $(CURSORFILES) +- @if [ -d $(ONEKOLIBDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(ONEKOLIBDIR)); fi ++ @if [ -d $(DESTDIR)$(ONEKOLIBDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(ONEKOLIBDIR)); fi + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for i in $(CURSORFILES); do \ +- (set -x; $(INSTALL_DATA) $$i $(ONEKOLIBDIR)); \ ++ (set -x; $(INSTALL_DATA) $$i $(DESTDIR)$(ONEKOLIBDIR)); \ + done + + install:: $(RESOURCES) +- @if [ -d $(XAPPLOADDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(XAPPLOADDIR)); fi +- $(INSTALL_DATA) Oneko.ad $(XAPPLOADDIR)/Oneko +- @if [ x$(LANG) = x -o -d $(XAPPJLOADDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(XAPPJLOADDIR)); fi +- @if [ x$(LANG) != x -o -d $(XAPPJLOADDIR) ]; then (set +x; \ +- $(INSTALL_DATA) Oneko-uj.ad $(XAPPJLOADDIR)/Oneko); \ +- echo "$(INSTALL_DATA) Oneko-uj.ad $(XAPPJLOADDIR)/Oneko"; fi ++ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi ++ $(INSTALL_DATA) Oneko.ad $(DESTDIR)$(XAPPLOADDIR)/Oneko ++ @if [ x$(LANG) = x -o -d $(DESTDIR)$(XAPPJLOADDIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPJLOADDIR)); fi ++ @if [ x$(LANG) != x -o -d $(DESTDIR)$(XAPPJLOADDIR) ]; then (set +x; \ ++ $(INSTALL_DATA) Oneko-uj.ad $(DESTDIR)$(XAPPJLOADDIR)/Oneko); \ ++ echo "$(INSTALL_DATA) Oneko-uj.ad $(DESTDIR)$(XAPPJLOADDIR)/Oneko"; fi + + clean:: + $(RM) Oneko.ad Oneko-uj.ad Property changes on: head/games/oneko/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property