Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.213 retrieving revision 1.219 diff -u -p -r1.213 -r1.219 --- pkgsrc/devel/glib2/Makefile 2013/04/19 22:21:41 1.213 +++ pkgsrc/devel/glib2/Makefile 2014/05/29 23:35:35 1.219 @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.213 2013/04/19 22:21:41 prlw1 Exp $ +# $NetBSD: Makefile,v 1.219 2014/05/29 23:35:35 wiz Exp $ .include "Makefile.common" -CATEGORIES= devel +CATEGORIES= devel gnome +PKGREVISION= 2 COMMENT= Some useful routines for C programming (glib2) -USE_TOOLS+= msgfmt perl:run +USE_TOOLS+= msgfmt perl:run readlink PKGCONFIG_OVERRIDE+= glib-2.0.pc.in PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in @@ -42,16 +43,16 @@ LIBS.SunOS+= -lnsl -lsocket CPPFLAGS.SunOS+= -DBSD_COMP .if ${OBJECT_FMT} == "ELF" -. if ${OPSYS} == "SunOS" -. if ${ABI} == 32 +. if ${OPSYS} == "SunOS" +. if ${ABI} == 32 # Solaris libelf in 32-bit mode does not support largefile. We patch files # individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf # after configure disabled it. CONFIGURE_ENV+= LIBELF_LIBS='-lelf' +. endif +. else +. include "../../devel/libelf/buildlink3.mk" . endif -. else -.include "../../devel/libelf/buildlink3.mk" -. endif .endif .include "../../converters/libiconv/buildlink3.mk"