ports/141813: Update port: converters/gbase

[KATO Tsuguru]

>Number:         141813
>Category:       ports
>Synopsis:       Update port: converters/gbase
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 20 18:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line 
- Add OPTION to build with GTK+-2

Remove file:
files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/converters/gbase/Makefile converters/gbase/Makefile
--- /usr/ports/converters/gbase/Makefile	2008-06-07 00:19:17.000000000 +0900
+++ converters/gbase/Makefile	2009-12-21 02:33:28.000000000 +0900
@@ -7,17 +7,40 @@
 
 PORTNAME=	gbase
 PORTVERSION=	0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters
-MASTER_SITES=	http://www.hibernaculum.net/download/
+MASTER_SITES=	http://www.fluxcode.net/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A program to convert between the 4 common bases used in programming
 
-PLIST_FILES=	bin/gbase
-USE_GNOME=	gtk12
+OPTIONS=	GTK2 "GTK+-2 support" off
+
+USE_GNOME=	pkgconfig
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk12
+GTK_CFLAGS=	`pkg-config --cflags gtk+-2.0`
+GTK_LIBS=	`pkg-config --libs gtk+-2.0`
+.else
+USE_GNOME+=	gtk12
+GTK_CFLAGS=	`pkg-config --cflags gtk+`
+GTK_LIBS=	`pkg-config --libs gtk+`
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|(i == argc)|(i+1 == argc)|' ${WRKSRC}/${PORTNAME}.c
+
+do-build:
+	cd ${WRKSRC}; ${CC} ${CFLAGS} ${GTK_CFLAGS} ${PORTNAME}.c \
+		-o ${PORTNAME} ${GTK_LIBS}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/gbase ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/converters/gbase/files/patch-Makefile converters/gbase/files/patch-Makefile
--- /usr/ports/converters/gbase/files/patch-Makefile	2001-09-09 10:42:22.000000000 +0900
+++ converters/gbase/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,22 +0,0 @@
---- Makefile.orig	Fri Sep  7 22:10:42 2001
-+++ Makefile	Fri Sep  7 22:20:26 2001
-@@ -1,6 +1,7 @@
--CC = gcc
--CCFLAGS = `gtk-config --cflags`
--LDFLAGS = `gtk-config --libs`
-+CFLAGS += `${GTK_CONFIG} --cflags`
-+LDFLAGS = `${GTK_CONFIG} --libs`
-+
-+all: gbase
- 
- gbase:	gbase.o
- 	$(CC) gbase.o $(LDFLAGS) -o gbase
-@@ -10,6 +11,6 @@
- 
- # Make object files:
- %.o:
--	$(CC) $(CCFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) -c $*.c
- 
--gbase.o: gbase.c
-+gbase.o: gbase.c
diff -urN /usr/ports/converters/gbase/pkg-descr converters/gbase/pkg-descr
--- /usr/ports/converters/gbase/pkg-descr	2004-05-30 08:03:53.000000000 +0900
+++ converters/gbase/pkg-descr	2009-12-20 22:46:43.000000000 +0900
@@ -5,4 +5,4 @@
 both signed and unsigned 32-bit integers.
 
 License: Artistic
-WWW: http://www.hibernaculum.net/gbase/
+WWW: http://www.fluxcode.net/
>Release-Note:
>Audit-Trail:
>Unformatted: