From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 2 15:51:28 2008 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD1FE106566C for ; Tue, 2 Sep 2008 15:51:28 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85]) by mx1.freebsd.org (Postfix) with ESMTP id 362B78FC1D for ; Tue, 2 Sep 2008 15:51:27 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1KaXiM-0006ic-QB; Tue, 02 Sep 2008 19:22:42 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 17693B930; Tue, 2 Sep 2008 19:22:05 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id 822961702F; Tue, 2 Sep 2008 19:22:43 +0400 (MSD) Date: Tue, 2 Sep 2008 19:22:43 +0400 From: Dmitry Marakasov To: stsp@stsp.in-berlin.de, freebsd-ports-bugs@FreeBSD.org Message-ID: <20080902152243.GB76721@hades.panopticon> References: <200809011520.m81FKCvr095732@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <200809011520.m81FKCvr095732@freefall.freebsd.org> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: Subject: Re: ports/126985: [Update] emulators/desmume updated to 0.8 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2008 15:51:28 -0000 > Synopsis: [Update] emulators/desmume updated to 0.8 > > http://www.freebsd.org/cgi/query-pr.cgi?pr=126985 I've improved a patch, as port was kinda mess before. Changes: * Resort stuff in more usual manner * Add missing dependency * Remove unneeded stuff (PORTREVISION=0, CONFIGURE_TARGET) * Convert patches to REINPLACE_CMD; this is much cleaner * Use pkg-plist; putting so much stuff into PLIST_FILES isn't what it was intended for * Install locales into share/locale, not lib/locale (I still need to test if this works) What do you think? --- desmume.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/desmume/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 21 Aug 2008 06:16:57 -0000 1.6 +++ Makefile 2 Sep 2008 15:18:09 -0000 @@ -2,25 +2,31 @@ # Date created: Wed 7 Feb 2007 21:46:15 CET # Whom: Stefan Sperling # -# $FreeBSD: ports/emulators/desmume/Makefile,v 1.6 2008/08/21 06:16:57 rafan Exp $ +# $FreeBSD: ports/emulators/desmume/Makefile,v 1.5 2008/06/06 13:26:59 edwin Exp $ # PORTNAME= desmume -PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTVERSION= 0.8 CATEGORIES= emulators MASTER_SITES= SF -MAINTAINER= stsp@stsp.in-berlin.de +MAINTAINER= llc2w@virginia.edu COMMENT= Nintendo DS emulator +LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext + USE_SDL= sdl USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_GNOME= gtk20 libglade2 +GNU_CONFIGURE= yes +CONFIGURE_ENV= GMSGFMT=msgfmt DATADIRNAME=share -PLIST_FILES= bin/desmume-glade bin/desmume bin/desmume-cli +USE_AUTOTOOLS= aclocal:19 autoconf:262 +ACLOCAL_ARGS= +AUTOCONF_ARGS= + +CFLAGS+= -I${LOCALBASE}/include -DGTKGLEXT_AVAILABLE -DHAVE_LIBGDKGLEXT_X11_1_0 \ + -DHAVE_GL_GL_H -DHAVE_GL_GLU_H .include @@ -28,4 +34,9 @@ BROKEN= Does not compile on ia64 .endif +post-patch: + @${REINPLACE_CMD} -e 's|@MKDIR_P@|${MKDIR}|' ${WRKSRC}/src/cli/Makefile.in \ + ${WRKSRC}/src/gtk/Makefile.in ${WRKSRC}/src/gtk-glade/Makefile.in + @${REINPLACE_CMD} -e 's|../MMU.h|../&|' ${WRKSRC}/src/gtk/tools/ioregsView.c + .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/emulators/desmume/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 12 Feb 2007 08:37:15 -0000 1.1 +++ distinfo 2 Sep 2008 15:18:09 -0000 @@ -1,3 +1,3 @@ -MD5 (desmume-0.6.0.tar.gz) = 48f192b8839affc03b2b28e5eb509984 -SHA256 (desmume-0.6.0.tar.gz) = 61dd71c6dd58dffbff45b4af54ba4d81fb46d749aae0894895828a4517c288ef -SIZE (desmume-0.6.0.tar.gz) = 359041 +MD5 (desmume-0.8.tar.gz) = d8bf49dfd8d571af3a16be105c70dfda +SHA256 (desmume-0.8.tar.gz) = df874af3da82ad453a9e095b9a51bbc864ada211566a6184af6e0f483d447e8a +SIZE (desmume-0.8.tar.gz) = 690259 Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-plist 2 Sep 2008 15:18:09 -0000 @@ -0,0 +1,14 @@ +bin/desmume +bin/desmume-cli +bin/desmume-glade +share/applications/desmume-glade.desktop +share/applications/desmume.desktop +%%DATADIR%%/glade/DeSmuME.xpm +%%DATADIR%%/glade/DeSmuMe.glade +%%DATADIR%%/glade/DeSmuMe_Dtools.glade +share/locale/fr/LC_MESSAGES/desmume.mo +share/locale/pt_BR/LC_MESSAGES/desmume.mo +share/pixmaps/DeSmuME.xpm +@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%% +@dirrmtry share/applications --- desmume.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru