[102948] trunk/dports/sysutils/file

[jeremyhu at macports.org]

Revision: 102948
          https://trac.macports.org/changeset/102948
Author:   jeremyhu at macports.org
Date:     2013-02-10 21:02:07 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
file: Fix build on Snow Leopard

Modified Paths:
--------------
    trunk/dports/sysutils/file/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/file/files/getline.patch
    trunk/dports/sysutils/file/files/patch-magic-Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff

Modified: trunk/dports/sysutils/file/Portfile
===================================================================
--- trunk/dports/sysutils/file/Portfile	2013-02-11 04:36:53 UTC (rev 102947)
+++ trunk/dports/sysutils/file/Portfile	2013-02-11 05:02:07 UTC (rev 102948)
@@ -30,16 +30,20 @@
                     rmd160  37dcdb65333cac5e301a18783d59bf89bc081d2b
 
 patchfiles          patch-magic-Magdir-msdos.diff \
-                    patch-src-readcdf.c.diff
+                    patch-src-readcdf.c.diff \
+                    getline.patch
 
-configure.args      --mandir=${prefix}/share/man \
-                    --enable-fsect-man5
+configure.args      --enable-fsect-man5
+
 depends_lib         port:zlib
 
 variant with_text_magic_file description (also install the plain-text magic file} {
-    patchfiles-append patch-magic-Makefile.in.diff
+    patchfiles-append patch-magic-Makefile.am.diff
 }
 
+use_autoreconf      yes
+autoreconf.args     -fvi
+
 livecheck.type      regex
 livecheck.url       ftp://ftp.astron.com/pub/${name}/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/sysutils/file/files/getline.patch
===================================================================
--- trunk/dports/sysutils/file/files/getline.patch	                        (rev 0)
+++ trunk/dports/sysutils/file/files/getline.patch	2013-02-11 05:02:07 UTC (rev 102948)
@@ -0,0 +1,8 @@
+--- src/Makefile.am.orig	2013-02-10 20:56:05.000000000 -0800
++++ src/Makefile.am	2013-02-10 20:56:17.000000000 -0800
+@@ -20,4 +20,4 @@ endif
+ libmagic_la_LIBADD = $(LTLIBOBJS) $(MINGWLIBS)
+ 
+ file_SOURCES = file.c
+-file_LDADD = libmagic.la
++file_LDADD = libmagic.la $(LTLIBOBJS)

Added: trunk/dports/sysutils/file/files/patch-magic-Makefile.am.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-magic-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/sysutils/file/files/patch-magic-Makefile.am.diff	2013-02-11 05:02:07 UTC (rev 102948)
@@ -0,0 +1,26 @@
+--- magic/Makefile.am.orig	2013-02-10 20:40:39.000000000 -0800
++++ magic/Makefile.am	2013-02-10 20:41:12.000000000 -0800
+@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
+ MAGIC_DIR = $(top_srcdir)/magic
+ MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+ 
+-pkgdata_DATA = magic.mgc
++pkgdata_DATA = magic.mgc magic
+ 
+ EXTRA_DIST = \
+ $(MAGIC_DIR)/Header \
+@@ -284,3 +284,14 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D
+ 	  fi)
+ 	$(FILE_COMPILE) -C -m magic
+ 	@rm -fr magic
++
++magic: $(EXTRA_DIST) $(MAGIC)
++	for frag in $(EXTRA_DIST); do \
++		if test -f $(srcdir)/$$frag; then \
++			f=$(srcdir)/$$frag; \
++		else \
++			f=$$frag; \
++		fi; \
++		cat $$f; \
++	done >> $@
++

Deleted: trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff	2013-02-11 04:36:53 UTC (rev 102947)
+++ trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff	2013-02-11 05:02:07 UTC (rev 102948)
@@ -1,29 +0,0 @@
---- magic/Makefile.in.orig	2011-08-03 09:55:56.000000000 -0700
-+++ magic/Makefile.in	2011-08-18 16:04:14.000000000 -0700
-@@ -201,7 +201,7 @@
- MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_DIR = $(top_srcdir)/magic
- MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
--pkgdata_DATA = magic.mgc
-+pkgdata_DATA = magic.mgc magic
- EXTRA_DIST = \
- $(MAGIC_DIR)/Header \
- $(MAGIC_DIR)/Localstuff \
-@@ -669,6 +669,17 @@
- 	$(FILE_COMPILE) -C -m magic
- 	@rm -fr magic
- 
-+magic: $(EXTRA_DIST) ${MAGIC}
-+	for frag in $(EXTRA_DIST); do \
-+		if test -f $(srcdir)/$$frag; then \
-+			f=$(srcdir)/$$frag; \
-+		else \
-+			f=$$frag; \
-+		fi; \
-+		cat $$f; \
-+	done >> $@
-+
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/a610d329/attachment-0001.html>