Index: head/games/xtrojka/Makefile =================================================================== --- head/games/xtrojka/Makefile (revision 372028) +++ head/games/xtrojka/Makefile (revision 372029) @@ -1,24 +1,21 @@ # $FreeBSD$ PORTNAME= xtrojka PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games/arcade/tetris +MASTER_SITES= SUNSITE/games/arcade/tetris DISTNAME= ${PORTNAME}${PORTVERSION:C/\.//g} MAINTAINER= ports@edwinm.ik.nu COMMENT= Game of skill similar to T*tris USE_XORG= x11 xt xproto xaw xmu xext MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${DISTNAME} -MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} +INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/xtrojka - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xtrojka .include Index: head/games/xtrojka/files/old-patch-Makefile =================================================================== --- head/games/xtrojka/files/old-patch-Makefile (revision 372028) +++ head/games/xtrojka/files/old-patch-Makefile (nonexistent) @@ -1,83 +0,0 @@ ---- Makefile.orig Sat Oct 21 22:38:22 1995 -+++ Makefile Wed Jul 12 08:50:34 2000 -@@ -8,7 +8,7 @@ - - # your favorite C-compiler - # --CC=gcc -+CC?=gcc - #CC=cc - - -@@ -22,13 +22,13 @@ - # Touch 'hiscore.c' and 'score_status_mgr.c' when you change - # these variables! - # --HSFILE=/usr/local/games/lib/xtrojka.scores -+HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores - #HSFILE=/tmp/xtrojka.scores - CFLAGS= -DSCOREFILE='"$(HSFILE)"' - - # add library search path - # --CFLAGS+=-L/usr/X11/lib -+CFLAGS+=-L${LOCALBASE}/lib - - # on some systems you might add this line, because gcc starts wining - # about 'sizeof(Display)', since Display might be an empty struct; -@@ -42,24 +42,28 @@ - - # location of xtrojka game - # --TARGET_DIR=/usr/games -+TARGET_DIR=${PREFIX}/bin - - - # location of the manualpage - # --MANDIR=/usr/local/man/man6 -+MANDIR=${PREFIX}/man/man6 - - - # please comment out for the system you use - # - # sunos 4.1.3 --XDIR=/usr/openwin/include --LIBS=-lm -+#XDIR=/usr/openwin/include -+#LIBS=-lm - - # solaris - #XDIR=/usr/openwin/include - #LIBS=-lnsl - -+# FreeBSD -+XDIR=${LOCALBASE}/include -+LIBS=-lm -+ - # - # - # main -@@ -101,11 +105,17 @@ - # - # - install: -- @echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \ -- sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \ -- cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \ -- cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \ -- touch $(HSFILE); chmod go+rwx $(HSFILE); -+ @rm -f hsn -+ echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn -+ sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6 -+ gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz -+ cp xtrojka $(TARGET_DIR) -+ chmod 2755 $(TARGET_DIR)/xtrojka -+ chgrp games $(TARGET_DIR)/xtrojka -+ touch $(HSFILE) -+ chmod 664 $(HSFILE) -+ chgrp games $(HSFILE) -+ @rm -f hsn - - clean: - rm -rf *.o core xtrojka xtrojka.6 Property changes on: head/games/xtrojka/files/old-patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/xtrojka/files/patch-Makefile =================================================================== --- head/games/xtrojka/files/patch-Makefile (revision 372028) +++ head/games/xtrojka/files/patch-Makefile (revision 372029) @@ -1,78 +1,75 @@ ---- Makefile.orig 1996-07-27 20:05:03.000000000 +0200 -+++ Makefile 2013-09-12 11:55:14.000000000 +0200 -@@ -10,15 +10,15 @@ +--- Makefile.orig 1996-07-27 18:05:03 UTC ++++ Makefile +@@ -10,15 +10,15 @@ PROGS= xtrojka # xtrojka version (do not change!) VERSION=123 # where to put the binary -TARGET_DIR=/usr/games +TARGET_DIR=${PREFIX}/bin # where to put the manpage -MANDIR=/usr/local/man/man6 +MANDIR=${PREFIX}/man/man6 # the location of the highscorefile -HSFILE=/fill_in_your_scorefile +HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores # your favourite packer COMPRESS=gzip -v9 # your favourite c-compiler -CC=gcc +CC?=gcc # used X libraries XLIBS= -lXaw -lXmu -lXt -lX11 -lXext # some more X libraries -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ HSF=-DSCOREFILE='"$(HSFILE)"' # comment out your favorite system (the one you use, that is...) # # search the libaries here -LIBPATH=-L/usr/X11/lib +LIBPATH=-L${LOCALBASE}/lib # doesn't work too well on all systems #LCK=-DLOCKING # add debug info -@@ -75,7 +75,13 @@ +@@ -75,7 +75,13 @@ XPMLIB=-lXpm # # Linux # -SYS=-DLINUX +#SYS=-DLINUX + +# +# FreeBSD +# +XDIR=-I${LOCALBASE}/include +LIBS=-lm # # -@@ -105,11 +111,17 @@ +@@ -105,11 +111,14 @@ tar: rm -rf xtrojka$(VERSION); install: - @echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \ - sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" xtrojka.man > xtrojka.6; \ - cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \ - cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \ - touch $(HSFILE); chmod go+rwx $(HSFILE); + @rm -f hsn + echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn + sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6 + gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz -+ cp xtrojka $(TARGET_DIR) -+ chmod 2755 $(TARGET_DIR)/xtrojka -+ chgrp games $(TARGET_DIR)/xtrojka ++ $(BSD_INSTALL_PROGRAM) xtrojka $(TARGET_DIR) + touch $(HSFILE) + chmod 664 $(HSFILE) -+ chgrp games $(HSFILE) + @rm -f hsn clean: rm -rf tags *.o core xtrojka xtrojka.6 -@@ -119,7 +131,7 @@ +@@ -119,7 +128,7 @@ clean: # DEPENDENCIES # -_strdefs.h _resdefs.h: XTrojka +_strdefs.h _resdefs.h: XTrojka.uk $(RESGEN) actions.o: actions.c actions.h xtrojka.h debug.h Index: head/games/xtrojka/pkg-plist =================================================================== --- head/games/xtrojka/pkg-plist (revision 372028) +++ head/games/xtrojka/pkg-plist (revision 372029) @@ -1,4 +1,3 @@ -bin/xtrojka -share/xtrojka/xtrojka.scores +@(,games,2755) bin/xtrojka +@(,games,) share/xtrojka/xtrojka.scores man/man6/xtrojka.6.gz -@dirrm share/xtrojka