mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 01:56:37 -04:00
284d283afe
- Replace PERL with REINPLACE_CMD in post-patch.
- Replace "iconv.h" with "${ICONV_PREFIX}/include/iconv.h" so
/usr/include/iconv.h is included on FreeBSD 10 even when
converters/iconv is installed. The port uses iconvctl(3) which
isn't declared in /usr/local/include/iconv.h with -DLIBICONV_PLUG.
- files/patch-lib-error.c: Implement program_name using __progname.
- files/patch-libiconv-Makefile.in: deleted because the libiconv
directory isn't built.
- files/patch-src-Makefile.in:
+ Remove chunks that aren't needed.
+ Remove ../lib/libreco.a from LIBS so CFLAGS+=-fPIC can be removed
from the port Makefile. Instead, just copy lib/error.c (the only
file needed from libreco.a) to src/error.c and compile it into
librecode.so.
PR: 186637
Approved by: demon (maintainer)
23 lines
1.1 KiB
Text
23 lines
1.1 KiB
Text
--- src/Makefile.in
|
|
+++ src/Makefile.in
|
|
@@ -131,9 +131,9 @@ L_SURFACES =
|
|
|
|
librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
|
|
|
|
-librecode_la_LDFLAGS = -version-info 0:0:0
|
|
+librecode_la_LDFLAGS = -version-info 3:6:0
|
|
|
|
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
|
|
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(prefix)/include
|
|
DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
|
|
|
|
ETAGS_ARGS = $(L_STEPS)
|
|
@@ -157,7 +157,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
|
|
ANSI2KNR = @ANSI2KNR@
|
|
librecode_la_LIBADD =
|
|
librecode_la_OBJECTS = argmatch$U.lo charname$U.lo combine$U.lo \
|
|
-fr-charname$U.lo hash$U.lo iconv$U.lo libiconv$U.lo localcharset$U.lo \
|
|
+fr-charname$U.lo hash$U.lo error$U.lo libiconv$U.lo localcharset$U.lo \
|
|
merged$U.lo names$U.lo outer$U.lo quotearg$U.lo recode$U.lo \
|
|
request$U.lo strip-pool$U.lo task$U.lo xmalloc$U.lo african$U.lo \
|
|
afrtran$U.lo applemac$U.lo atarist$U.lo bangbang$U.lo cdcnos$U.lo \
|