Bug 116968 - [patch] textproc/libxml2 with options
Summary: [patch] textproc/libxml2 with options
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-10-06 06:50 UTC by Cory R. King
Modified: 2007-10-21 03:40 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Cory R. King 2007-10-06 06:50:00 UTC
I've added options support for libxml2.  Please make sure to keep that whole WITHOUT_THREADS business.  It gets tricky trying to undefined WITH_THREADS in tinderbuild.  I usually leave it defined and this port is the only that, as advertised, breaks other ports when built with threads.

Fix: 

PORTNAME=      libxml2
 PORTVERSION=   2.6.30
-PORTREVISION?= 0
+PORTREVISION?= 1
 CATEGORIES?=   textproc gnome
 MASTER_SITES=  ftp://xmlsoft.org/libxml2/ \
                ftp://fr.rpmfind.net/pub/libxml/
@@ -36,12 +36,25 @@
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
                LDFLAGS="-L${LOCALBASE}/lib"

+OPTIONS=       THREADS "Threadsafe (WILL BREAK PORTS LIKE PHP!)" off \
+               SCHEMA "Add XML schema support" on \
+               XMLLINT_HIST "Add history support xmllint tool" off \
+               THREAD_ALLOC "Per-thread memory (DEVELOPERS ONLY!)" off \
+               MEM_DEBUG "Memory debugging (DEVELOPERS ONLY!)" off
+
 .if !defined(MASTERDIR)
 MAN1=          xml2-config.1 xmllint.1 xmlcatalog.1
 MAN3=          libxml.3
 .endif

-.if defined(WITH_THREADS)
+
+.include <bsd.port.pre.mk>
+
+
+# We go through this !defined() because some people
+# add WITH_THREADS to make.conf (or tinderbuild, where
+# this is the only port that breaks with it enabled...)
+.if defined(WITH_THREADS) && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=       --with-threads
 .else
 CONFIGURE_ARGS+=       --without-threads
@@ -74,6 +87,6 @@
                 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' ${WRKSRC}/${f}
 .endfor

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

 .endif--FUlkbncChQD06nVcyjmQgS6FJZI39VcgkeA6WTeHCsw3nr5S
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- Makefile.old        Fri Oct  5 22:10:56 2007
+++ Makefile    Fri Oct  5 22:30:00 2007
@@ -13,7 +13,7 @@
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-10-06 06:50:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gnome

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2007-10-21 03:30:27 UTC
mezz        2007-10-21 02:30:23 UTC

  FreeBSD ports repository

  Modified files:
    textproc/libxml2     Makefile 
  Log:
  Rename the name of knob from WITH_THREADS to WITH_THREADS_BREAK. If enable
  threads option will break other ports then the name of knob shouldn't be
  use this global name.
  
  PR:             ports/116968
  Reported by:    Cory R. King <coryking@mozimedia.com>
  
  Revision  Changes    Path
  1.147     +2 -2      ports/textproc/libxml2/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Jeremy Messenger freebsd_committer freebsd_triage 2007-10-21 03:30:31 UTC
State Changed
From-To: open->closed

I have a better idea by rename the knob from WITH_THREADS to WITH_THREADS_BREAK