diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2004-12-21 22:18:50 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2004-12-21 22:18:50 +0000 |
commit | 13d164aae637bcb11aa81b8b1aa56d728d603d3e (patch) | |
tree | 85622f563581a2e461d5352133b9e91d553b915e /lang | |
parent | Mark forbidden due to X Pixmap parsing bugs in (diff) |
- Upgrade to 1.0-RC5;
- Fix dependencies with libxml2 & libxslt.
Notes
Notes:
svn path=/head/; revision=124733
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gambas/Makefile | 12 | ||||
-rw-r--r-- | lang/gambas/distinfo | 4 | ||||
-rw-r--r-- | lang/gambas/files/patch-configure | 29 | ||||
-rw-r--r-- | lang/gambas/files/patch-src::comp::Makefile.in | 33 | ||||
-rw-r--r-- | lang/gambas/pkg-plist | 36 |
5 files changed, 59 insertions, 55 deletions
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 46c2280dbd36..2cbc200b906c 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -6,10 +6,10 @@ PORTNAME= gambas PORTVERSION= 0.99 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= http://gambas.sourceforge.net/ -DISTNAME= ${PORTNAME}-${PORTVERSION}.RC4 +DISTNAME= ${PORTNAME}-${PORTVERSION}.RC5 MAINTAINER= thierry@FreeBSD.org COMMENT= Gambas Almost Means BASic @@ -48,6 +48,14 @@ CONFIGURE_ARGS+= --disable-sdl PLIST_SUB+= SDL="@comment " .endif +.if !defined(WITHOUT_XML) +USE_GNOME= libxml2 libxslt +PLIST_SUB+= XML="" +.else +CONFIGURE_ARGS+= --disable-libxml --disable-xslt +PLIST_SUB+= XML="@comment " +.endif + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 diff --git a/lang/gambas/distinfo b/lang/gambas/distinfo index 01e7a53b855b..982cc478dd51 100644 --- a/lang/gambas/distinfo +++ b/lang/gambas/distinfo @@ -1,2 +1,2 @@ -MD5 (gambas-0.99.RC4.tar.bz2) = 55ab72b09cb095f66fc3aaeeb2277d07 -SIZE (gambas-0.99.RC4.tar.bz2) = 3724246 +MD5 (gambas-0.99.RC5.tar.bz2) = 047345399978ffe7242d6b20f71fee1c +SIZE (gambas-0.99.RC5.tar.bz2) = 4050182 diff --git a/lang/gambas/files/patch-configure b/lang/gambas/files/patch-configure index c652ccd5baae..877614399506 100644 --- a/lang/gambas/files/patch-configure +++ b/lang/gambas/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Sep 5 23:53:05 2004 -+++ configure Tue Sep 7 21:20:07 2004 -@@ -6891,6 +6891,7 @@ +--- configure.orig Sat Dec 18 19:16:01 2004 ++++ configure Tue Dec 21 21:42:27 2004 +@@ -21662,6 +21662,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7126,10 +7127,10 @@ +@@ -21986,10 +21987,10 @@ case "${host}" in *-*-freebsd* ) @@ -23,7 +23,7 @@ ;; *) THREAD_LIB="-lpthread" -@@ -10324,7 +10325,7 @@ +@@ -26034,7 +26035,7 @@ fi done @@ -32,16 +32,9 @@ fi -@@ -10447,26 +10448,13 @@ - fi - - gb_cv_header_sdl=$gb_inc_sdl -- -+ - fi - - - echo "$ac_t""$gb_cv_header_sdl" 1>&6 +@@ -26165,20 +26166,7 @@ + echo "$as_me:$LINENO: result: $gb_cv_header_sdl" >&5 + echo "${ECHO_T}$gb_cv_header_sdl" >&6 - SDL_INC="" - @@ -61,7 +54,7 @@ if test "$gb_cv_header_sdl" = no; then have_inc_sdl="no" SDL_INC="" -@@ -10569,16 +10557,7 @@ +@@ -26282,16 +26270,7 @@ SDL_LIB="" SDL_PATH="" @@ -79,7 +72,7 @@ fi -@@ -11332,8 +11311,8 @@ +@@ -27568,8 +27547,8 @@ fi @@ -90,7 +83,7 @@ if test "$gambas_prof" = "yes"; then CFLAGS="$CFLAGS -pg" -@@ -11363,8 +11342,8 @@ +@@ -27599,8 +27578,8 @@ CFLAGS="$CFLAGS -Os" CXXFLAGS="$CXXFLAGS -Os -fno-omit-frame-pointer" else diff --git a/lang/gambas/files/patch-src::comp::Makefile.in b/lang/gambas/files/patch-src::comp::Makefile.in index a533e447a724..fc45d0069ebc 100644 --- a/lang/gambas/files/patch-src::comp::Makefile.in +++ b/lang/gambas/files/patch-src::comp::Makefile.in @@ -1,16 +1,19 @@ ---- src/comp/Makefile.in.orig Sun Mar 14 15:21:41 2004 -+++ src/comp/Makefile.in Tue Mar 23 22:36:49 2004 -@@ -141,10 +141,10 @@ - gbi_DEPENDENCIES = - gbi_LDFLAGS = - CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(GBX_THREAD_INC) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(GBX_THREAD_INC) +--- src/comp/Makefile.in.orig Mon Dec 20 12:13:43 2004 ++++ src/comp/Makefile.in Tue Dec 21 21:49:45 2004 +@@ -96,13 +96,13 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/gbc_trans_tree.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/gbc_type.Po ./$(DEPDIR)/gbi.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(GBX_THREAD_INC) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CFLAGS) $(GBX_THREAD_INC) CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(GBX_THREAD_LIB) -o $@ - DIST_COMMON = Makefile.am Makefile.in - - + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) $(GBX_THREAD_LIB) -o $@ + SOURCES = $(gba_SOURCES) $(gbc_SOURCES) $(gbi_SOURCES) + DIST_SOURCES = $(gba_SOURCES) $(gbc_SOURCES) $(gbi_SOURCES) + ETAGS = etags diff --git a/lang/gambas/pkg-plist b/lang/gambas/pkg-plist index 812baf69d5db..799247227809 100644 --- a/lang/gambas/pkg-plist +++ b/lang/gambas/pkg-plist @@ -73,18 +73,18 @@ lib/gambas/lib.gb.vb.a lib/gambas/lib.gb.vb.component lib/gambas/lib.gb.vb.so lib/gambas/lib.gb.vb.so.0 -lib/gambas/lib.gb.xml.libxml.a -lib/gambas/lib.gb.xml.libxml.component -lib/gambas/lib.gb.xml.libxml.rpc.a -lib/gambas/lib.gb.xml.libxml.rpc.component -lib/gambas/lib.gb.xml.libxml.rpc.so -lib/gambas/lib.gb.xml.libxml.rpc.so.0 -lib/gambas/lib.gb.xml.libxml.so -lib/gambas/lib.gb.xml.libxml.so.0 -lib/gambas/lib.gb.xml.libxml.xslt.a -lib/gambas/lib.gb.xml.libxml.xslt.component -lib/gambas/lib.gb.xml.libxml.xslt.so -lib/gambas/lib.gb.xml.libxml.xslt.so.0 +%%XML%%lib/gambas/lib.gb.xml.libxml.a +%%XML%%lib/gambas/lib.gb.xml.libxml.component +%%XML%%lib/gambas/lib.gb.xml.libxml.rpc.a +%%XML%%lib/gambas/lib.gb.xml.libxml.rpc.component +%%XML%%lib/gambas/lib.gb.xml.libxml.rpc.so +%%XML%%lib/gambas/lib.gb.xml.libxml.rpc.so.0 +%%XML%%lib/gambas/lib.gb.xml.libxml.so +%%XML%%lib/gambas/lib.gb.xml.libxml.so.0 +%%XML%%lib/gambas/lib.gb.xml.libxml.xslt.a +%%XML%%lib/gambas/lib.gb.xml.libxml.xslt.component +%%XML%%lib/gambas/lib.gb.xml.libxml.xslt.so +%%XML%%lib/gambas/lib.gb.xml.libxml.xslt.so.0 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.gambas/FBROWSER %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.icon/16.png %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.icon/32.png @@ -3633,12 +3633,12 @@ lib/gambas/lib.gb.xml.libxml.xslt.so.0 %%DATADIR%%/info/gb.sdl.list %%DATADIR%%/info/gb.vb.info %%DATADIR%%/info/gb.vb.list -%%DATADIR%%/info/gb.xml.libxml.info -%%DATADIR%%/info/gb.xml.libxml.list -%%DATADIR%%/info/gb.xml.libxml.rpc.info -%%DATADIR%%/info/gb.xml.libxml.rpc.list -%%DATADIR%%/info/gb.xml.libxml.xslt.info -%%DATADIR%%/info/gb.xml.libxml.xslt.list +%%XML%%%%DATADIR%%/info/gb.xml.libxml.info +%%XML%%%%DATADIR%%/info/gb.xml.libxml.list +%%XML%%%%DATADIR%%/info/gb.xml.libxml.rpc.info +%%XML%%%%DATADIR%%/info/gb.xml.libxml.rpc.list +%%XML%%%%DATADIR%%/info/gb.xml.libxml.xslt.info +%%XML%%%%DATADIR%%/info/gb.xml.libxml.xslt.list @dirrm %%DATADIR%%/info %%PORTDOCS%%@dirrm %%DATADIR%%/help/hello-world %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc/WebSiteScreenshots |