[Midnightbsd-cvs] mports [15571] turn off port on newer midnightbsd releases when libiconv is from base
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Nov 9 11:39:53 EST 2013
Revision: 15571
http://svnweb.midnightbsd.org/mports/?rev=15571
Author: laffer1
Date: 2013-11-09 11:39:52 -0500 (Sat, 09 Nov 2013)
Log Message:
-----------
turn off port on newer midnightbsd releases when libiconv is from base
Modified Paths:
--------------
trunk/converters/libiconv/Makefile
trunk/converters/libiconv/files/patch-lib_Makefile.in
trunk/converters/libiconv/files/patch-src::Makefile.in
trunk/converters/libiconv/pkg-plist
Removed Paths:
-------------
trunk/converters/libiconv/files/patch-ae
trunk/converters/libiconv/files/patch-libcharset::lib::Makefile.in
trunk/converters/libiconv/files/patch-test::Makefile.in
Property Changed:
----------------
trunk/converters/libiconv/files/patch-lib_Makefile.in
trunk/converters/libiconv/files/patch-src::Makefile.in
trunk/converters/libiconv/pkg-plist
Modified: trunk/converters/libiconv/Makefile
===================================================================
--- trunk/converters/libiconv/Makefile 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/Makefile 2013-11-09 16:39:52 UTC (rev 15571)
@@ -2,12 +2,13 @@
PORTNAME= libiconv
PORTVERSION= 1.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters devel
MASTER_SITES= GNU
MAINTAINER= ports at MidnightBSD.org
COMMENT= A character set conversion library
+
LICENSE= lgpl
USE_AUTOTOOLS= libtool
@@ -30,11 +31,6 @@
ENCODINGS_DESC= Include extra character sets
PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS
-.ifdef USE_ICONV
-.error USE_ICONV is defined as an environment variable, or in the arguments \
- to "make". Please unset it and restart the build.
-.endif
-
.include <bsd.mport.options.mk>
.if ${PORT_OPTIONS:MENCODINGS}
@@ -55,5 +51,11 @@
${WRKSRC}/libcharset/configure \
${WRKSRC}/preload/configure
+.include <bsd.port.pre.mk>
-.include <bsd.port.mk>
+.if exists(/usr/include/iconv.h)
+IGNORE= converters/libiconv should not be used with iconv from base. \
+Please fix the port which tries to use it
+.endif
+
+.include <bsd.port.post.mk>
Deleted: trunk/converters/libiconv/files/patch-ae
===================================================================
--- trunk/converters/libiconv/files/patch-ae 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/files/patch-ae 2013-11-09 16:39:52 UTC (rev 15571)
@@ -1,63 +0,0 @@
---- libcharset/lib/Makefile.in.orig 2009-03-26 08:01:00.000000000 -0400
-+++ libcharset/lib/Makefile.in 2009-06-06 15:28:00.000000000 -0400
-@@ -10,6 +10,7 @@ prefix = @prefix@
- local_prefix = /usr/local
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-+sysconfdir = ${exec_prefix}/libdata
-
- # Programs used by "make":
- CC = @CC@
-@@ -44,7 +45,7 @@ SHELL = /bin/sh
-
- # Before making a release, change this according to the libtool documentation,
- # section "Library interface versions".
--LIBCHARSET_VERSION_INFO = 1:0:0
-+LIBCHARSET_VERSION_INFO = 1
-
- # Needed by $(LIBTOOL).
- top_builddir = ..
-@@ -59,7 +60,7 @@ libcharset.la : $(OBJECTS)
- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
-
- localcharset.lo : $(srcdir)/localcharset.c
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
-
- relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
-@@ -80,7 +81,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- $(mkinstalldirs) $(libdir)
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+ $(LIBTOOL_INSTALL) cp libcharset.la $(libdir)/libcharset.la
- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
- || orig=charset.alias; \
- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-@@ -108,16 +109,17 @@ install : all force
- need_charset_alias=false ; \
- fi ; \
- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
-+ $(LIBTOOL_INSTALL) cp libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-+ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
-+ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- else \
- if $$need_charset_alias; then \
-- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- fi ; \
- fi
-
Modified: trunk/converters/libiconv/files/patch-lib_Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-lib_Makefile.in 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/files/patch-lib_Makefile.in 2013-11-09 16:39:52 UTC (rev 15571)
@@ -1,16 +1,5 @@
--- lib/Makefile.in.orig 2011-08-07 19:48:03.000000000 +0200
+++ lib/Makefile.in 2011-10-23 22:03:44.000000000 +0200
-@@ -26,8 +26,8 @@
- -Dset_relocation_prefix=libiconv_set_relocation_prefix \
- -Drelocate=libiconv_relocate @DEFS@
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- # Windows resource compiler (windres). Used via libtool.
@@ -50,7 +50,7 @@
# Before making a release, change this according to the libtool documentation,
Property changes on: trunk/converters/libiconv/files/patch-lib_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Deleted: trunk/converters/libiconv/files/patch-libcharset::lib::Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-libcharset::lib::Makefile.in 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/files/patch-libcharset::lib::Makefile.in 2013-11-09 16:39:52 UTC (rev 15571)
@@ -1,13 +0,0 @@
---- libcharset/lib/Makefile.in.orig Thu Jan 30 03:43:59 2003
-+++ libcharset/lib/Makefile.in Tue Oct 14 16:55:29 2003
-@@ -25,8 +25,8 @@
- -Dset_relocation_prefix=libcharset_set_relocation_prefix \
- -Drelocate=libcharset_relocate @DEFS@
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- RM = rm -f
Modified: trunk/converters/libiconv/files/patch-src::Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-src::Makefile.in 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/files/patch-src::Makefile.in 2013-11-09 16:39:52 UTC (rev 15571)
@@ -1,17 +1,14 @@
---- src/Makefile.in.orig 2009-06-21 07:17:33.000000000 -0400
-+++ src/Makefile.in 2009-07-04 19:46:15.000000000 -0400
-@@ -23,8 +23,8 @@
- LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(srcdir) -I.. -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- WINDRES = @WINDRES@
-@@ -113,6 +113,7 @@ install : all force
+--- src/Makefile.in.orig 2011-06-04 19:05:58.000000000 +0200
++++ src/Makefile.in 2013-07-06 18:49:54.000000000 +0200
+@@ -71,7 +71,6 @@
+ # without internationalization and not linked with libintl.
+
+ all : iconv_no_i18n$(EXEEXT) iconv. at OBJEXT@ $(OBJECTS_RES_ at WOE32@)
+- test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
+
+ # This is the temporary iconv executable, without internationalization.
+ iconv_no_i18n$(EXEEXT) : iconv_no_i18n. at OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_ at WOE32@)
+@@ -113,6 +112,7 @@
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
Property changes on: trunk/converters/libiconv/files/patch-src::Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Deleted: trunk/converters/libiconv/files/patch-test::Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-test::Makefile.in 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/files/patch-test::Makefile.in 2013-11-09 16:39:52 UTC (rev 15571)
@@ -1,13 +0,0 @@
---- tests/Makefile.in.orig 2009-08-11 23:52:40.000000000 +0000
-+++ tests/Makefile.in 2009-08-11 23:56:06.000000000 +0000
-@@ -12,8 +12,8 @@
- LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib -I../lib
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- RM = rm -f
Modified: trunk/converters/libiconv/pkg-plist
===================================================================
--- trunk/converters/libiconv/pkg-plist 2013-11-09 16:31:58 UTC (rev 15570)
+++ trunk/converters/libiconv/pkg-plist 2013-11-09 16:39:52 UTC (rev 15571)
@@ -10,7 +10,7 @@
lib/libiconv.la
lib/libiconv.so
lib/libiconv.so.3
-libdata/charset.alias
+lib/charset.alias
%%DOCSDIR%%/iconv.1.html
%%DOCSDIR%%/iconv.3.html
%%DOCSDIR%%/iconv_close.3.html
Property changes on: trunk/converters/libiconv/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list