Attachment #20116 for bug #35541




#

PORTNAME=	glib
PORTVERSION=	2.0.0
CATEGORIES=	devel

MASTER_SITES=  ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
               ftp://ftp.gimp.org/pub/%SUBDIR%/ \
               ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
               http://www.ameth.org/gimp/%SUBDIR%/ \
               ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} \
	       ftp://ftp.gtk.org/pub/
MASTER_SITE_SUBDIR=    gtk/v${PORTVERSION:R}
DIST_SUBDIR=	gnome2

MAINTAINER=	gnome@FreeBSD.org

BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
		autoconf:${PORTSDIR}/devel/autoconf
LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv \
		intl.1:${PORTSDIR}/devel/gettext
RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig

GNU_CONFIGURE=	yes
INSTALLS_SHLIB=	yes
USE_GMAKE=	yes
USE_AUTOCONF=	yes
AUTOCONF=	autoconf
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib" \
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL} \
		--enable-static=yes

MAN1=		glib-genmarshal.1 glib-mkenums.1


Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7	1	MD5 (gnome2/glib-2.0.0.tar.bz2) = dd9d482ec739a41710080ee136f96444

Lines 1-7 Link Here

(-)pkg-plist (-26 / +28 lines)
1	bin/glib-genmarshal
2	bin/glib-gettextize	1	bin/glib-gettextize
3	bin/glib-mkenums
4	bin/gobject-query	2	bin/gobject-query
		3	bin/glib-genmarshal
		4	bin/glib-mkenums
		5	include/glib-2.0/glibconfig.h
5	include/glib-2.0/glib-object.h	6	include/glib-2.0/glib-object.h
6	include/glib-2.0/glib.h	7	include/glib-2.0/glib.h
7	include/glib-2.0/glib/galloca.h	8	include/glib-2.0/glib/galloca.h
Lines 47-60 Link Here
47	include/glib-2.0/glib/gunicode.h	48	include/glib-2.0/glib/gunicode.h
48	include/glib-2.0/glib/gutils.h	49	include/glib-2.0/glib/gutils.h
49	include/glib-2.0/glib/gwin32.h	50	include/glib-2.0/glib/gwin32.h
50	include/glib-2.0/glibconfig.h
51	include/glib-2.0/gmodule.h
52	include/glib-2.0/gobject/gboxed.h	51	include/glib-2.0/gobject/gboxed.h
53	include/glib-2.0/gobject/gclosure.h	52	include/glib-2.0/gobject/gclosure.h
54	include/glib-2.0/gobject/genums.h	53	include/glib-2.0/gobject/genums.h
55	include/glib-2.0/gobject/gmarshal.h
56	include/glib-2.0/gobject/gobject.h	54	include/glib-2.0/gobject/gobject.h
57	include/glib-2.0/gobject/gobjectnotifyqueue.c
58	include/glib-2.0/gobject/gparam.h	55	include/glib-2.0/gobject/gparam.h
59	include/glib-2.0/gobject/gparamspecs.h	56	include/glib-2.0/gobject/gparamspecs.h
60	include/glib-2.0/gobject/gsignal.h	57	include/glib-2.0/gobject/gsignal.h
Lines 66-93 Link Here
66	include/glib-2.0/gobject/gvaluearray.h	63	include/glib-2.0/gobject/gvaluearray.h
67	include/glib-2.0/gobject/gvaluecollector.h	64	include/glib-2.0/gobject/gvaluecollector.h
68	include/glib-2.0/gobject/gvaluetypes.h	65	include/glib-2.0/gobject/gvaluetypes.h
69	lib/libglib-1.3.a	66	include/glib-2.0/gobject/gobjectnotifyqueue.c
70	lib/libglib-1.3.so	67	include/glib-2.0/gobject/gmarshal.h
71	lib/libglib-1.3.so.14	68	include/glib-2.0/gmodule.h
72	lib/libgmodule-1.3.a	69	lib/libglib-2.0.a
73	lib/libgmodule-1.3.so	70	lib/libglib-2.0.so.0
74	lib/libgmodule-1.3.so.14	71	lib/libglib-2.0.so
75	lib/libgobject-1.3.a	72	lib/libgobject-2.0.a
76	lib/libgobject-1.3.so	73	lib/libgobject-2.0.so.0
77	lib/libgobject-1.3.so.14	74	lib/libgobject-2.0.so
78	lib/libgthread-1.3.a	75	lib/libgmodule-2.0.a
79	lib/libgthread-1.3.so	76	lib/libgmodule-2.0.so.0
80	lib/libgthread-1.3.so.14	77	lib/libgmodule-2.0.so
81	libdata/pkgconfig/glib-2.0.pc	78	lib/libgthread-2.0.a
82	libdata/pkgconfig/gmodule-2.0.pc	79	lib/libgthread-2.0.so.0
83	libdata/pkgconfig/gobject-2.0.pc	80	lib/libgthread-2.0.so
84	libdata/pkgconfig/gthread-2.0.pc
85	share/aclocal/glib-2.0.m4	81	share/aclocal/glib-2.0.m4
86	share/aclocal/glib-gettext.m4	82	share/aclocal/glib-gettext.m4
87	share/glib-2.0/gettext/po/Makefile.in.in
88	share/locale/az/LC_MESSAGES/glib20.mo	83	share/locale/az/LC_MESSAGES/glib20.mo
89	share/locale/ca/LC_MESSAGES/glib20.mo	84	share/locale/ca/LC_MESSAGES/glib20.mo
90	share/locale/de/LC_MESSAGES/glib20.mo	85	share/locale/de/LC_MESSAGES/glib20.mo
		86	share/locale/el/LC_MESSAGES/glib20.mo
91	share/locale/es/LC_MESSAGES/glib20.mo	87	share/locale/es/LC_MESSAGES/glib20.mo
92	share/locale/eu/LC_MESSAGES/glib20.mo	88	share/locale/eu/LC_MESSAGES/glib20.mo
93	share/locale/fr/LC_MESSAGES/glib20.mo	89	share/locale/fr/LC_MESSAGES/glib20.mo
Lines 109-117 Link Here
109	share/locale/uk/LC_MESSAGES/glib20.mo	105	share/locale/uk/LC_MESSAGES/glib20.mo
110	share/locale/zh_CN/LC_MESSAGES/glib20.mo	106	share/locale/zh_CN/LC_MESSAGES/glib20.mo
111	share/locale/zh_TW/LC_MESSAGES/glib20.mo	107	share/locale/zh_TW/LC_MESSAGES/glib20.mo
		108	share/glib-2.0/gettext/po/Makefile.in.in
		109	libdata/pkgconfig/glib-2.0.pc
		110	libdata/pkgconfig/gobject-2.0.pc
		111	libdata/pkgconfig/gmodule-2.0.pc
		112	libdata/pkgconfig/gthread-2.0.pc
		113	libdata/charset.alias
		114	@dirrm include/glib-2.0/glib
		115	@dirrm include/glib-2.0/gobject
		116	@dirrm include/glib-2.0
112	@dirrm share/glib-2.0/gettext/po	117	@dirrm share/glib-2.0/gettext/po
113	@dirrm share/glib-2.0/gettext	118	@dirrm share/glib-2.0/gettext
114	@dirrm share/glib-2.0	119	@dirrm share/glib-2.0
115	@dirrm include/glib-2.0/gobject
116	@dirrm include/glib-2.0/glib
117	@dirrm include/glib-2.0




--- configure.in.orig	Sun Mar 10 21:14:44 2002
+++ configure.in	Sun Mar 10 21:21:13 2002
@@ -1204,7 +1204,7 @@
 		G_THREAD_LIBS="-pthread"
 		;;
              *)
-		for thread_lib in "" pthread pthread32 pthreads thread dce; do
+		for thread_lib in "" "$PTHREAD_LIBS" pthread pthread32 pthreads thread dce; do
 			if test x"$thread_lib" = x; then
 				add_thread_lib=""
 				IN=""
@@ -1538,6 +1538,9 @@
     if test $found_iconv = "no"; then
       AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
     fi
