[Midnightbsd-cvs] mports [19406] trunk/print/libgnomeprint: fixup build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 9 20:53:08 EDT 2015 

Revision: 19406
          http://svnweb.midnightbsd.org/mports/?rev=19406
Author:   laffer1
Date:     2015-06-09 20:53:08 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
fixup build

Modified Paths:
--------------
    trunk/print/libgnomeprint/Makefile
    trunk/print/libgnomeprint/pkg-plist

Added Paths:
-----------
    trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c
    trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c
    trunk/print/libgnomeprint/files/patch-libgnomeprint_grammar.y

Modified: trunk/print/libgnomeprint/Makefile
===================================================================
--- trunk/print/libgnomeprint/Makefile	2015-06-10 00:50:26 UTC (rev 19405)
+++ trunk/print/libgnomeprint/Makefile	2015-06-10 00:53:08 UTC (rev 19406)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.18.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,29 +15,26 @@
 
 .if !defined(REFERENCE_PORT)
 
-OPTIONS=	CUPS "Enable CUPS printing system" on
+LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		popt.0:${PORTSDIR}/devel/popt
-
-USE_BISON=	build
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
-		libartlgpl2 ltverhack
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
+USE_GNOME=	gnomeprefix intlhack glib20 pango libxml2 libartlgpl2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		LIBVERSION=2.2
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	CUPS
+OPTIONS_DEFAULT=CUPS
 
-.if defined(WITH_CUPS)
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=	--with-cups
-LIB_DEPENDS+=		gnomecups-1.0:${PORTSDIR}/print/libgnomecups
+LIB_DEPENDS+=		libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups
 PLIST_SUB+=		CUPS:=""
 .else
 CONFIGURE_ARGS+=	--without-cups
@@ -45,8 +42,6 @@
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|<malloc[.]h>|<stdlib.h>|'
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s|tests||" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s|doc||" ${WRKSRC}/Makefile.in
 
@@ -53,7 +48,10 @@
 post-install:
 	@${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts
 	@${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
+	@${STRIP_CMD} ${PREFIX}/lib/libgnomeprint-2-2.so.0
+	@${STRIP_CMD} ${PREFIX}/lib/libgnomeprint/2.18.8/modules/*.so
+	@${STRIP_CMD} ${PREFIX}/lib/libgnomeprint/2.18.8/modules/*/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif

Added: trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c
===================================================================
--- trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c	                        (rev 0)
+++ trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c	2015-06-10 00:53:08 UTC (rev 19406)
@@ -0,0 +1,12 @@
+--- libgnomeprint/gnome-font-face.c.orig	2013-12-06 19:26:26.000000000 +0100
++++ libgnomeprint/gnome-font-face.c	2013-12-06 19:27:43.000000000 +0100
+@@ -36,7 +36,8 @@
+ #include <stdarg.h>
+ #include <locale.h>
+ 
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
+ 
+ #include <libgnomeprint/gnome-print-private.h>
+ #include <libgnomeprint/gnome-font-private.h>


Property changes on: trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c
===================================================================
--- trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c	                        (rev 0)
+++ trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c	2015-06-10 00:53:08 UTC (rev 19406)
@@ -0,0 +1,14 @@
+--- libgnomeprint/gnome-rfont.c.orig	2013-12-06 19:28:40.000000000 +0100
++++ libgnomeprint/gnome-rfont.c	2013-12-06 19:29:56.000000000 +0100
+@@ -27,9 +27,8 @@
+ #include <string.h>
+ 
+ #include <ft2build.h>
+-#include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftbbox.h>
++#include FT_GLYPH_H
++#include FT_BBOX_H
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_affine.h>
+ #include <libart_lgpl/art_vpath.h>


Property changes on: trunk/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/libgnomeprint/files/patch-libgnomeprint_grammar.y
===================================================================
--- trunk/print/libgnomeprint/files/patch-libgnomeprint_grammar.y	                        (rev 0)
+++ trunk/print/libgnomeprint/files/patch-libgnomeprint_grammar.y	2015-06-10 00:53:08 UTC (rev 19406)
@@ -0,0 +1,37 @@
+--- libgnomeprint/grammar.y.orig	2010-02-09 12:32:51 UTC
++++ libgnomeprint/grammar.y
+@@ -6,8 +6,6 @@
+ #include <libgnomeprint/types.h>
+ #include <libgnomeprint/gnome-print-filter.h>
+ 
+-#define YYPARSE_PARAM graph
+-
+ static void
+ set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
+ {
+@@ -99,7 +97,7 @@ gnome_print_filter_parse_prop (GnomePrin
+ }
+ 
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *g, const char *s);
+ %}
+ 
+ %union {
+@@ -117,6 +115,7 @@ static int yyerror (const char *s);
+ %type <p> pool
+ 
+ %pure_parser
++%parse-param { graph_t *graph }
+ 
+ %start graph
+ %%
+@@ -185,7 +184,7 @@ graph: filter {
+ %%
+ 
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *g, const char *s)
+ {
+ 	return -1;
+ }


Property changes on: trunk/print/libgnomeprint/files/patch-libgnomeprint_grammar.y
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/libgnomeprint/pkg-plist
===================================================================
--- trunk/print/libgnomeprint/pkg-plist	2015-06-10 00:50:26 UTC (rev 19405)
+++ trunk/print/libgnomeprint/pkg-plist	2015-06-10 00:53:08 UTC (rev 19406)
@@ -39,6 +39,7 @@
 lib/libgnomeprint-2-2.la
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.0
+lib/libgnomeprint-2-2.so.0.1.0
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.a
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.la
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.so
@@ -177,57 +178,3 @@
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
- at dirrm %%DATADIR%%/%%VERSION%%/printers/uninstalled
- at dirrm %%DATADIR%%/%%VERSION%%/printers
- at dirrm %%DATADIR%%/%%VERSION%%/models/uninstalled
- at dirrm %%DATADIR%%/%%VERSION%%/models
- at dirrm %%DATADIR%%/%%VERSION%%
- at dirrm %%DATADIR%%
- at dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
- at dirrm lib/libgnomeprint/%%VERSION%%/modules/filters
- at dirrm lib/libgnomeprint/%%VERSION%%/modules
- at dirrm lib/libgnomeprint/%%VERSION%%
- at dirrm lib/libgnomeprint
- at dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private
- at dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint
- at dirrm include/libgnomeprint-%%LIBVERSION%%
- at dirrm etc/gnome/libgnomeprint-2.0/fonts
- at dirrm etc/gnome/libgnomeprint-2.0
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/si/LC_MESSAGES
- at dirrmtry share/locale/si
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/ps/LC_MESSAGES
- at dirrmtry share/locale/ps
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/nds/LC_MESSAGES
- at dirrmtry share/locale/nds
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/ky/LC_MESSAGES
- at dirrmtry share/locale/ky
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as

More information about the Midnightbsd-cvs mailing list