[127038] trunk/dports/devel/judy

[ryandesign at macports.org]

Revision: 127038
          https://trac.macports.org/changeset/127038
Author:   ryandesign at macports.org
Date:     2014-10-19 13:27:32 -0700 (Sun, 19 Oct 2014)
Log Message:
-----------
judy: build universal correctly using muniversal portgroup

Modified Paths:
--------------
    trunk/dports/devel/judy/Portfile

Added Paths:
-----------
    trunk/dports/devel/judy/files/
    trunk/dports/devel/judy/files/patch-tool-jhton.c.diff

Modified: trunk/dports/devel/judy/Portfile
===================================================================
--- trunk/dports/devel/judy/Portfile	2014-10-19 20:26:05 UTC (rev 127037)
+++ trunk/dports/devel/judy/Portfile	2014-10-19 20:27:32 UTC (rev 127038)
@@ -1,9 +1,12 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
+PortGroup       muniversal 1.0
 
 name            judy
 version         1.0.5
+revision        1
 categories      devel
 license         LGPL
 platforms       darwin
@@ -24,12 +27,15 @@
                 sha1    3540f003509acac3b1260424380ddf97914f7745 \
                 rmd160  00cc2d28fd385e64c8fb9a564e186aee4bd52b4f
 
-configure.args  --mandir=${prefix}/share/man
+patchfiles      patch-tool-jhton.c.diff
 
-if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
-    configure.args-append   --enable-64-bit
-} elseif {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
-    configure.args-append   --enable-32-bit
+set merger_configure_args(i386)     --enable-32-bit
+set merger_configure_args(ppc)      --enable-32-bit
+set merger_configure_args(ppc64)    --enable-64-bit
+set merger_configure_args(x86_64)   --enable-64-bit
+
+if {![variant_isset universal] && [info exists merger_configure_args(${build_arch})]} {
+    configure.args-append   $merger_configure_args(${build_arch})
 }
 
 use_parallel_build 	no

Added: trunk/dports/devel/judy/files/patch-tool-jhton.c.diff
===================================================================
--- trunk/dports/devel/judy/files/patch-tool-jhton.c.diff	                        (rev 0)
+++ trunk/dports/devel/judy/files/patch-tool-jhton.c.diff	2014-10-19 20:27:32 UTC (rev 127038)
@@ -0,0 +1,27 @@
+Don't include timestamp in generated files since this prevents muniversal
+portgroup from being able to merge them correctly.
+--- tool/jhton.c.orig	2005-02-15 15:06:07.000000000 -0600
++++ tool/jhton.c	2014-10-19 14:38:06.000000000 -0500
+@@ -674,7 +674,6 @@
+ 	char *	pagesection;		// such as "3X".
+ 	char	lcletter;		// manual tab section, such as "j".
+ 	char *	revision;		// from centered table datum.
+-	time_t	currtime;		// for ctime().
+ 
+ // Extract "weird" header values:
+ //
+@@ -690,11 +689,10 @@
+ 		  "contain revision information");
+ 	}
+ 
+-// Emit file header; note, ctime() output already contains a newline:
++// Emit file header:
+ 
+-	(void) time(&currtime);
+-	(void) printf(".\\\" Auto-translated to nroff -man from %s by %s at %s",
+-		      Filename, gc_myname, ctime(&currtime));
++	(void) printf(".\\\" Auto-translated to nroff -man from %s by %s\n",
++		      Filename, gc_myname);
+ 
+ 	(void) printf(".\\\" %s\n",  filerev);
+ 	(void) printf(".TA %c\n",    lcletter);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141019/a2b0aba7/attachment.html>