From 1a5dc578e4c7f6138ef9f875de44558da3fb44b4 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 5 Aug 2010 15:30:18 +0000 Subject: [PATCH] - Update to 0.0.11 - While here, use DATADIR and LDFLAGS instead of LIBS as intended. PR: 148747 Submitted by: Hyogeol Lee (maintainer) --- korean/libhangul/Makefile | 6 +++--- korean/libhangul/distinfo | 6 +++--- korean/libhangul/files/patch-Makefile.in | 14 +++++++------- korean/libhangul/files/patch-test | 17 +++++++++-------- korean/libhangul/pkg-plist | 6 +++--- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile index 683240672798..1a284884e5e0 100644 --- a/korean/libhangul/Makefile +++ b/korean/libhangul/Makefile @@ -6,9 +6,9 @@ # PORTNAME= libhangul -PORTVERSION= 0.0.10 +PORTVERSION= 0.0.11 CATEGORIES= korean -MASTER_SITES= http://kldp.net/frs/download.php/5417/ +MASTER_SITES= http://kldp.net/frs/download.php/5758/ MAINTAINER= hyogeollee@gmail.com COMMENT= A library for hangul processing @@ -16,6 +16,6 @@ COMMENT= A library for hangul processing USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .include diff --git a/korean/libhangul/distinfo b/korean/libhangul/distinfo index 2dda358558be..ff5e41ce6b82 100644 --- a/korean/libhangul/distinfo +++ b/korean/libhangul/distinfo @@ -1,3 +1,3 @@ -MD5 (libhangul-0.0.10.tar.gz) = 696299109b86490c25989a539a0f9879 -SHA256 (libhangul-0.0.10.tar.gz) = af0722012632ab2afc2016aa6643bd6979e140facc56a911a5a45f97fe61d4c5 -SIZE (libhangul-0.0.10.tar.gz) = 2828525 +MD5 (libhangul-0.0.11.tar.gz) = d461957c45e4b0db64b146befcabd4ae +SHA256 (libhangul-0.0.11.tar.gz) = 1aae2175068ca1509c21e300a6b2f3d7863d6c9363e70fe12192097366ad3467 +SIZE (libhangul-0.0.11.tar.gz) = 2802965 diff --git a/korean/libhangul/files/patch-Makefile.in b/korean/libhangul/files/patch-Makefile.in index a39824fbbd02..2a0dbd963cef 100644 --- a/korean/libhangul/files/patch-Makefile.in +++ b/korean/libhangul/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2009-01-06 21:00:36.000000000 +0900 -+++ Makefile.in 2009-01-06 20:43:42.000000000 +0900 -@@ -191,7 +191,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- Makefile.in.orig 2010-07-19 10:36:58.000000000 +0900 ++++ Makefile.in 2010-07-19 10:43:08.000000000 +0900 +@@ -245,7 +245,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = hangul data test -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = libhangul.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + EXTRA_DIST = \ + doc/Makefile \ diff --git a/korean/libhangul/files/patch-test b/korean/libhangul/files/patch-test index b08a4d8d7c41..95efce76e054 100644 --- a/korean/libhangul/files/patch-test +++ b/korean/libhangul/files/patch-test @@ -1,14 +1,15 @@ ---- test/Makefile.in.orig 2009-01-06 21:01:57.000000000 +0900 -+++ test/Makefile.in 2009-01-06 20:49:06.000000000 +0900 -@@ -184,9 +184,11 @@ +--- test/Makefile.in.orig 2010-07-19 10:37:07.000000000 +0900 ++++ test/Makefile.in 2010-07-19 10:33:53.000000000 +0900 +@@ -205,10 +205,10 @@ + top_srcdir = @top_srcdir@ hangul_CFLAGS = hangul_SOURCES = hangul.c - hangul_LDADD = ../hangul/libhangul.la -+hangul_LDFLAGS = -liconv +-hangul_LDADD = ../hangul/libhangul.la ++hangul_LDADD = ../hangul/libhangul.la -liconv hanja_CFLAGS = hanja_SOURCES = hanja.c - hanja_LDADD = ../hangul/libhangul.la -+hanja_LDFLAGS = -liconv - TESTS = test +-hanja_LDADD = ../hangul/libhangul.la ++hanja_LDADD = ../hangul/libhangul.la -liconv test_SOURCES = test.c ../hangul/hangul.h test_CFLAGS = @CHECK_CFLAGS@ + test_LDADD = @CHECK_LIBS@ $(top_builddir)/hangul/libhangul.la diff --git a/korean/libhangul/pkg-plist b/korean/libhangul/pkg-plist index bc166fd5d908..46c2ba2faaac 100644 --- a/korean/libhangul/pkg-plist +++ b/korean/libhangul/pkg-plist @@ -4,7 +4,7 @@ lib/libhangul.la lib/libhangul.so lib/libhangul.so.1 libdata/pkgconfig/libhangul.pc -share/libhangul/hanja/hanja.txt -@dirrm share/libhangul/hanja -@dirrm share/libhangul +%%DATADIR%%/hanja/hanja.txt +@dirrm %%DATADIR%%/hanja +@dirrm %%DATADIR%% @dirrm include/hangul-1.0