FreeBSD Bugzilla – Attachment 27610 Details for
Bug 46764
games/tome upgrade to 2.1.0 and setgid fix
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 14.98 KB, created by
Jan Hornyak
on 2003-01-04 21:10:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Jan Hornyak
Created:
2003-01-04 21:10:01 UTC
Size:
14.98 KB
patch
obsolete
>diff -urN games/tome/Makefile games/tome.210/Makefile >--- games/tome/Makefile Thu Nov 7 02:02:18 2002 >+++ games/tome.210/Makefile Sat Jan 4 21:25:07 2003 >@@ -6,18 +6,30 @@ > # > > PORTNAME= tome >-PORTVERSION= 2.0.0 >+PORTVERSION= 2.1.0 > CATEGORIES= games > MASTER_SITES= http://t-o-m-e.net/dl/src/ >-DISTNAME= tome-200-src >+DISTNAME= tome-210-src > EXTRACT_SUFX= .tgz > > MAINTAINER= kris@FreeBSD.org > > ALL_TARGET= # empty >-MAKEFILE= makefile.org >+MAKEFILE= makefile.std > USE_GMAKE= yes >-USE_X_PREFIX= yes >+USE_REINPLACE= yes > WRKSRC= ${WRKDIR}/${DISTNAME}/src >+ >+.if exists(${X11BASE}/lib/libX11.a) && !defined(WITHOUT_X11) >+USE_XLIB= yes >+.endif >+ >+post-patch: >+.if !defined(USE_XLIB) >+ ${REINPLACE_CMD} -e 's/-DUSE_X11//g' ${WRKSRC}/${MAKEFILE} >+ ${REINPLACE_CMD} -e 's/-lX11//g' ${WRKSRC}/${MAKEFILE} >+ ${REINPLACE_CMD} -e 's@-L$$(X11BASE)/lib@@g' ${WRKSRC}/${MAKEFILE} >+ ${REINPLACE_CMD} -e 's@-I$$(X11BASE)/include@@g' ${WRKSRC}/${MAKEFILE} >+.endif > > .include <bsd.port.mk> >diff -urN games/tome/distinfo games/tome.210/distinfo >--- games/tome/distinfo Mon Nov 4 11:28:55 2002 >+++ games/tome.210/distinfo Sat Jan 4 19:40:09 2003 >@@ -1 +1 @@ >-MD5 (tome-200-src.tgz) = b6eaa8bd38175cce13346baa82ea3a22 >+MD5 (tome-210-src.tgz) = bda364543e66497581d2267e7b99424f >diff -urN games/tome/files/patch-aa games/tome.210/files/patch-aa >--- games/tome/files/patch-aa Mon Nov 4 11:28:55 2002 >+++ games/tome.210/files/patch-aa Sat Jan 4 21:07:23 2003 >@@ -1,18 +1,16 @@ >---- makefile.org.orig Sun May 12 05:40:28 2002 >-+++ makefile.org Mon Nov 4 02:27:48 2002 >-@@ -78,7 +78,7 @@ >- ## >- >- # Where lib/ files goes >--LIBDIR = /usr/lib/games/tome/ >-+LIBDIR = $(PREFIX)/share/tome/ >+--- makefile.std.orig Mon Nov 25 00:42:24 2002 >++++ makefile.std Sat Jan 4 19:51:39 2003 >+@@ -81,18 +81,19 @@ > # Sysadmins of commercial Unix and/or BSD might prefer this > #LIBDIR = /usr/local/lib/tome/ > # If you like the old default, use this one >-@@ -88,12 +88,13 @@ >+-LIBDIR = ./lib/ >++LIBDIR = $(PREFIX)/share/tome/ >+ # Another example: single user installation using absolute path >+ #LIBDIR = /home/myloginname/lib/tome/ > > >- # Where PernAngband binary goes >+ # Where ToME binary goes > -BINDIR = /usr/local/games > +BINDIR = $(PREFIX)/bin > # Another common location >@@ -23,9 +21,9 @@ > +OWNER = root > +GROUP = games > >- ## >- ## 3. Some "system" definitions >-@@ -120,7 +121,7 @@ >+ # Ignore this if you're not making a package >+ DESTDIR= >+@@ -122,7 +123,7 @@ > # > # This is my compiler of choice, it seems to work most everywhere > # >@@ -34,7 +32,7 @@ > > # > # Standard version (see main-x11.c and main-gcu.c) >-@@ -146,11 +147,11 @@ >+@@ -148,12 +149,12 @@ > # including "USE_GETCH" and "USE_CURS_SET". Note that "config.h" will > # attempt to "guess" at many of these flags based on your system. > # >@@ -43,13 +41,14 @@ > +COPTS = -Wall -g > +INCLUDES = -I$(X11BASE)/include > DEFINES = -DUSE_X11 -DUSE_GCU \ >- -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA >+ -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \ >+ -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK > -LIBS = -lX11 -lcurses -L/usr/X11R6/lib > +LIBS = -lX11 -lcurses -L$(X11BASE)/lib > > > ## >-@@ -366,7 +367,7 @@ >+@@ -369,7 +370,7 @@ > # Compiler options > # > >@@ -58,19 +57,18 @@ > > > # >-@@ -441,10 +442,12 @@ >- [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR) >- [ -d $(BINDIR) ] || mkdir -p $(BINDIR) >- cp -r ../lib/* $(LIBDIR) >-- chown -R $(OWNER) $(LIBDIR) >-+ chown -R $(OWNER):$(GROUP) $(LIBDIR) >-+ chmod -R g+w $(LIBDIR) >- cp -f $(TARGET) $(BINDIR)/$(TARGET) >-- chown $(OWNER) $(BINDIR)/$(TARGET) >-- chmod 4755 $(BINDIR)/$(TARGET) >-+ strip $(BINDIR)/$(TARGET) >-+ chown $(OWNER):$(GROUP) $(BINDIR)/$(TARGET) >-+ chmod 2755 $(BINDIR)/$(TARGET) >+@@ -443,10 +444,11 @@ >+ [ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR) >+ [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) >+ cp -r ../lib/* $(DESTDIR)$(LIBDIR) >+- chown -R $(OWNER) $(DESTDIR)$(LIBDIR) >++ chown -R $(OWNER):$(GROUP) $(DESTDIR)$(LIBDIR) >++ chmod -R g+w $(DESTDIR)$(LIBDIR) >+ cp -f $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET) >+- chown $(OWNER) $(DESTDIR)$(BINDIR)/$(TARGET) >+- chmod 4755 $(DESTDIR)$(BINDIR)/$(TARGET) >++ chown $(OWNER):$(GROUP) $(DESTDIR)$(BINDIR)/$(TARGET) >++ chmod 2755 $(DESTDIR)$(BINDIR)/$(TARGET) > > # old-install: $(TARGET) > # cp $(TARGET) .. >diff -urN games/tome/files/patch-ab games/tome.210/files/patch-ab >--- games/tome/files/patch-ab Thu Jan 1 01:00:00 1970 >+++ games/tome.210/files/patch-ab Sat Jan 4 20:02:44 2003 >@@ -0,0 +1,173 @@ >+--- init2.c.orig Sat Jan 4 19:57:53 2003 >++++ init2.c Sat Jan 4 20:00:35 2003 >+@@ -410,7 +410,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -693,7 +693,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -1079,7 +1079,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -1303,7 +1303,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -1529,7 +1529,7 @@ >+ >+ /* int i; */ >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -1809,7 +1809,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -2075,7 +2075,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -2780,7 +2780,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -3004,7 +3004,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -3221,7 +3221,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -3447,7 +3447,7 @@ >+ >+ int i; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -3801,7 +3801,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -4018,7 +4018,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -4235,7 +4235,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -4452,7 +4452,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -4734,7 +4734,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err = 0; >+ >+@@ -4998,7 +4998,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err; >+ >+@@ -5286,7 +5286,7 @@ >+ { >+ int fd; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ errr err; >+ >+@@ -6199,7 +6199,7 @@ >+ { >+ int fd = -1; >+ >+- int mode = 0644; >++ int mode = 0664; >+ >+ FILE *fp; >+ >diff -urN games/tome/pkg-descr games/tome.210/pkg-descr >--- games/tome/pkg-descr Mon Nov 4 11:28:55 2002 >+++ games/tome.210/pkg-descr Sat Jan 4 19:40:41 2003 >@@ -2,4 +2,4 @@ > game based on JRR Tolkien's works. It is derived from the angband > codebase. > >-WWW: http://t-o-m-e.net/main.php?tome_current=0 >+WWW: http://www.t-o-m-e.net/ >diff -urN games/tome/pkg-plist games/tome.210/pkg-plist >--- games/tome/pkg-plist Mon Nov 4 11:28:55 2002 >+++ games/tome.210/pkg-plist Sat Jan 4 20:23:33 2003 >@@ -1,18 +1,9 @@ > bin/tome > share/tome/apex/delete.me > share/tome/bone/bone001.012 >-share/tome/bone/bone004.001 >-share/tome/bone/bone004.002 >-share/tome/bone/bone004.003 >-share/tome/bone/bone004.004 >-share/tome/bone/bone004.005 >-share/tome/bone/bone004.006 >-share/tome/bone/bone004.007 >-share/tome/bone/bone004.008 >-share/tome/bone/bone004.009 >-share/tome/bone/bone004.010 > share/tome/cmov/delete.me > share/tome/data/delete.me >+share/tome/data/.cvsignore > share/tome/dngn/dun1.14 > share/tome/dngn/dun10.0 > share/tome/dngn/dun18.0 >@@ -28,6 +19,7 @@ > share/tome/dngn/dun5.0 > share/tome/dngn/dun5.14 > share/tome/edit/a_info.txt >+share/tome/edit/al_info.txt > share/tome/edit/ba_info.txt > share/tome/edit/between.map > share/tome/edit/d_info.txt >@@ -65,9 +57,14 @@ > share/tome/edit/st_info.txt > share/tome/edit/t_basic.txt > share/tome/edit/t_bree.txt >+share/tome/edit/t_d_bree.txt > share/tome/edit/t_d_gond.txt >+share/tome/edit/t_d_khaz.txt >+share/tome/edit/t_d_lori.txt >+share/tome/edit/t_d_mina.txt > share/tome/edit/t_gondol.txt > share/tome/edit/t_info.txt >+share/tome/edit/t_khazad.txt > share/tome/edit/t_lorien.txt > share/tome/edit/t_minas.txt > share/tome/edit/t_pref.txt >@@ -126,6 +123,7 @@ > share/tome/file/monfear.txt > share/tome/file/monspeak.txt > share/tome/file/news.txt >+share/tome/file/news2.txt > share/tome/file/rart_f.txt > share/tome/file/rart_s.txt > share/tome/file/readme! >@@ -140,19 +138,19 @@ > share/tome/file/timenorm.txt > share/tome/help/TANG.txt > share/tome/help/attack.txt >+share/tome/help/automat.txt > share/tome/help/birth.txt > share/tome/help/bldg.txt > share/tome/help/c_alchem.txt > share/tome/help/c_archer.txt >-share/tome/help/c_beastm.txt >-share/tome/help/c_blade.txt >-share/tome/help/c_chaosw.txt >-share/tome/help/c_daemon.txt >+share/tome/help/c_assass.txt >+share/tome/help/c_axemas.txt >+share/tome/help/c_demono.txt > share/tome/help/c_druid.txt > share/tome/help/c_elemen.txt >+share/tome/help/c_hafted.txt > share/tome/help/c_harper.txt >-share/tome/help/c_himage.txt >-share/tome/help/c_illus.txt >+share/tome/help/c_lorema.txt > share/tome/help/c_mage.txt > share/tome/help/c_merch.txt > share/tome/help/c_mimic.txt >@@ -160,24 +158,27 @@ > share/tome/help/c_monk.txt > share/tome/help/c_necro.txt > share/tome/help/c_palad.txt >+share/tome/help/c_polear.txt > share/tome/help/c_posses.txt >-share/tome/help/c_powmag.txt >+share/tome/help/c_pr_drk.txt >+share/tome/help/c_pr_eru.txt >+share/tome/help/c_pr_man.txt > share/tome/help/c_priest.txt > share/tome/help/c_ranger.txt > share/tome/help/c_rogue.txt > share/tome/help/c_runecr.txt > share/tome/help/c_sorcer.txt > share/tome/help/c_summon.txt >+share/tome/help/c_swordm.txt > share/tome/help/c_symbia.txt > share/tome/help/c_thaum.txt > share/tome/help/c_unbel.txt >-share/tome/help/c_warmag.txt > share/tome/help/c_warper.txt > share/tome/help/c_warrio.txt >-share/tome/help/c_weponm.txt > share/tome/help/command.txt > share/tome/help/corspoil.txt > share/tome/help/def.aux >+share/tome/help/defines.txt > share/tome/help/dungeon.txt > share/tome/help/dunspoil.txt > share/tome/help/essences.txt >@@ -185,13 +186,15 @@ > share/tome/help/foot.aux > share/tome/help/g_eru.txt > share/tome/help/g_manwe.txt >+share/tome/help/g_melkor.txt > share/tome/help/g_tulkas.txt >+share/tome/help/g_yavann.txt > share/tome/help/gambling.txt > share/tome/help/general.txt > share/tome/help/gods.txt >-share/tome/help/godspoil.txt > share/tome/help/head.aux > share/tome/help/help.hlp >+share/tome/help/index.txt > share/tome/help/inscrip.txt > share/tome/help/lua.hlp > share/tome/help/lua_gf.txt >@@ -206,26 +209,29 @@ > share/tome/help/luckspoi.txt > share/tome/help/m_air.txt > share/tome/help/m_convey.txt >+share/tome/help/m_demono.txt > share/tome/help/m_divin.txt > share/tome/help/m_earth.txt > share/tome/help/m_fire.txt > share/tome/help/m_mana.txt > share/tome/help/m_meta.txt > share/tome/help/m_mind.txt >+share/tome/help/m_mindcr.txt > share/tome/help/m_nature.txt >+share/tome/help/m_necrom.txt >+share/tome/help/m_symbio.txt > share/tome/help/m_tempo.txt > share/tome/help/m_thaum.txt >+share/tome/help/m_udun.txt > share/tome/help/m_water.txt > share/tome/help/macrofaq.txt > share/tome/help/magic.txt > share/tome/help/newbie.hlp > share/tome/help/option.txt >-share/tome/help/pern_faq.txt > share/tome/help/r_beorn.txt > share/tome/help/r_deathm.txt >-share/tome/help/r_drgnri.txt > share/tome/help/r_drkelf.txt >-share/tome/help/r_duned.txt >+share/tome/help/r_dunad.txt > share/tome/help/r_dwarf.txt > share/tome/help/r_elf.txt > share/tome/help/r_ent.txt >@@ -240,6 +246,7 @@ > share/tome/help/r_orc.txt > share/tome/help/r_pettyd.txt > share/tome/help/r_rohank.txt >+share/tome/help/r_thlord.txt > share/tome/help/r_troll.txt > share/tome/help/r_wodelf.txt > share/tome/help/r_yeek.txt >@@ -247,12 +254,14 @@ > share/tome/help/rm_class.txt > share/tome/help/rm_corru.txt > share/tome/help/rm_herm.txt >+share/tome/help/rm_lsoul.txt > share/tome/help/rm_skel.txt > share/tome/help/rm_spec.txt > share/tome/help/rm_vamp.txt > share/tome/help/rm_zomb.txt > share/tome/help/skills.txt > share/tome/help/spoiler.hlp >+share/tome/help/tome_faq.txt > share/tome/help/version.txt > share/tome/help/wishing.txt > share/tome/info/delete.me >@@ -294,11 +303,18 @@ > share/tome/pref/xtra-new.prf > share/tome/pref/xtra-xxx.prf > share/tome/save/delete.me >+share/tome/scpt/auto.lua > share/tome/scpt/bounty.lua > share/tome/scpt/building.lua >+share/tome/scpt/corrupt.lua >+share/tome/scpt/crpt_aux.lua >+share/tome/scpt/dungeon.lua >+share/tome/scpt/fireprof.lua >+share/tome/scpt/gen_idx.lua >+share/tome/scpt/god.lua >+share/tome/scpt/help.lua > share/tome/scpt/init.lua > share/tome/scpt/intro.lua >-share/tome/scpt/lebohaum.lua > share/tome/scpt/monsters.lua > share/tome/scpt/objects.lua > share/tome/scpt/player.lua >@@ -308,6 +324,7 @@ > share/tome/scpt/s_air.lua > share/tome/scpt/s_aux.lua > share/tome/scpt/s_convey.lua >+share/tome/scpt/s_demon.lua > share/tome/scpt/s_divin.lua > share/tome/scpt/s_earth.lua > share/tome/scpt/s_eru.lua >@@ -317,17 +334,27 @@ > share/tome/scpt/s_melkor.lua > share/tome/scpt/s_meta.lua > share/tome/scpt/s_mind.lua >+share/tome/scpt/s_music.lua > share/tome/scpt/s_nature.lua >+share/tome/scpt/s_stick.lua > share/tome/scpt/s_tempo.lua > share/tome/scpt/s_tulkas.lua > share/tome/scpt/s_udun.lua > share/tome/scpt/s_water.lua >+share/tome/scpt/s_yavann.lua > share/tome/scpt/spells.lua >+share/tome/scpt/stores.lua > share/tome/scpt/test.lua >+share/tome/scpt/util.lua >+share/tome/scpt/xml.lua >+share/tome/user/automat.atm > share/tome/user/delete.me >-share/tome/xtra/ANGBAND.FNT >+share/tome/xtra/angband.fnt > share/tome/xtra/font/10X20.FON > share/tome/xtra/font/12X24.FON >+share/tome/xtra/font/12x24-blah-jis.hex >+share/tome/xtra/font/18x25-b&h-lucidatypewriter.hex >+share/tome/xtra/font/3x5.hex > share/tome/xtra/font/5X8.FON > share/tome/xtra/font/6X10.FON > share/tome/xtra/font/6X12.FON >@@ -338,6 +365,7 @@ > share/tome/xtra/font/7X13B.FON > share/tome/xtra/font/8X13.FON > share/tome/xtra/font/8X13B.FON >+share/tome/xtra/font/8x16kana-jisx0201.1976.hex > share/tome/xtra/font/9X15.FON > share/tome/xtra/font/9X15B.FON > share/tome/xtra/font/XM10X17.FNT >@@ -350,14 +378,24 @@ > share/tome/xtra/font/XM6X12.FNT > share/tome/xtra/font/XM6X12B.FNT > share/tome/xtra/font/XM8X16B.FNT >+share/tome/xtra/font/comic20x24.hex >+share/tome/xtra/font/def8x16.hex >+share/tome/xtra/font/jmk8x12-modd-bold-r-semicond.hex >+share/tome/xtra/font/marumoji-8x14.hex >+share/tome/xtra/font/misc5x7.hex >+share/tome/xtra/font/misc6x13.hex >+share/tome/xtra/font/nethack10x19-10.hex >+share/tome/xtra/font/symbadobe.hex >+share/tome/xtra/font/vga11x19.hex >+share/tome/xtra/font/vga8x16.hex > share/tome/xtra/font/xm4x6.fnt > share/tome/xtra/font/xm8x13.fnt > share/tome/xtra/font/xm8x13b.fnt > share/tome/xtra/font/xm8x16.fnt > share/tome/xtra/graf/16x16.bmp > share/tome/xtra/graf/8x8.bmp >-share/tome/xtra/graf/backgrnd.gif > share/tome/xtra/graf/mask.bmp >+share/tome/xtra/graf/.xvpics/16x16.gif > share/tome/xtra/music/delete.me > share/tome/xtra/sound/Sound.cfg > share/tome/xtra/sound/readme.txt >@@ -371,12 +409,12 @@ > @dirrm share/tome/help > @dirrm share/tome/info > @dirrm share/tome/note >-@dirrm share/tome/plot > @dirrm share/tome/pref > @dirrm share/tome/save > @dirrm share/tome/scpt > @dirrm share/tome/user > @dirrm share/tome/xtra/font >+@dirrm share/tome/xtra/graf/.xvpics > @dirrm share/tome/xtra/graf > @dirrm share/tome/xtra/music > @dirrm share/tome/xtra/sound
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 46764
: 27610