[32007] trunk/dports/graphics/jpeg

[ryandesign at macports.org]

Revision: 32007
          http://trac.macosforge.org/projects/macports/changeset/32007
Author:   ryandesign at macports.org
Date:     2007-12-13 05:09:10 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
jpeg: enable universal variant, and change the manpage mtree violation fix; closes #12504 and #12320

Modified Paths:
--------------
    trunk/dports/graphics/jpeg/Portfile
    trunk/dports/graphics/jpeg/files/patch-makefile.cfg

Modified: trunk/dports/graphics/jpeg/Portfile
===================================================================
--- trunk/dports/graphics/jpeg/Portfile	2007-12-13 12:43:04 UTC (rev 32006)
+++ trunk/dports/graphics/jpeg/Portfile	2007-12-13 13:09:10 UTC (rev 32007)
@@ -37,7 +37,6 @@
 patchfiles      patch-config.sub patch-config.guess patch-ltmain.sh \
                 patch-ltconfig patch-makefile.cfg
 post-patch {
-    reinplace	"s|(prefix)/man|(prefix)/share/man|g" makefile.cfg
     system "cd ${worksrcpath} &&
         tar zxf ${distpath}/droppatch.tar.gz"
 }

Modified: trunk/dports/graphics/jpeg/files/patch-makefile.cfg
===================================================================
--- trunk/dports/graphics/jpeg/files/patch-makefile.cfg	2007-12-13 12:43:04 UTC (rev 32006)
+++ trunk/dports/graphics/jpeg/files/patch-makefile.cfg	2007-12-13 13:09:10 UTC (rev 32007)
@@ -1,10 +1,21 @@
---- makefile.cfg.org	Fri Apr 22 21:31:36 2005
-+++ makefile.cfg	Fri Apr 22 21:36:22 2005
-@@ -169,7 +169,7 @@
+--- makefile.cfg	1998-03-21 20:08:57.000000000 +0100
++++ makefile.cfg	2007-12-13 00:50:27.000000000 +0100
+@@ -17,7 +17,7 @@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
++mandir = $(prefix)/share/man/man$(manext)
+ 
+ # The name of your C compiler:
+ CC= @CC@
+@@ -168,8 +168,8 @@
+ 
  # with libtool:
  libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
- 	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
 -		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
++	$(LIBTOOL) --mode=link "$(CC) $(CFLAGS)" -o libjpeg.la $(LIBOBJECTS) \
 +		-rpath $(libdir) -no-undefined -version-info $(JPEG_LIB_VERSION)
  
  # sample programs:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071213/8b397768/attachment-0001.html