Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Aug 2012 00:55:45 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/170898: [PATCH] games/bugsquish: Makefile changed, take maintainership
Message-ID:  <20120822225554.A34B0106566B@hub.freebsd.org>
Resent-Message-ID: <201208222300.q7MN09EO080796@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         170898
>Category:       ports
>Synopsis:       [PATCH] games/bugsquish: Makefile changed, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 22 23:00:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:

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.

>Fix:

--- bugsquish-0.0.6_10.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/bugsquish/Makefile ./Makefile
--- /usr/ports/games/bugsquish/Makefile	2012-06-01 07:18:32.000000000 +0200
+++ ./Makefile	2012-08-23 00:35:26.000000000 +0200
@@ -1,26 +1,59 @@
-# New ports collection makefile for:	bugsquish
-# Date created:				2004 05 July
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
+# New Ports collection makefile for:	bugsquish
+# Date created:		2004-07-05
+# Whom:			Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD: ports/games/bugsquish/Makefile,v 1.14 2012/06/01 05:18:32 dinoex Exp $
 #
 
 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=	An 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>
diff -ruN --exclude=CVS /usr/ports/games/bugsquish/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/games/bugsquish/files/patch-Makefile	2004-11-26 22:01:30.000000000 +0100
+++ ./files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -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
diff -ruN --exclude=CVS /usr/ports/games/bugsquish/pkg-descr ./pkg-descr
--- /usr/ports/games/bugsquish/pkg-descr	2004-07-05 23:51:01.000000000 +0200
+++ ./pkg-descr	2012-08-22 22:56:39.000000000 +0200
@@ -2,4 +2,7 @@
 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/
diff -ruN --exclude=CVS /usr/ports/games/bugsquish/pkg-plist ./pkg-plist
--- /usr/ports/games/bugsquish/pkg-plist	2004-11-26 22:01:30.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,119 +0,0 @@
-bin/bugsquish
-%%DATADIR%%/embedded/images/.xvpics/title.png
-%%DATADIR%%/embedded/images/.xvpics/start-cont.png
-%%DATADIR%%/embedded/images/arm1.png
-%%DATADIR%%/embedded/images/arm2.png
-%%DATADIR%%/embedded/images/arm3.png
-%%DATADIR%%/embedded/images/arm4.png
-%%DATADIR%%/embedded/images/arm5.png
-%%DATADIR%%/embedded/images/blood-squished.png
-%%DATADIR%%/embedded/images/blood.png
-%%DATADIR%%/embedded/images/bonus.png
-%%DATADIR%%/embedded/images/bug0a.png
-%%DATADIR%%/embedded/images/bug0b.png
-%%DATADIR%%/embedded/images/bug0c.png
-%%DATADIR%%/embedded/images/bug1a.png
-%%DATADIR%%/embedded/images/bug1b.png
-%%DATADIR%%/embedded/images/bug1c.png
-%%DATADIR%%/embedded/images/bug2a.png
-%%DATADIR%%/embedded/images/bug2b.png
-%%DATADIR%%/embedded/images/bug2c.png
-%%DATADIR%%/embedded/images/bug3a.png
-%%DATADIR%%/embedded/images/bug3b.png
-%%DATADIR%%/embedded/images/bug3c.png
-%%DATADIR%%/embedded/images/bug4a.png
-%%DATADIR%%/embedded/images/bug4b.png
-%%DATADIR%%/embedded/images/bug4c.png
-%%DATADIR%%/embedded/images/bugsquish-icon.xpm
-%%DATADIR%%/embedded/images/flyswatter-mask.xbm
-%%DATADIR%%/embedded/images/flyswatter.xbm
-%%DATADIR%%/embedded/images/gauge-empty.png
-%%DATADIR%%/embedded/images/gauge-full.png
-%%DATADIR%%/embedded/images/highscore.png
-%%DATADIR%%/embedded/images/icon.png
-%%DATADIR%%/embedded/images/large0.png
-%%DATADIR%%/embedded/images/large1.png
-%%DATADIR%%/embedded/images/large2.png
-%%DATADIR%%/embedded/images/large3.png
-%%DATADIR%%/embedded/images/large4.png
-%%DATADIR%%/embedded/images/large5.png
-%%DATADIR%%/embedded/images/large6.png
-%%DATADIR%%/embedded/images/large7.png
-%%DATADIR%%/embedded/images/large8.png
-%%DATADIR%%/embedded/images/large9.png
-%%DATADIR%%/embedded/images/mult-squished.png
-%%DATADIR%%/embedded/images/mult.png
-%%DATADIR%%/embedded/images/numbers.png
-%%DATADIR%%/embedded/images/paused.png
-%%DATADIR%%/embedded/images/presents.png
-%%DATADIR%%/embedded/images/scorebox.png
-%%DATADIR%%/embedded/images/start_cont.png
-%%DATADIR%%/embedded/images/times2.png
-%%DATADIR%%/embedded/images/title.png
-%%DATADIR%%/embedded/images/wavebox.png
-%%DATADIR%%/images/arm1.png
-%%DATADIR%%/images/arm2.png
-%%DATADIR%%/images/arm3.png
-%%DATADIR%%/images/arm4.png
-%%DATADIR%%/images/arm5.png
-%%DATADIR%%/images/blood-squished.png
-%%DATADIR%%/images/blood.png
-%%DATADIR%%/images/bonus.png
-%%DATADIR%%/images/bug0a.png
-%%DATADIR%%/images/bug0b.png
-%%DATADIR%%/images/bug0c.png
-%%DATADIR%%/images/bug1a.png
-%%DATADIR%%/images/bug1b.png
-%%DATADIR%%/images/bug1c.png
-%%DATADIR%%/images/bug2a.png
-%%DATADIR%%/images/bug2b.png
-%%DATADIR%%/images/bug2c.png
-%%DATADIR%%/images/bug3a.png
-%%DATADIR%%/images/bug3b.png
-%%DATADIR%%/images/bug3c.png
-%%DATADIR%%/images/bug4a.png
-%%DATADIR%%/images/bug4b.png
-%%DATADIR%%/images/bug4c.png
-%%DATADIR%%/images/bugsquish-icon.xpm
-%%DATADIR%%/images/flyswatter-mask.xbm
-%%DATADIR%%/images/flyswatter.xbm
-%%DATADIR%%/images/gauge-empty.png
-%%DATADIR%%/images/gauge-full.png
-%%DATADIR%%/images/highscore.png
-%%DATADIR%%/images/icon.png
-%%DATADIR%%/images/large0.png
-%%DATADIR%%/images/large1.png
-%%DATADIR%%/images/large2.png
-%%DATADIR%%/images/large3.png
-%%DATADIR%%/images/large4.png
-%%DATADIR%%/images/large5.png
-%%DATADIR%%/images/large6.png
-%%DATADIR%%/images/large7.png
-%%DATADIR%%/images/large8.png
-%%DATADIR%%/images/large9.png
-%%DATADIR%%/images/mult-squished.png
-%%DATADIR%%/images/mult.png
-%%DATADIR%%/images/numbers.png
-%%DATADIR%%/images/paused.png
-%%DATADIR%%/images/presents.png
-%%DATADIR%%/images/scorebox.png
-%%DATADIR%%/images/times2.png
-%%DATADIR%%/images/title.png
-%%DATADIR%%/images/wavebox.png
-%%DATADIR%%/music/adventures.mod
-%%DATADIR%%/music/corpses.mod
-%%DATADIR%%/sounds/ah.wav
-%%DATADIR%%/sounds/bonus.wav
-%%DATADIR%%/sounds/glug.wav
-%%DATADIR%%/sounds/highscore.wav
-%%DATADIR%%/sounds/ouch.wav
-%%DATADIR%%/sounds/squish1.wav
-%%DATADIR%%/sounds/squish2.wav
-%%DATADIR%%/sounds/ugh.wav
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/embedded/images/.xvpics
-@dirrm %%DATADIR%%/embedded/images
-@dirrm %%DATADIR%%/embedded
-@dirrm %%DATADIR%%
--- bugsquish-0.0.6_10.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120822225554.A34B0106566B>