ports/153880: [french/verbiste] Patch to fix current build errors
Dereckson
dereckson at gmail.com
Tue Jan 11 02:10:10 UTC 2011
>Number: 153880
>Category: ports
>Synopsis: [french/verbiste] Patch to fix current build errors
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 11 02:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Dereckson
>Release: 8.1-RELEASE
>Organization:
>Environment:
FreeBSD grip.espace-win.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This patch fixes the build errors from the following pointyhat build logs:
- http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/a.7.20101225094348/fr-verbiste-0.1.32.log
- http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/a.8.20101224105134/fr-verbiste-0.1.32.log
The port is rollbacked to its 0.1.31 state, and then had the following changes:
* update to i0.1.32
* New dependency: p5-XML-Parser dependency.
It so cancels temporarily the naddy's December work on this port, to make the port buildable again, the time he fixes the issues.
This patch include a new file, files/patch-configure, deleted in previous commit.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN verbiste.orig/Makefile verbiste/Makefile
--- verbiste.orig/Makefile 2010-12-22 22:02:07.000000000 +0100
+++ verbiste/Makefile 2011-01-11 03:03:21.000000000 +0100
@@ -2,59 +2,49 @@
# Date created: 16 November 2005
# Whom: Dan Phillips <dan-ports at dp.id.au>
#
-# $FreeBSD: ports/french/verbiste/Makefile,v 1.20 2010/12/22 21:02:07 naddy Exp $
+# $FreeBSD$
#
PORTNAME= verbiste
PORTVERSION= 0.1.32
+PORTREVISION= 1
CATEGORIES= french textproc
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/
MAINTAINER= dereckson at gmail.com
COMMENT= French verb conjugator/deconjugator
-OPTIONS= GTK "With GTK+ application" no \
- GNOME "With GNOME application" no
+BUILD_DEPENDS= p5-XML-Parser>=1:${PORTSDIR}/textproc/p5-XML-Parser
+
+USE_GETTEXT= yes
+USE_GNOME= gnomehack ltverhack libxml2
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool
LICENSE= GPLv2
-USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack ltverhack libxml2
-USE_ICONV= yes
-USE_LDCONFIG= yes
+OPTIONS= GNOMEGUI "With gnome gui" no
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAN1= french-conjugator.1 french-deconjugator.1
-MAN3= verbiste.3
-MANLANG= "" fr
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+=--with-gtk-app
-USE_GNOME+= gtk20
-PLIST_SUB+= HASGTK=""
-.else
-PLIST_SUB+= HASGTK="@comment "
-.endif
-
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--with-gnome-app
+.if defined(WITH_GNOMEGUI)
+CONFIGURE_ARGS= --with-gnome-app
USE_GNOME+= gnomeprefix libgnomeui
-PLIST_SUB+= HASGNOME=""
+PLIST_SUB= HASGUI=""
.else
-PLIST_SUB+= HASGNOME="@comment "
+PLIST_SUB= HASGUI="@comment "
.endif
-.if defined(WITH_GTK) || defined(WITH_GNOME)
-USE_GETTEXT= yes
-PLIST_SUB+= HASGUI=""
-.else
-PLIST_SUB+= HASGUI="@comment "
-.endif
+.if !defined(PKGNAMEPREFIX)
+
+USE_ICONV= yes
+USE_LDCONFIG= yes
+
+MAN1= french-conjugator.1 french-deconjugator.1
+MAN3= verbiste.3
+MANLANG= "" fr
post-install:
${MKDIR} ${EXAMPLESDIR}
@@ -63,4 +53,6 @@
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
-.include <bsd.port.post.mk>
+.endif
+
+.include <bsd.port.mk>
diff -ruN verbiste.orig/files/patch-Makefile.in verbiste/files/patch-Makefile.in
--- verbiste.orig/files/patch-Makefile.in 2010-12-25 17:28:32.000000000 +0100
+++ verbiste/files/patch-Makefile.in 2011-01-11 01:50:47.000000000 +0100
@@ -1,9 +1,6 @@
-Always skip included intl, otherwise the build fails if gettext isn't
-installed even if we never link against it.
-
---- Makefile.in.orig 2010-12-25 17:22:46.000000000 +0100
-+++ Makefile.in 2010-12-25 17:23:03.000000000 +0100
-@@ -319,7 +319,7 @@ builddir = @builddir@
+--- Makefile.in.orig 2008-02-18 11:57:24.000000000 -0500
++++ Makefile.in 2008-02-18 11:59:05.000000000 -0500
+@@ -264,7 +264,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
# COPYING contains the license; main-window.cpp expects it there.
@@ -12,12 +9,3 @@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
-@@ -351,7 +351,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = intl src po macros $(am__append_1)
-+SUBDIRS = src po macros $(am__append_1)
- libdatadir = $(datadir)/$(PACKAGE)-$(API)
- libdata_DATA = \
- data/conjugation-fr.xml \
diff -ruN verbiste.orig/files/patch-configure verbiste/files/patch-configure
--- verbiste.orig/files/patch-configure 1970-01-01 01:00:00.000000000 +0100
+++ verbiste/files/patch-configure 2011-01-11 01:48:11.000000000 +0100
@@ -0,0 +1,16 @@
+--- configure.orig Thu Aug 2 09:13:16 2007
++++ configure Thu Aug 2 09:14:19 2007
+@@ -26629,12 +26629,11 @@
+ #ifdef __cplusplus
+ "C"
+ #endif
+-const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("") + _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
diff -ruN verbiste.orig/pkg-plist verbiste/pkg-plist
--- verbiste.orig/pkg-plist 2010-12-22 22:02:07.000000000 +0100
+++ verbiste/pkg-plist 2010-09-13 10:39:15.000000000 +0200
@@ -1,7 +1,6 @@
bin/french-conjugator
bin/french-deconjugator
-%%HASGNOME%%bin/verbiste
-%%HASGTK%%bin/verbiste-gtk
+%%HASGUI%%bin/verbiste
include/verbiste-0.1/verbiste/FrenchVerbDictionary.h
include/verbiste-0.1/verbiste/Trie.cpp
include/verbiste-0.1/verbiste/Trie.h
@@ -12,11 +11,8 @@
lib/libverbiste-0.1.so
lib/libverbiste-0.1.so.0
libdata/pkgconfig/verbiste-0.1.pc
-%%HASGNOME%%share/applications/verbiste.desktop
-%%HASGUI%%share/locale/da/LC_MESSAGES/verbiste.mo
-%%HASGUI%%share/locale/de/LC_MESSAGES/verbiste.mo
+%%HASGUI%%share/applications/verbiste.desktop
%%HASGUI%%share/locale/fr/LC_MESSAGES/verbiste.mo
-%%HASGUI%%share/locale/el/LC_MESSAGES/verbiste.mo
%%HASGUI%%share/pixmaps/verbiste.png
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/COPYING
@@ -39,12 +35,6 @@
%%DATADIR%%-0.1/verbs-fr.xml
%%DATADIR%%-0.1/conjugation-it.xml
%%DATADIR%%-0.1/verbs-it.xml
-%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cls
-%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cfg
-%%HASGTK%%@dirrm share/texmf/tex/latex/verbiste
-%%HASGTK%%@dirrmtry share/texmf/tex/latex
-%%HASGTK%%@dirrmtry share/texmf/tex
-%%HASGTK%%@dirrmtry share/texmf
@dirrm %%DATADIR%%-0.1
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list