[csw-devel] SF.net SVN: gar:[8833] csw/mgar/pkg/pidgin/trunk

bensons at users.sourceforge.net bensons at users.sourceforge.net
Fri Feb 26 12:35:11 CET 2010 

Revision: 8833
          http://gar.svn.sourceforge.net/gar/?rev=8833&view=rev
Author:   bensons
Date:     2010-02-26 11:35:11 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
pidgin: fixed build. removed unnecessary patches

Modified Paths:
--------------
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/checksums
    csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in

Removed Paths:
-------------
    csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2010-02-26 11:35:11 UTC (rev 8833)
@@ -27,9 +27,6 @@
 CONFIGURE_ARGS += --disable-vv
 
 
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
 PATH = $(SOS11_CC_HOME)/bin:$(PATH)
 EXTRA_EXPORTS = PATH
 
@@ -40,8 +37,9 @@
 SED=/opt/csw/bin/gsed
 X11_CFLAGS=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API
 X11_LIBS=-lX11
+LIBS=-lm
 EXTRA_CONFIGURE_EXPORTS  = DOT XGETTEXT MSGFMT MSGMERGE SED PKG_CONFIG_PATH
-EXTRA_CONFIGURE_EXPORTS += X11_CFLAGS X11_LIBS
+EXTRA_CONFIGURE_EXPORTS += X11_CFLAGS X11_LIBS LIBS
 EXTRA_INC = /opt/csw/include/ncurses
 TEST_TARGET = check
 TEST_SCRIPTS =
@@ -51,6 +49,9 @@
 
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 EXTRA_LDFLAGS = -R $(prefix)/X11/lib
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
 
 EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
 
@@ -66,9 +67,7 @@
 
 PATCHFILES += patch-pidgin-Makefile.in
 PATCHFILES += patch-pidgin-plugin.c
-PATCHFILES += patch-pidgin-plugins-perl-Makefile.in
 PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in
-PATCHFILES += patch-libpurple-plugins-perl-Makefile.in
 PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in
 
 include gar/category.mk

Modified: csw/mgar/pkg/pidgin/trunk/checksums
===================================================================
--- csw/mgar/pkg/pidgin/trunk/checksums	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/checksums	2010-02-26 11:35:11 UTC (rev 8833)
@@ -1,7 +1,5 @@
-5043a5a5a6fd671631782a4562add729  patch-libpurple-plugins-perl-Makefile.in
-685473080941d793ab08338c66a81e71  patch-libpurple-plugins-perl-common-Makefile.PL.in
+23e1ef54d5f0c555764d5c4093ba243c  patch-libpurple-plugins-perl-common-Makefile.PL.in
 99f3067ed65d2003f48629ebba5acc3d  patch-pidgin-Makefile.in
 37b9ed69736f803cc30eadc562d4b61c  patch-pidgin-plugin.c
-21aa84e80b62704aef90d90bb075f083  patch-pidgin-plugins-perl-Makefile.in
-c643897c7eef3aefd713db4fa99e64e4  patch-pidgin-plugins-perl-common-Makefile.PL.in
+a3b5a3ad53033dc1432562ca72fc0760  patch-pidgin-plugins-perl-common-Makefile.PL.in
 29109672ea90e901b6bbebb09487e50f  pidgin-2.6.6.tar.gz

Deleted: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in	2010-02-26 11:35:11 UTC (rev 8833)
@@ -1,25 +0,0 @@
---- pidgin-2.6.6.orig/libpurple/plugins/perl/Makefile.in	2010-02-16 10:34:23.000000000 +0100
-+++ pidgin-2.6.6/libpurple/plugins/perl/Makefile.in	2010-02-25 17:26:31.537969797 +0100
-@@ -798,7 +798,7 @@
- 			${LN_S} -f $$srcloc/$$f $$f; \
- 		done; \
- 	fi
--	@cd common && $(perlpath) Makefile.PL
-+	@cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor
- 
- common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-@@ -807,10 +807,10 @@
- 	@for dir in $(perl_dirs); do \
- 		cd $$dir && \
- 		if [ ! -f Makefile ]; then \
--			$(perlpath) Makefile.PL; \
-+			$(perlpath) Makefile.PL INSTALLDIRS=vendor; \
- 		fi && \
--		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
--		 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
-+		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \
-+		 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \
- 		cd ..; \
- 	done
- 

