Remove local patches to change the config dir so that the config dir

goes back to the default.

From Brad (maintainer)
This commit is contained in:
dcoppa 2010-10-27 07:57:34 +00:00
parent 4de87eac19
commit 8b6fcfa861
4 changed files with 6 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2010/10/24 21:40:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2010/10/27 07:57:34 dcoppa Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT= SWF player with Firefox browser plugin
VER= 0.8.8
DISTNAME= gnash-${VER}
REVISION= 0
REVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
@ -51,7 +51,7 @@ LIB_DEPENDS= ::archivers/bzip2 \
USE_GMAKE= Yes
# Gnash requires GNU libtool 2.2 or greater, so use the bundled one
USE_LIBTOOL= gnu
USE_GROFF = Yes
USE_GROFF= Yes
LIBTOOL= ${WRKSRC}/libtool
LIBTOOL_FLAGS+= --tag=disable-static
CONFIGURE_STYLE= gnu

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-libbase_rc_cpp,v 1.2 2010/10/12 09:38:16 dcoppa Exp $
--- libbase/rc.cpp.orig Sat Aug 21 10:26:58 2010
+++ libbase/rc.cpp Sun Aug 22 14:14:23 2010
@@ -152,6 +152,7 @@ RcInitFile::loadFiles()
#if !defined(__OS2__ ) && ! defined(__amigaos4__)
// On OS/2 only look in %HOME%
+ loadfile.append("/gnash");
loadfile.append("/gnashrc");
parseFile(loadfile);
#endif

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugin_npapi_plugin_cpp,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
--- plugin/npapi/plugin.cpp.orig Mon Aug 16 11:46:55 2010
+++ plugin/npapi/plugin.cpp Sun Aug 22 21:03:34 2010
@@ -208,6 +208,7 @@ NS_PluginInitialize()
#if !defined(__OS2__ ) && ! defined(__amigaos4__)
newGnashRc.append(SYSCONFDIR);
+ newGnashRc.append("/gnash");
newGnashRc.append("/gnashpluginrc");
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2010/10/12 09:38:16 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.8 2010/10/27 07:57:34 dcoppa Exp $
bin/gnash
@bin bin/gprocessor
@bin bin/gtk-gnash
@ -212,11 +212,10 @@ share/doc/gnash/images/
share/doc/gnash/images/car_crash.png
share/doc/gnash/images/rtmp.png
share/examples/gnash/
@sample ${SYSCONFDIR}/gnash/
share/examples/gnash/gnashpluginrc
@sample ${SYSCONFDIR}/gnash/gnashpluginrc
@sample ${SYSCONFDIR}/gnashpluginrc
share/examples/gnash/gnashrc
@sample ${SYSCONFDIR}/gnash/gnashrc
@sample ${SYSCONFDIR}/gnashrc
share/gnash/
share/gnash/GnashG.png
share/gnash/gnash_128_96.ico