5 files changed, 46 insertions, 25 deletions

diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index aac499d75afd..dce43f5547fe 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -6,21 +6,52 @@
 #
 
 PORTNAME=	cingb
-PORTVERSION=	0.22A
+PORTVERSION=	0.28
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	yet another Nintendo GameBoy(tm) emulator
+COMMENT=	Yet another Nintendo GameBoy(tm) emulator
 
-WRKSRC=		${WRKDIR}/cingb
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	standard
 
+CPPFLAGS=	${PTHREAD_CFLAGS}
+LDFLAGS=	${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "sparc64" && ${ARCH} != "powerpc"
+CPPFLAGS+=	-DUSE_LITTLE_ENDIAN
+.endif
+
+do-configure:
+	cd ${WRKSRC} && ${SED} -e \
+		's|gcc|$${CC}|g ; \
+		 s|/usr/X11R6|$${X11BASE}|g ; \
+		 s|-O6|$${CFLAGS}|g ; \
+		 s|%%%endian%%%|$${CPPFLAGS}|g ; \
+		 s|%%%pthread%%%|$${LDFLAGS}|g ; \
+		 s|%%%libext%%%|-lXext|g ; \
+		 s|%%%libsocket%%%||g ; \
+		 s|%%%libnsl%%%||g ; \
+		 s|%%%joystick%%%|-DBSD_JOYSTICK|g ; \
+		 s|%%%framebuffer%%%||g ; \
+		 s|%%%mitshm%%%|-DMIT_SHM|g ; \
+		 s|%%%sound%%%|-DSOUND|g ; \
+		 s|%%%joyconf%%%|conf|g' < Makefile.templ > Makefile
+
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/cingb ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cingb ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cingb_conf ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.FAQ ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/cingb/distinfo b/emulators/cingb/distinfo
index 73b67c924f07..19fbcdf3f689 100644
--- a/emulators/cingb/distinfo
+++ b/emulators/cingb/distinfo
@@ -1 +1 @@
-MD5 (cingb-0.22A.tar.gz) = 9e29a3f91370855914c6f4732ec84b73
+MD5 (cingb-0.28.tar.gz) = 184e10f742c64cc2ccb106429659bc6a
diff --git a/emulators/cingb/files/patch-aa b/emulators/cingb/files/patch-aa
deleted file mode 100644
index cd90885ac677..000000000000
--- a/emulators/cingb/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.templ.orig	Thu Apr 19 21:04:46 2001
-+++ Makefile.templ	Thu Apr 19 21:05:37 2001
-@@ -16,7 +16,7 @@
- 
- # unix dependent
- 
--INCPATH                 = -I/usr/include/glide
-+INCPATH                 = -I/usr/X11R6/include -I/usr/local/include
- LIBPATH 		= -L/usr/X11R6/lib
- 
- LIBS 			= -lX11 %%%libext%%% %%%libsocket%%% %%%libnsl%%%
-@@ -91,4 +91,4 @@
- 
- arplay.c: globals.h arplay.h
- 
--main.c:     globals.h z80.h gameboy.h 
-+main.c:     globals.h z80.h gameboy.h 
diff --git a/emulators/cingb/pkg-descr b/emulators/cingb/pkg-descr
index 336b9b9109a8..622d7f15c009 100644
--- a/emulators/cingb/pkg-descr
+++ b/emulators/cingb/pkg-descr
@@ -1,3 +1,6 @@
-yet another Nintendo GameBoy(tm) emulator
+cingb is an ATTEMPT to write a Gameboy-emulator for all kinds of platforms.
+It plays Gameboy and Gameboy Color ROMs, includes a debugger for step-by-step
+analysis of Gameboy programs and might be also interesting for educational
+purposes.
 
 WWW: http://cingb.sourceforge.net/
diff --git a/emulators/cingb/pkg-plist b/emulators/cingb/pkg-plist
index 40a4ccefa777..b2676a1b79bb 100644
--- a/emulators/cingb/pkg-plist
+++ b/emulators/cingb/pkg-plist
@@ -1 +1,5 @@
 bin/cingb
+bin/cingb_conf
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FAQ
+%%PORTDOCS%%@dirrm %%DOCSDIR%%