Modified: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in	2010-02-26 11:35:11 UTC (rev 8833)
@@ -1,10 +1,18 @@
 --- pidgin-2.6.6.orig/libpurple/plugins/perl/common/Makefile.PL.in	2010-02-16 10:34:06.000000000 +0100
-+++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in	2010-02-25 18:18:46.653361400 +0100
-@@ -11,6 +11,7 @@
++++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in	2010-02-26 10:04:39.981704542 +0100
+@@ -11,11 +11,14 @@
         AUTHOR           => 'Purple <http://pidgin.im/>') : ()),
      'DEFINE'            => '@DEBUG_CFLAGS@',
      'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@',
-+    'LIBS'              => '@PERL_LIBS@',
++    'LIBS'          => '@PERL_LIBS@ -lglib-2.0',
      'OBJECT'            => '$(O_FILES)', # link all the C files too
  #    'OPTIMIZE'          => '-g', # For debugging
      'INSTALLDIRS'          => 'vendor',
+     'INSTALL_BASE'         => '$(prefix)',
+-    'INSTALLVENDORARCH'    => '$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/perl',
++    'INSTALLVENDORARCH'    => '$(libdir)/perl/csw',
++    'INSTALLVENDORLIB'     => '$(libdir)/perl/csw',
++    'INSTALLARCHLIB'       => '$(libdir)/perl/csw',
+     'INSTALLVENDORMAN3DIR' => '$(mandir)/man3',
+     'macro'                => {
+         'prefix'               => '@prefix@',

Deleted: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in	2010-02-26 11:35:11 UTC (rev 8833)
@@ -1,25 +0,0 @@
---- pidgin-2.6.6.orig/pidgin/plugins/perl/Makefile.in	2010-02-16 10:34:32.000000000 +0100
-+++ pidgin-2.6.6/pidgin/plugins/perl/Makefile.in	2010-02-25 17:25:56.810869007 +0100
-@@ -604,7 +604,7 @@
- 			${LN_S} -f $$srcloc/$$f $$f; \
- 		done; \
- 	fi
--	@cd common && $(perlpath) Makefile.PL
-+	@cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor
- 
- common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-@@ -613,10 +613,10 @@
- 	@for dir in $(perl_dirs); do \
- 		cd $$dir && \
- 		if [ ! -f Makefile ]; then \
--			$(perlpath) Makefile.PL; \
-+			$(perlpath) Makefile.PL INSTALLDIRS=vendor; \
- 		fi && \
--		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
--		$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
-+		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \
-+		$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \
- 		cd ..; \
- 	done
- 

Modified: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in	2010-02-26 09:28:02 UTC (rev 8832)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in	2010-02-26 11:35:11 UTC (rev 8833)
@@ -1,10 +1,19 @@
 --- pidgin-2.6.6.orig/pidgin/plugins/perl/common/Makefile.PL.in	2010-02-16 10:34:06.000000000 +0100
-+++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in	2010-02-25 18:10:57.385636308 +0100
-@@ -10,6 +10,7 @@
++++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in	2010-02-26 09:59:56.721552783 +0100
+@@ -10,12 +10,15 @@
         'AUTHOR'        => 'Pidgin <http://pidgin.im/>') :  ()),
      'DEFINE'        => '@DEBUG_CFLAGS@',
      'INC'           => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@',
-+    'LIBS'          => '@PERL_LIBS@',
++    'LIBS'          => '@PERL_LIBS@ -lglib-2.0',
      'OBJECT'        => '$(O_FILES)', # link all the C files too
      'TYPEMAPS'      => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
  #    'OPTIMIZE'      => '-g', # For debugging.
+     'INSTALLDIRS'          => 'vendor',
+     'INSTALL_BASE'         => '$(prefix)',
+-    'INSTALLVENDORARCH'    => '$(libdir)/pidgin/perl',
++    'INSTALLVENDORARCH'    => '$(libdir)/perl/csw',
++    'INSTALLVENDORLIB'     => '$(libdir)/perl/csw',
++    'INSTALLARCHLIB'       => '$(libdir)/perl/csw',
+     'INSTALLVENDORMAN3DIR' => '$(mandir)/man3',
+     'macro'                => {
+         'prefix'      => '@prefix@',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list