ports/151228: [PATCH] devel/librcc: optionalize gtk1/2, fix plist

[Dmitry Marakasov]

>Number:         151228
>Category:       ports
>Synopsis:       [PATCH] devel/librcc: optionalize gtk1/2, fix plist
>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:   Tue Oct 05 14:00:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Fri Jul 30 02:50:28 MSD 2010
>Description:
librcc has incorrect plist when built without GTK2:

http://people.freebsd.org/~amdmi3/librcc-nogtk2-0.2.9_4.log

Fix that, and also, make both gtk1 and gtk2 optional.

Port maintainer (fluffy at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- librcc-0.2.9_5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/librcc/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	15 Sep 2010 18:34:12 -0000	1.9
+++ Makefile	5 Oct 2010 11:54:13 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	librcc
 PORTVERSION=	0.2.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION} \
 		http://dside.dyndns.org/files/rusxmms/
@@ -21,7 +21,7 @@
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack lthack libxml2 glib12 gtk12
+USE_GNOME=	gnomehack lthack libxml2
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
@@ -30,9 +30,14 @@
 CPPFLAGS=	-I${LOCALBASE}/include
 LIBS=		-L${LOCALBASE}/lib
 
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LIBS="${LIBS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 OPTIONS=	BDB "Translation database support" off \
 		TRANSLATE "Online translation support" off \
 		TOOLS "Install recode configuration utility" on \
+		GTK1 "Use Gtk1 library/frontend" on \
 		GTK2 "Use Gtk2 library/frontend" on
 
 .include <bsd.port.options.mk>
@@ -53,11 +58,19 @@
 CONFIGURE_ARGS+=--disable-libtranslate
 .endif
 
+.if defined(WITH_GTK1)
+USE_GNOME+=	glib12 gtk12
+PLIST_SUB+=	WITH_GTK1=""
+.else
+CONFIGURE_ENV+=	ac_cv_path_GTK_CONFIG=no GTK_CONFIG=no
+PLIST_SUB+=	WITH_GTK1="@comment "
+.endif
+
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
-CONFIGURE_ARGS+=--disable-glib1 --disable-gtk1
+CONFIGURE_ARGS+=--disable-glib2 --disable-gtk2
 PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
@@ -68,10 +81,6 @@
 PLIST_SUB+=	TOOLS="@comment "
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LIBS="${LIBS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
 pre-everything::
 .if ${ARCH} == "i386"
 .if defined(WITH_BDB) || defined (WITH_TRANSLATE)
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/librcc/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	15 Jan 2010 12:52:56 -0000	1.3
+++ pkg-plist	4 Oct 2010 01:25:10 -0000
@@ -1,4 +1,4 @@
-%%TOOLS%%bin/rcc-gtk-config
+%%TOOLS%%%%WITH_GTK1%%bin/rcc-gtk-config
 %%TOOLS%%%%WITH_GTK2%%bin/rcc-gtk2-config
 include/librcc.h
 include/librccui.h
@@ -6,10 +6,10 @@
 lib/librcc.la
 lib/librcc.so
 lib/librcc.so.2
-lib/librccgtk.a
-lib/librccgtk.la
-lib/librccgtk.so
-lib/librccgtk.so.2
+%%WITH_GTK1%%lib/librccgtk.a
+%%WITH_GTK1%%lib/librccgtk.la
+%%WITH_GTK1%%lib/librccgtk.so
+%%WITH_GTK1%%lib/librccgtk.so.2
 %%WITH_GTK2%%lib/librccgtk2.a
 %%WITH_GTK2%%lib/librccgtk2.la
 %%WITH_GTK2%%lib/librccgtk2.so
@@ -24,6 +24,6 @@
 lib/rcc/engines/western_engine.a
 lib/rcc/engines/western_engine.la
 lib/rcc/engines/western_engine.so
-lib/rcc/rccexternal
+%%WITH_GTK2%%lib/rcc/rccexternal
 @dirrm lib/rcc/engines
 @dirrm lib/rcc
--- librcc-0.2.9_5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: