Bug 170898 - [PATCH] games/bugsquish: Makefile changed, take maintainership
Summary: [PATCH] games/bugsquish: Makefile changed, take maintainership
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-23 00:00 UTC by nemysis
Modified: 2012-09-10 03:04 UTC (History)
1 user (show)

See Also:

Attachments
bugsquish-0.0.6_10.patch (8.10 KB, patch)
2012-08-23 00:00 UTC, nemysis 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-08-23 00:00:09 UTC 
Makefile changed:

- two MASTER_SITES

- added LICENSE

- added
  PLIST_FILES
  PORTDATA
  post-patch:

- Take maintainership

Removed file(s):
- files/patch-Makefile
- pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)

How-To-Repeat: 
I wish to adopt this Port, have make all in this Ports new, not used Portrevision 9.
Comment 1 Steve Wills freebsd_committer freebsd_triage 2012-09-09 03:43:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2012-09-10 02:58:32 UTC 
Author: swills
Date: Mon Sep 10 01:58:17 2012
New Revision: 304012
URL: http://svn.freebsd.org/changeset/ports/304012

Log:
  - Add second MASTER_SITES entries
  - Added LICENSE
  - Use PLIST_FILES instead of pkg_plist
  - Give maintainership to submitter
  
  PR:		ports/170898
  Submitted by:	nemysis <nemysis@gmx.ch>

Deleted:
  head/games/bugsquish/pkg-plist
Modified:
  head/games/bugsquish/Makefile   (contents, props changed)
  head/games/bugsquish/files/patch-Makefile   (contents, props changed)
  head/games/bugsquish/pkg-descr   (contents, props changed)

Modified: head/games/bugsquish/Makefile
==============================================================================
--- head/games/bugsquish/Makefile	Mon Sep 10 01:52:01 2012	(r304011)
+++ head/games/bugsquish/Makefile	Mon Sep 10 01:58:17 2012	(r304012)
@@ -7,20 +7,53 @@
 
 PORTNAME=	bugsquish
 PORTVERSION=	0.0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/bugsquish/src/
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/bugsquish/src/ \
+		ftp://ftp.billsgames.com/unix/x/bugsquish/src/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Bug-squishing, fly-swatting action
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Action game not unlike light gun arcade games
 
-USE_SDL=	mixer image
+LICENSE=	GPLv2
+
+USE_SDL=	image mixer sdl
 USE_GMAKE=	yes
 
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDATA=	*
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
+
+post-patch:
+# Fix data location
+	@${REINPLACE_CMD} -e 's|/usr/share/bugsquish/|${DATADIR}/|' ${WRKSRC}/Makefile
+# Fix CFLAGS/LDFLAGS
+	@${REINPLACE_CMD} -e 's|CFLAGS=-Wall -O2|CFLAGS+=|' \
+	-e 's|SDL_CFLAGS :=|SDL_CFLAGS+=|' \
+	-e 's|SDL_LDFLAGS :=|SDL_LDFLAGS+=|' ${WRKSRC}/Makefile
+
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+# Executable
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+
+# Data
+.  for d in embedded images music sounds
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.  endfor
+
+# Pixmaps
+	${INSTALL_DATA} ${WRKSRC}/data/images/icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+# Documentation
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+.  for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.  endfor
+.endif
 
 .include <bsd.port.mk>

Modified: head/games/bugsquish/files/patch-Makefile
==============================================================================
--- head/games/bugsquish/files/patch-Makefile	Mon Sep 10 01:52:01 2012	(r304011)
+++ head/games/bugsquish/files/patch-Makefile	Mon Sep 10 01:58:17 2012	(r304012)
@@ -1,34 +0,0 @@
---- Makefile.orig	Fri Apr 19 17:15:27 2002
-+++ Makefile	Fri Nov 26 23:05:54 2004
-@@ -9,8 +9,8 @@
- 
- # User-definable stuff:
- 
--BIN_PREFIX=/usr/local/bin/
--DATA_PREFIX=/usr/share/bugsquish/
-+BIN_PREFIX=${PREFIX}/bin/
-+DATA_PREFIX=${PREFIX}/share/bugsquish/
- 
- 
- # Defaults for Linux:
-@@ -19,7 +19,7 @@
- TARGET_DEF=LINUX
- 
- 
--CFLAGS=-Wall -O2 $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-+CFLAGS+=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-         -D$(NOSOUNDFLAG) -D$(TARGET_DEF)
- 
- 
-@@ -29,8 +29,9 @@
- IMAGE=-lSDL_image
- NOSOUNDFLAG=__SOUND
- SDL_LIB=$(SDL_LDFLAGS) $(MIXER) $(IMAGE)
--SDL_CFLAGS := $(shell sdl-config --cflags)
--SDL_LDFLAGS := $(shell sdl-config --libs)
-+SDL_CONFIG ?=sdl-config
-+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-+SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- 
- installbin = install -g root -o root -m 755 
- installdat = install -g root -o root -m 644

Modified: head/games/bugsquish/pkg-descr
==============================================================================
--- head/games/bugsquish/pkg-descr	Mon Sep 10 01:52:01 2012	(r304011)
+++ head/games/bugsquish/pkg-descr	Mon Sep 10 01:58:17 2012	(r304012)
@@ -2,4 +2,7 @@ In Bug Squish, you must defend your arm 
 blood-sucking insects. Use your fly-swatter to squish them before they
 suck you dry.
 
+Bug Squish is based on the shareware game "Blood Suckers" for MacOS,
+by Brian Greenstone of Pangea Software.
+
 WWW: http://www.newbreedsoftware.com/bugsquish/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Steve Wills freebsd_committer freebsd_triage 2012-09-10 03:04:37 UTC 
State Changed
From-To: open->closed

Committed. Thanks!