- Upgrade to 1.26 and unbreak;

- Add pkg-plist.

4 files changed, 251 insertions, 59 deletions

diff --git a/games/bomb/Makefile b/games/bomb/Makefile
index cafca5cd401d..0bc82b55469f 100644
--- a/games/bomb/Makefile
+++ b/games/bomb/Makefile
@@ -6,73 +6,41 @@
 #
 
 PORTNAME=	bomb
-PORTVERSION=	1.0
+PORTVERSION=	1.26
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/hacks/svgalib
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	http://www.draves.org/bomb/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive display hack for SVGAlib or X
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libquicktime.a:${PORTSDIR}/multimedia/libquicktime
+LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound	\
+		tiff.4:${PORTSDIR}/graphics/tiff \
 		vga.1:${PORTSDIR}/graphics/svgalib
 
-NO_PACKAGE=	"parts are under GPL, parts under X license"
-
-BROKEN=		Checksum mismatch
-
-DATADIR=	share/${PORTNAME}/
-DOCDIR=		share/doc/${PORTNAME}/
-DOCS=		COPYING README bomb.lsm guile.txt manual.txt notes.txt
-ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/pkg-plist
-SRCS=		acidlife anneal bomb brain cmap fast fuse gif image image_rule \
-			image_seq libifs match quad rd rotor rug rug_multi \
-			rug_rug shade slip sound static wave zio
-.for i in ${SRCS}
-OBJS+=	${i}.o
-.endfor
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-pre-build:
-	${ECHO_CMD} "bin/bomb" > ${PLIST}
-	for i in `${FIND} -s ${WRKSRC}/suck -type f`; do \
-		${ECHO_CMD} ${DATADIR}suck/`${BASENAME} $${i}` >> ${PLIST}; \
-	done
-.for i in cmap-data flame-data seq-data title.tif
-	${ECHO_CMD} ${DATADIR}/${i} >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${ECHO_CMD} ${DOCDIR}${i} >> ${PLIST}
+USE_REINPLACE=	yes
+MAKE_ENV=	SCM_CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
+ALL_TARGET=	${PORTNAME}
+
+PORTDOCS=	README bomb.lsm guile.txt manual.txt notes.txt
+
+pre-configure:
+.for fi in Makefile bomb-${PORTVERSION}-1.spec
+	${REINPLACE_CMD} -e 's|/usr/lib/bomb|${DATADIR}|;			\
+	s|/home/spot/src/quicktime4linux-1.1.9/quicktime|${LOCALBASE}/lib|;	\
+	s|/usr/X11R6/lib|${X11BASE}/lib -L${LOCALBASE}/lib|;			\
+	s|-lpthread|${PTHREAD_LIBS}|;						\
+	s|/usr/bin/bomb|${PREFIX}/bin/bomb|;					\
+	s|/usr/share/control-center/.data|${DATADIR}/.data|;			\
+	s|install -d $$(DATA_DIR)|install -d ${DATADIR}/.data|;			\
+	s|cp -a suck|${CP} -R suck|;						\
+	s|cp -a|${INSTALL_DATA}|' ${WRKSRC}/${fi}
 .endfor
-	${ECHO_CMD} "@dirrm "${DOCDIR} >> ${PLIST}
-.endif
-	${ECHO_CMD} "@dirrm "${DATADIR}/suck >> ${PLIST}
-	${ECHO_CMD} "@dirrm "${DATADIR} >> ${PLIST}
 
-do-build:
-.for i in ${SRCS}
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_DIR=\"${PREFIX}/${DATADIR}\" \
-		-L${X11BASE}/lib \
-		-I${X11BASE}/include \
-		-L${LOCALBASE}/lib \
-		-I${LOCALBASE}/include -c ${i}.c
-.endfor
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -o bomb ${OBJS} -lX11 -lvga -lm -ltiff \
-		-L${LOCALBASE}/lib -L${X11BASE}/lib
-
-do-install:
-	${MKDIR} ${PREFIX}/${DATADIR}
-	cd ${WRKSRC} && ${PAX} -r -w *-data suck title.tif ${PREFIX}/${DATADIR}
-	${INSTALL} -c -g wheel -o root -m 4755 ${WRKSRC}/bomb ${PREFIX}/bin
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/bomb/distinfo b/games/bomb/distinfo
index da692de91f7b..d5ca840a457b 100644
--- a/games/bomb/distinfo
+++ b/games/bomb/distinfo
@@ -1,2 +1,2 @@
-MD5 (bomb.tar.gz) = 646bd56aa5d43d62990fb4bf2115b950
-SIZE (bomb.tar.gz) = 4038347
+MD5 (bomb-1.26.tar.gz) = 5406b3b2b2ba725745ef09275d5b2395
+SIZE (bomb-1.26.tar.gz) = 3219508
diff --git a/games/bomb/files/patch-defs.h b/games/bomb/files/patch-defs.h
new file mode 100644
index 000000000000..2bb76c6acabf
--- /dev/null
+++ b/games/bomb/files/patch-defs.h
@@ -0,0 +1,11 @@
+--- defs.h.orig	Tue Apr 18 03:37:05 2000
++++ defs.h	Wed May 18 23:19:55 2005
+@@ -41,7 +41,7 @@
+ #endif
+ 
+ #if use_quicktime
+-#include "quicktime.h"
++#include "lqt/quicktime.h"
+ extern quicktime_t *qt_file;
+ extern int use_jpeg;
+ #endif
diff --git a/games/bomb/pkg-plist b/games/bomb/pkg-plist
new file mode 100644
index 000000000000..9746407d2f6a
--- /dev/null
+++ b/games/bomb/pkg-plist
@@ -0,0 +1,213 @@
+bin/bomb
+%%DATADIR%%/.data/Bomb.desktop
+%%DATADIR%%/.data/bomb.png
+%%DATADIR%%/cmap-data
+%%DATADIR%%/flame-data
+%%DATADIR%%/manual.txt
+%%DATADIR%%/seq-data
+%%DATADIR%%/suck/1-gorgon
+%%DATADIR%%/suck/1-hindu-mark
+%%DATADIR%%/suck/14-families-pueblo
+%%DATADIR%%/suck/1mexbird
+%%DATADIR%%/suck/2
+%%DATADIR%%/suck/2-gorgon
+%%DATADIR%%/suck/2-hindu-mark
+%%DATADIR%%/suck/27tapa
+%%DATADIR%%/suck/2eagle
+%%DATADIR%%/suck/2flower
+%%DATADIR%%/suck/2mexbird
+%%DATADIR%%/suck/2tapa
+%%DATADIR%%/suck/3-gorgon
+%%DATADIR%%/suck/3curl
+%%DATADIR%%/suck/3cusp
+%%DATADIR%%/suck/3legs
+%%DATADIR%%/suck/3rd-eye
+%%DATADIR%%/suck/4-hindu-mark
+%%DATADIR%%/suck/47-1
+%%DATADIR%%/suck/47-2
+%%DATADIR%%/suck/47-3
+%%DATADIR%%/suck/47-4
+%%DATADIR%%/suck/47-5
+%%DATADIR%%/suck/5-hindu-mark
+%%DATADIR%%/suck/52tapa
+%%DATADIR%%/suck/68tapa
+%%DATADIR%%/suck/6knots
+%%DATADIR%%/suck/6tapa
+%%DATADIR%%/suck/7tapa
+%%DATADIR%%/suck/A
+%%DATADIR%%/suck/E
+%%DATADIR%%/suck/EM-52
+%%DATADIR%%/suck/EM-Nelson-60
+%%DATADIR%%/suck/EM-Nelson-61
+%%DATADIR%%/suck/EM-Nelson-62
+%%DATADIR%%/suck/EM-XI-Pastolik
+%%DATADIR%%/suck/IP-147
+%%DATADIR%%/suck/IP-97
+%%DATADIR%%/suck/N
+%%DATADIR%%/suck/O
+%%DATADIR%%/suck/Rx
+%%DATADIR%%/suck/X
+%%DATADIR%%/suck/Z
+%%DATADIR%%/suck/acoma
+%%DATADIR%%/suck/alligator
+%%DATADIR%%/suck/anchor
+%%DATADIR%%/suck/arabic
+%%DATADIR%%/suck/att
+%%DATADIR%%/suck/bad-shaman-EM-49
+%%DATADIR%%/suck/bali
+%%DATADIR%%/suck/bang
+%%DATADIR%%/suck/bike
+%%DATADIR%%/suck/biohazard
+%%DATADIR%%/suck/bird-IC-29
+%%DATADIR%%/suck/blotter
+%%DATADIR%%/suck/bolt
+%%DATADIR%%/suck/bordercurl
+%%DATADIR%%/suck/bottony
+%%DATADIR%%/suck/calendar
+%%DATADIR%%/suck/cameroons-TM-41
+%%DATADIR%%/suck/cancer
+%%DATADIR%%/suck/cell-phone
+%%DATADIR%%/suck/chilkat
+%%DATADIR%%/suck/circle-within-square
+%%DATADIR%%/suck/coyolxauhqui
+%%DATADIR%%/suck/cunieform
+%%DATADIR%%/suck/david
+%%DATADIR%%/suck/death
+%%DATADIR%%/suck/deer
+%%DATADIR%%/suck/dex
+%%DATADIR%%/suck/dickson
+%%DATADIR%%/suck/dog
+%%DATADIR%%/suck/dou-710
+%%DATADIR%%/suck/dragon
+%%DATADIR%%/suck/dung-beetles
+%%DATADIR%%/suck/eagle
+%%DATADIR%%/suck/eskimo-24
+%%DATADIR%%/suck/eskimo-X
+%%DATADIR%%/suck/eskimo-masks-AC
+%%DATADIR%%/suck/ex
+%%DATADIR%%/suck/eye
+%%DATADIR%%/suck/eye1
+%%DATADIR%%/suck/eye2
+%%DATADIR%%/suck/fall-of-man
+%%DATADIR%%/suck/female
+%%DATADIR%%/suck/fireman-TM-3
+%%DATADIR%%/suck/flint
+%%DATADIR%%/suck/flower
+%%DATADIR%%/suck/flower2
+%%DATADIR%%/suck/flower3
+%%DATADIR%%/suck/flower4
+%%DATADIR%%/suck/food
+%%DATADIR%%/suck/frop
+%%DATADIR%%/suck/frown
+%%DATADIR%%/suck/george-eye
+%%DATADIR%%/suck/german
+%%DATADIR%%/suck/goat-IC-73
+%%DATADIR%%/suck/gorgon-horse
+%%DATADIR%%/suck/grass
+%%DATADIR%%/suck/head
+%%DATADIR%%/suck/hebrew
+%%DATADIR%%/suck/hieroglyphs
+%%DATADIR%%/suck/homunculus
+%%DATADIR%%/suck/hou-352
+%%DATADIR%%/suck/house
+%%DATADIR%%/suck/import-interest
+%%DATADIR%%/suck/iranian-ceramics
+%%DATADIR%%/suck/ivory-coast-TM-4
+%%DATADIR%%/suck/jaguar
+%%DATADIR%%/suck/jle
+%%DATADIR%%/suck/jm
+%%DATADIR%%/suck/jolly-roger
+%%DATADIR%%/suck/jou-819
+%%DATADIR%%/suck/jre
+%%DATADIR%%/suck/kai-1651
+%%DATADIR%%/suck/kali
+%%DATADIR%%/suck/kan-1844
+%%DATADIR%%/suck/kei-94
+%%DATADIR%%/suck/keyboard
+%%DATADIR%%/suck/lamb
+%%DATADIR%%/suck/leaf
+%%DATADIR%%/suck/life
+%%DATADIR%%/suck/lizard
+%%DATADIR%%/suck/malachi
+%%DATADIR%%/suck/male
+%%DATADIR%%/suck/mask1
+%%DATADIR%%/suck/mask2
+%%DATADIR%%/suck/mask3
+%%DATADIR%%/suck/mask4
+%%DATADIR%%/suck/mask5
+%%DATADIR%%/suck/mask6
+%%DATADIR%%/suck/mask7
+%%DATADIR%%/suck/mdcclxxvi
+%%DATADIR%%/suck/mexhand
+%%DATADIR%%/suck/money
+%%DATADIR%%/suck/monkey
+%%DATADIR%%/suck/movement
+%%DATADIR%%/suck/mummy-217
+%%DATADIR%%/suck/nahum
+%%DATADIR%%/suck/necropolis
+%%DATADIR%%/suck/nou-1019
+%%DATADIR%%/suck/om
+%%DATADIR%%/suck/omega-psi
+%%DATADIR%%/suck/out-of-control
+%%DATADIR%%/suck/panamaman
+%%DATADIR%%/suck/papal
+%%DATADIR%%/suck/parental-advisory
+%%DATADIR%%/suck/patee
+%%DATADIR%%/suck/percent
+%%DATADIR%%/suck/pierced-heart
+%%DATADIR%%/suck/pink
+%%DATADIR%%/suck/pomegranate
+%%DATADIR%%/suck/poppy
+%%DATADIR%%/suck/questionmark
+%%DATADIR%%/suck/rabbit
+%%DATADIR%%/suck/radioactive
+%%DATADIR%%/suck/rain
+%%DATADIR%%/suck/rc
+%%DATADIR%%/suck/reed
+%%DATADIR%%/suck/ren-699
+%%DATADIR%%/suck/row-of-flint-knives
+%%DATADIR%%/suck/santafe
+%%DATADIR%%/suck/schwa
+%%DATADIR%%/suck/scott-mccloud
+%%DATADIR%%/suck/screen
+%%DATADIR%%/suck/seed
+%%DATADIR%%/suck/serpent
+%%DATADIR%%/suck/sex
+%%DATADIR%%/suck/signal-noise
+%%DATADIR%%/suck/sle
+%%DATADIR%%/suck/sm
+%%DATADIR%%/suck/small-toad
+%%DATADIR%%/suck/smile
+%%DATADIR%%/suck/soma
+%%DATADIR%%/suck/sou-796
+%%DATADIR%%/suck/spice
+%%DATADIR%%/suck/spread-of-sin
+%%DATADIR%%/suck/squareknotwork
+%%DATADIR%%/suck/sre
+%%DATADIR%%/suck/straight
+%%DATADIR%%/suck/syn
+%%DATADIR%%/suck/syringe
+%%DATADIR%%/suck/the-great-seal
+%%DATADIR%%/suck/three-fishes
+%%DATADIR%%/suck/tile
+%%DATADIR%%/suck/tm
+%%DATADIR%%/suck/toke
+%%DATADIR%%/suck/trebleclef
+%%DATADIR%%/suck/trefoil
+%%DATADIR%%/suck/tusks-TM-10
+%%DATADIR%%/suck/vaulture
+%%DATADIR%%/suck/victory
+%%DATADIR%%/suck/virus
+%%DATADIR%%/suck/washington
+%%DATADIR%%/suck/water
+%%DATADIR%%/suck/wheel
+%%DATADIR%%/suck/wind
+%%DATADIR%%/suck/witch-doctor-TM-11
+%%DATADIR%%/suck/write
+%%DATADIR%%/suck/ying-yang
+%%DATADIR%%/suck/yugung
+%%DATADIR%%/suck/zaphaniah
+%%DATADIR%%/title.gif
+@dirrm %%DATADIR%%/suck
+@dirrm %%DATADIR%%/.data
+@dirrm %%DATADIR%%