svn commit: r344163 - head/devel/librcc
Dima Panov
fluffy at FreeBSD.org
Fri Feb 14 06:21:54 UTC 2014
Author: fluffy
Date: Fri Feb 14 06:21:53 2014
New Revision: 344163
URL: http://svnweb.freebsd.org/changeset/ports/344163
QAT: https://qat.redports.org/buildarchive/r344163/
Log:
- Remove USE_GNOME=lthack. Not needed, the bundled libtool is the latest version.
- Remove USE_AUTOTOOLS=autoheader. Doesn't make any difference.
- Add USES=libtool:oldver.
- Replace LIBS with LDFLAGS.
- Use option helpers.
- Add --enable-force-system-iconv on FreeBSD 10 to prevent detection of converters/libiconv.
PR: 186732
Submitted by: tijl
Modified:
head/devel/librcc/Makefile
head/devel/librcc/pkg-plist
Modified: head/devel/librcc/Makefile
==============================================================================
--- head/devel/librcc/Makefile Fri Feb 14 05:30:34 2014 (r344162)
+++ head/devel/librcc/Makefile Fri Feb 14 06:21:53 2014 (r344163)
@@ -3,6 +3,7 @@
PORTNAME= librcc
PORTVERSION= 0.2.12
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \
LOCAL/fluffy
@@ -16,64 +17,43 @@ LIB_DEPENDS= librcd.so:${PORTSDIR}/devel
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GNOME= lthack libxml2
-USES= gmake iconv pathfix pkgconfig
+USE_GNOME= libxml2
+USES= gmake iconv libtool:oldver pathfix pkgconfig
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoheader
CPPFLAGS+= -I${LOCALBASE}/include
-LIBS= -L${LOCALBASE}/lib
-
-CONFIGURE_ENV= LIBS="${LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= BDB TRANSLATE TOOLS GTK1 GTK2 GTK3
-BDB_DESC= Translation database support
-TRANSLATE_DESC= Online translation support
-TOOLS_DESC= Recode configuration utility
-
-OPTIONS_DEFAULT= TOOLS GTK2
-
-#NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB= 41+
-CPPFLAGS+= -I${BDB_INCLUDE_DIR}
-LIBS+= -L${BDB_LIB_DIR}
-CONFIGURE_ARGS+=--enable-bdb
-.else
-CONFIGURE_ARGS+=--disable-bdb
-.endif
+OPTIONS_DEFAULT=TOOLS GTK2
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MTRANSLATE}
-LIB_DEPENDS+= translate.0:${PORTSDIR}/textproc/libtranslate
-CONFIGURE_ARGS+=--enable-libtranslate
-.else
-CONFIGURE_ARGS+=--disable-libtranslate
-.endif
+BDB_DESC= Translation database support
+BDB_CONFIGURE_ENABLE= bdb
+BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR}
+BDB_LDFLAGS= -L${BDB_LIB_DIR}
+BDB_USE= BDB=41+
-.if ${PORT_OPTIONS:MGTK1}
-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
+TRANSLATE_DESC= Online translation support
+TRANSLATE_CONFIGURE_ENABLE= libtranslate
+TRANSLATE_LIB_DEPENDS= libtranslate.so:${PORTSDIR}/textproc/libtranslate
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+= gtk20
-PLIST_SUB+= WITH_GTK2=""
-.else
-CONFIGURE_ARGS+=--disable-gtk2
-PLIST_SUB+= WITH_GTK2="@comment "
-.endif
+TOOLS_DESC= Recode configuration utility
+TOOLS_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc-config
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+= gtk30
-PLIST_SUB+= WITH_GTK3=""
-.else
-CONFIGURE_ARGS+=--disable-gtk3
-PLIST_SUB+= WITH_GTK3="@comment "
+GTK1_CONFIGURE_ENABLE= gtk1
+GTK1_USE= GNOME=glib12,gtk12
+
+GTK2_CONFIGURE_ENABLE= gtk2
+GTK2_USE= GNOME=gtk20
+
+GTK3_CONFIGURE_ENABLE= gtk3
+GTK3_USE= GNOME=gtk30
+
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=--enable-force-system-iconv
.endif
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
@@ -84,13 +64,6 @@ CONFIGURE_ARGS+=--disable-glib2
PLIST_SUB+= WITH_GLIB2="@comment "
.endif
-.if ${PORT_OPTIONS:MTOOLS}
-EXTRA_PATCHES+= ${FILESDIR}/extrapatch-rcc-config
-PLIST_SUB+= TOOLS=""
-.else
-PLIST_SUB+= TOOLS="@comment "
-.endif
-
pre-everything::
.if ${ARCH} == "i386"
.if ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MTRANSLATE}
@@ -103,4 +76,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
${WRKSRC}/external/rccexternal.c
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/devel/librcc/pkg-plist
==============================================================================
--- head/devel/librcc/pkg-plist Fri Feb 14 05:30:34 2014 (r344162)
+++ head/devel/librcc/pkg-plist Fri Feb 14 06:21:53 2014 (r344163)
@@ -1,24 +1,24 @@
-%%TOOLS%%%%WITH_GTK1%%bin/rcc-gtk-config
-%%TOOLS%%%%WITH_GTK2%%bin/rcc-gtk2-config
-%%TOOLS%%%%WITH_GTK3%%bin/rcc-gtk3-config
+%%TOOLS%%%%GTK1%%bin/rcc-gtk-config
+%%TOOLS%%%%GTK2%%bin/rcc-gtk2-config
+%%TOOLS%%%%GTK3%%bin/rcc-gtk3-config
include/librcc.h
include/librccui.h
lib/librcc.a
lib/librcc.la
lib/librcc.so
lib/librcc.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
-%%WITH_GTK2%%lib/librccgtk2.so.2
-%%WITH_GTK3%%lib/librccgtk3.a
-%%WITH_GTK3%%lib/librccgtk3.la
-%%WITH_GTK3%%lib/librccgtk3.so
-%%WITH_GTK3%%lib/librccgtk3.so.2
+%%GTK1%%lib/librccgtk.a
+%%GTK1%%lib/librccgtk.la
+%%GTK1%%lib/librccgtk.so
+%%GTK1%%lib/librccgtk.so.2
+%%GTK2%%lib/librccgtk2.a
+%%GTK2%%lib/librccgtk2.la
+%%GTK2%%lib/librccgtk2.so
+%%GTK2%%lib/librccgtk2.so.2
+%%GTK3%%lib/librccgtk3.a
+%%GTK3%%lib/librccgtk3.la
+%%GTK3%%lib/librccgtk3.so
+%%GTK3%%lib/librccgtk3.so.2
lib/librccui.a
lib/librccui.la
lib/librccui.so
More information about the svn-ports-all
mailing list