Date: Mon, 24 Jun 2013 21:40:41 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Cc: jpaetzel@FreeBSD.org Subject: ports/179935: [PATCH] games/tuxpuck: Trim Makefile Message-ID: <20130624194051.77829EF6@hub.freebsd.org> Resent-Message-ID: <201306241950.r5OJo15Q004924@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179935
>Category: ports
>Synopsis: [PATCH] games/tuxpuck: Trim Makefile
>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: Mon Jun 24 19:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:
- Shorten header
- Remove versions from LIB_DEPENDS
- Change portname to ${PORTNAME}
- Use REINPLACE_CMD instead of simple patches
- Trim Makefile
- Remove files/patch-utils::Makefile
Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
Build log
https://redports.org/buildarchive/20130624175400-54797/
>Fix:
--- tuxpuck-0.8.2_17.patch begins here ---
diff -ruN /usr/ports/games/tuxpuck/Makefile ./Makefile
--- /usr/ports/games/tuxpuck/Makefile 2013-06-02 18:54:43.000000000 +0200
+++ ./Makefile 2013-06-24 21:33:27.000000000 +0200
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for: tuxpuck
-# Date created: 25 April 2002
-# Whom: Jan Stocker <Jan.Stocker@t-online.de>
-#
+# Created by: Jan Stocker <Jan.Stocker@t-online.de>
# $FreeBSD: head/games/tuxpuck/Makefile 301188 2012-07-19 20:15:37Z naddy $
-#
PORTNAME= tuxpuck
PORTVERSION= 0.8.2
@@ -15,30 +10,34 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Shufflepuck Cafe Clone
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
- vorbis.4:${PORTSDIR}/audio/libvorbis \
- freetype.9:${PORTSDIR}/print/freetype2
+ vorbis:${PORTSDIR}/audio/libvorbis \
+ freetype:${PORTSDIR}/print/freetype2
USE_SDL= sdl
USE_GMAKE= yes
-ALL_TARGET= tuxpuck
+ALL_TARGET= ${PORTNAME}
MAKE_JOBS_UNSAFE= yes
CFLAGS+= -I${LOCALBASE}/include/libpng15
+
MANCOMPRESSED= yes
-MAN6= tuxpuck.6
-PLIST_FILES= bin/tuxpuck
+
+PLIST_FILES= bin/${PORTNAME}
+
+MAN6= ${PORTNAME}.6
.include <bsd.port.pre.mk>
post-patch:
cd ${WRKSRC}; \
- ${REINPLACE_CMD} "s,timer_create,_timer_create,g" \
+ ${REINPLACE_CMD} 's|timer_create|_timer_create|g' \
tuxpuck.c video.c timer.c intro.c tuxpuck.h
+ ${REINPLACE_CMD} -e 's|sdl-config|$$(SDL_CONFIG)|g' ${WRKSRC}/utils/Makefile
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tuxpuck ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/man/tuxpuck.6.gz ${MANPREFIX}/man/man6
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man/${MAN6}.gz ${MAN6PREFIX}/man/man6
.include <bsd.port.post.mk>
diff -ruN /usr/ports/games/tuxpuck/files/patch-utils::Makefile ./files/patch-utils::Makefile
--- /usr/ports/games/tuxpuck/files/patch-utils::Makefile 2013-06-02 18:54:43.000000000 +0200
+++ ./files/patch-utils::Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
---- utils/Makefile.orig Fri Nov 8 11:50:29 2002
-+++ utils/Makefile Wed Dec 25 15:41:44 2002
-@@ -9,10 +9,10 @@
- $(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-
- data2c : data2c.c
-- $(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
-+ $(CC) $(CFLAGS) data2c.c `$(SDL_CONFIG) --cflags --libs` -o data2c
-
- anim : anim.c
-- $(CC) $(CFLAGS) anim.c `sdl-config --cflags --libs` -o anim
-+ $(CC) $(CFLAGS) anim.c `$(SDL_CONFIG) --cflags --libs` -o anim
-
- clean :
- rm -f *~ data2c ttf2font anim
--- tuxpuck-0.8.2_17.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?20130624194051.77829EF6>