Resolve conflict with lang/rakudo.

from Kirill Bychkov (maintainer)
This commit is contained in:
ajacoutot 2011-05-30 05:28:31 +00:00
parent 51572bbc5b
commit 2cf4a6e54b
3 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/05/27 07:20:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2011/05/30 05:28:31 ajacoutot Exp $
SHARED_ONLY = Yes
@ -8,7 +8,9 @@ COMMENT-editor = UFO:AI map editor
V = 2.3.1
DISTNAME = ufoai-${V}-source
PKGNAME-main = ${DISTNAME:S/-source//}
REVISION-main = 0
PKGNAME-editor = uforadiant-${V}
REVISION-editor = 0
EXTRACT_SUFX = .tar.bz2
@ -79,6 +81,7 @@ INSTALL_TARGET = install_exec
post-extract:
mkdir -p ${WRKSRC}/base/{maps,models}
mv ${WRKSRC}/debian/ufo.6 ${WRKSRC}/debian/ufoai.6
pre-configure:
perl -pi -e 's,/usr/share/games/,${PREFIX}/share/,g' ${WRKSRC}/debian/*.6

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2011/05/27 07:20:11 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2011/05/30 05:28:31 ajacoutot Exp $
--- Makefile.in.orig Mon Nov 29 19:46:35 2010
+++ Makefile.in Tue May 17 17:38:00 2011
+++ Makefile.in Sun May 29 16:13:54 2011
@@ -199,7 +199,6 @@ install_data: pk3
# datadir.
#
@ -9,7 +9,12 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2011/05/27 07:20:11 ajacoutot Exp $
$(INSTALL) -d $(DESTDIR)$(PKGDATADIR)/base
# Copy each compiled file to datadir (with path)
for file in $(TARGETS); do $(INSTALL) -m 755 $$file $(DESTDIR)$(PKGDATADIR)/$$file; done
@@ -216,6 +215,15 @@ install_exec: $(TARGETS)
@@ -212,10 +211,19 @@ install_exec: $(TARGETS)
@echo "#!/bin/sh" > ufo.sh
@echo "cd $(PKGDATADIR); ./ufo \$$*; exit \$$?" >> ufo.sh
$(INSTALL) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 755 ufo.sh $(DESTDIR)$(BINDIR)/ufo
+ $(INSTALL) -m 755 ufo.sh $(DESTDIR)$(BINDIR)/ufoai
@echo "#!/bin/sh" > ufoded.sh
@echo "cd $(PKGDATADIR); ./ufoded \$$*; exit \$$?" >> ufoded.sh
$(INSTALL) -m 755 ufoded.sh $(DESTDIR)$(BINDIR)/ufoded

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2011/05/27 07:20:11 ajacoutot Exp $
bin/ufo
@comment $OpenBSD: PLIST-main,v 1.2 2011/05/30 05:28:31 ajacoutot Exp $
bin/ufoai
bin/ufoded
@man man/man6/ufo.6
@man man/man6/ufoai.6
@man man/man6/ufoded.6
share/applications/ufoai-safe.desktop
share/applications/ufoai.desktop