+    if test $found_iconv = "no"; then
+      AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
+    fi
     # Check if we have a iconv in -liconv, possibly from vendor
     if test $found_iconv = "no"; then
       AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
@@ -1548,6 +1551,9 @@
     ;;
   gnu|yes)
     AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
+    if test $found_iconv = "no"; then
+      AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
+    fi
     ;;
   native)
     AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
@@ -1561,6 +1567,10 @@
 case $with_libiconv in
   gnu)
     ICONV_LIBS="-liconv"
+    AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
+    ;;
+  ggnu)
+    ICONV_LIBS="-lgiconv"
     AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
     ;;
   native)

Return to bug 35541

Lines 6-24 Link Here

(-)Makefile (-9 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= glib	8	PORTNAME= glib
9	PORTVERSION= 1.3.14	9	PORTVERSION= 2.0.0
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \	11
12	ftp://ftp.gimp.org/pub/%SUBDIR%/ \	12	MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
13	ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \	13	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
14	http://www.ameth.org/gimp/%SUBDIR%/ \	14	ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
15	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}	15	http://www.ameth.org/gimp/%SUBDIR%/ \
16	MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}	16	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} \
		17	ftp://ftp.gtk.org/pub/
		18	MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
17	DIST_SUBDIR= gnome2	19	DIST_SUBDIR= gnome2
18		20
19	MAINTAINER= gnome@FreeBSD.org	21	MAINTAINER= gnome@FreeBSD.org
20		22
21	BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig	23	BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \
		24	autoconf:${PORTSDIR}/devel/autoconf
22	LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \	25	LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
23	intl.1:${PORTSDIR}/devel/gettext	26	intl.1:${PORTSDIR}/devel/gettext
24	RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig	27	RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
Lines 29-39 Link Here
29	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
30	INSTALLS_SHLIB= yes	33	INSTALLS_SHLIB= yes
31	USE_GMAKE= yes	34	USE_GMAKE= yes
		35	USE_AUTOCONF= yes
		36	AUTOCONF= autoconf
32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	37	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
33	LDFLAGS="-L${LOCALBASE}/lib" \	38	LDFLAGS="-L${LOCALBASE}/lib" \
34	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	39	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
35	PTHREAD_LIBS="${PTHREAD_LIBS}"	40	PTHREAD_LIBS="${PTHREAD_LIBS}"
36	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}	41	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} \
		42	--enable-static=yes
37		43
38	MAN1= glib-genmarshal.1 glib-mkenums.1	44	MAN1= glib-genmarshal.1 glib-mkenums.1
39		45

Added Link Here

(-)files/patch-configure.in (+42 lines)
1	--- configure.in.orig Sun Mar 10 21:14:44 2002
2	+++ configure.in Sun Mar 10 21:21:13 2002
3	@@ -1204,7 +1204,7 @@
4	G_THREAD_LIBS="-pthread"
5	;;
6	*)
7	- for thread_lib in "" pthread pthread32 pthreads thread dce; do
8	+ for thread_lib in "" "$PTHREAD_LIBS" pthread pthread32 pthreads thread dce; do
9	if test x"$thread_lib" = x; then
10	add_thread_lib=""
11	IN=""
12	@@ -1538,6 +1538,9 @@
13	if test $found_iconv = "no"; then
14	AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
15	fi
16	+ if test $found_iconv = "no"; then
17	+ AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
18	+ fi
19	# Check if we have a iconv in -liconv, possibly from vendor
20	if test $found_iconv = "no"; then
21	AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
22	@@ -1548,6 +1551,9 @@
23	;;
24	gnu\|yes)
25	AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
26	+ if test $found_iconv = "no"; then
27	+ AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
28	+ fi
29	;;
30	native)
31	AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
32	@@ -1561,6 +1567,10 @@
33	case $with_libiconv in
34	gnu)
35	ICONV_LIBS="-liconv"
36	+ AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
37	+ ;;
38	+ ggnu)
39	+ ICONV_LIBS="-lgiconv"
40	AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
41	;;
42	native)