diff options
author | madpilot <madpilot@FreeBSD.org> | 2014-06-06 05:35:29 +0800 |
---|---|---|
committer | madpilot <madpilot@FreeBSD.org> | 2014-06-06 05:35:29 +0800 |
commit | 85663f1b164f0adcbbd3d2127365bbb8e00eca96 (patch) | |
tree | 35a3576d9c3d4bcfadec4aaa80d253a2a5553ec9 /games | |
parent | 93c895f8e3f502390a9314863145bedd7df7116d (diff) | |
download | freebsd-ports-gnome-85663f1b164f0adcbbd3d2127365bbb8e00eca96.tar.gz freebsd-ports-gnome-85663f1b164f0adcbbd3d2127365bbb8e00eca96.tar.zst freebsd-ports-gnome-85663f1b164f0adcbbd3d2127365bbb8e00eca96.zip |
- Fix build with clng [1]
- Stageify [2]
PR: 189050 [1]
Submitted by: A.J. "Fonz" van Werven <freebsd@skysmurf.nl>
Approved by: Maintainer timeout [1]
Approved by: Ports tree modernization blanket [2]
Diffstat (limited to 'games')
-rw-r--r-- | games/oneko/Makefile | 8 | ||||
-rw-r--r-- | games/oneko/files/extrapatch-Makefile.in | 127 | ||||
-rw-r--r-- | games/oneko/files/patch-event.c | 10 | ||||
-rw-r--r-- | games/oneko/pkg-plist | 2 |
4 files changed, 142 insertions, 5 deletions
diff --git a/games/oneko/Makefile b/games/oneko/Makefile index 3bd19ce3c002..fff7e7bb985c 100644 --- a/games/oneko/Makefile +++ b/games/oneko/Makefile @@ -24,20 +24,18 @@ CONFLICTS= oneko-1.* GNU_CONFIGURE= yes USE_XORG= x11 xpm xmu -MAN6= oneko.6 -MANLANG= "" ja WRKSRC= ${WRKDIR}/${PORTNAME} INSTALL_TARGET= install install.man MAKE_ARGS= MANSUFFIX=6 \ MANDIR=${PREFIX}/man/man6 \ JMANDIR=${PREFIX}/man/ja/man6 -NO_STAGE= yes -do-patch: +pre-patch: @(cd ${WRKSRC}; \ ${PATCH} -p1 < ../oneko-2.0b-pop1.1.patch ; \ ${PATCH} -p1 < oneko-2.0b-tip1.7.patch ; \ ${PATCH} -p1 < ../oneko-2.0b-sender0.5.patch ; \ - ${PATCH} -p1 < ../oneko-2.0b-bsd0.2.patch ) + ${PATCH} -p1 < ../oneko-2.0b-bsd0.2.patch ; \ + ${PATCH} < ${FILESDIR}/extrapatch-Makefile.in ) .include <bsd.port.mk> diff --git a/games/oneko/files/extrapatch-Makefile.in b/games/oneko/files/extrapatch-Makefile.in new file mode 100644 index 000000000000..91a1b802262d --- /dev/null +++ b/games/oneko/files/extrapatch-Makefile.in @@ -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 diff --git a/games/oneko/files/patch-event.c b/games/oneko/files/patch-event.c new file mode 100644 index 000000000000..a5323c11266a --- /dev/null +++ b/games/oneko/files/patch-event.c @@ -0,0 +1,10 @@ +--- event.c.orig 2014-06-05 16:17:55.096065622 +0200 ++++ event.c 2014-06-05 16:21:05.995052448 +0200 +@@ -106,6 +106,7 @@ + 0, 0, toy->width, toy->height); + } + ++void + NekoChangeVisibility(window) + Window window; + { diff --git a/games/oneko/pkg-plist b/games/oneko/pkg-plist index 169965c26ab4..dec6bcf9f264 100644 --- a/games/oneko/pkg-plist +++ b/games/oneko/pkg-plist @@ -1,4 +1,6 @@ bin/oneko +man/man6/oneko.6.gz +man/ja/man6/oneko.6.gz lib/X11/app-defaults/Oneko lib/X11/ja/app-defaults/Oneko @dirrm lib/X11/ja/app-defaults |