svn commit: r367151 - in head/japanese/libslang: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Wed Sep 3 04:09:20 UTC 2014
Author: vanilla
Date: Wed Sep 3 04:09:19 2014
New Revision: 367151
URL: http://svnweb.freebsd.org/changeset/ports/367151
QAT: https://qat.redports.org/buildarchive/r367151/
Log:
Support STAGEDIR.
PR: ports/193159
Submitted by: Ports Fury.
Added:
head/japanese/libslang/files/patch-autoconf__Makefile.in
- copied unchanged from r367139, head/japanese/libslang/files/patch-ac
head/japanese/libslang/files/patch-configure
- copied unchanged from r367139, head/japanese/libslang/files/patch-aa
head/japanese/libslang/files/patch-src__Makefile.in
- copied, changed from r367139, head/japanese/libslang/files/patch-ad
Deleted:
head/japanese/libslang/files/patch-aa
head/japanese/libslang/files/patch-ac
head/japanese/libslang/files/patch-ad
Modified:
head/japanese/libslang/Makefile
head/japanese/libslang/pkg-plist
Modified: head/japanese/libslang/Makefile
==============================================================================
--- head/japanese/libslang/Makefile Wed Sep 3 03:53:43 2014 (r367150)
+++ head/japanese/libslang/Makefile Wed Sep 3 04:09:19 2014 (r367151)
@@ -3,19 +3,17 @@
PORTNAME= libslang
PORTVERSION= ${VERSION}.j${JP_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese devel
MASTER_SITES= http://www.emaillab.org/mutt/tools/ \
- http://my.reset.jp/~iwashita/mutt/distfiles/ \
- http://www.actweb.ne.jp/k-yosino/
+ http://my.reset.jp/~iwashita/mutt/distfiles/
DISTNAME= slang-${VERSION}jp${JP_VERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= Library permits a programmer to develop software
-CONFLICTS= libslang2-[0-9]* libslang-1.*[^j]*
-
-VERSION= 1.4.5
-JP_VERSION= 2
+LICENSE= ART10 GPLv2
+LICENSE_COMB= dual
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang
@@ -24,8 +22,18 @@ INSTALL_TARGET= install-elf
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
-NO_STAGE= yes
+CONFLICTS= libslang2-[0-9]* libslang-1.*[^j]*
+
+DOCSDIR= ${PREFIX}/share/doc/slang
+
+OPTIONS_DEFINE= DOCS
+
+VERSION= 1.4.5
+JP_VERSION= 2
+
post-install:
- ${INSTALL_DATA} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
+ (cd ${WRKSRC} && ${INSTALL_DATA} slang-j.doc \
+ ${STAGEDIR}${DOCSDIR})
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libslang.so.[0-9]*
.include <bsd.port.mk>
Copied: head/japanese/libslang/files/patch-autoconf__Makefile.in (from r367139, head/japanese/libslang/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/libslang/files/patch-autoconf__Makefile.in Wed Sep 3 04:09:19 2014 (r367151, copy of r367139, head/japanese/libslang/files/patch-ac)
@@ -0,0 +1,28 @@
+--- autoconf/Makefile.in.orig Thu Feb 21 20:10:02 2002
++++ autoconf/Makefile.in Tue May 7 00:56:06 2002
+@@ -10,7 +10,7 @@
+ cd src; $(MAKE) all
+ elf:
+ cd src; $(MAKE) elf
+- @echo Use make install-elf to install it.
++
+ runtests:
+ cd src; $(MAKE) runtests
+ demos:
+@@ -23,15 +23,7 @@
+ cd src; $(MAKE) install
+ install-elf:
+ cd src; $(MAKE) install-elf
+- @echo ""
+- @echo "Although not required, consider doing 'make install-links' to extra links"
+- @echo "On some systems, e.g., linux, you will also have to run ldconfig."
+- @echo ""
+-install-links:
+- cd src; $(MAKE) install-links
+- @echo ""
+- @echo "You may also have to run ldconfig to complete the installation."
+- @echo ""
++
+ #
+ distclean:
+ /bin/rm -f *~ Makefile config.status config.log config.cache files.pck
Copied: head/japanese/libslang/files/patch-configure (from r367139, head/japanese/libslang/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/libslang/files/patch-configure Wed Sep 3 04:09:19 2014 (r367151, copy of r367139, head/japanese/libslang/files/patch-aa)
@@ -0,0 +1,63 @@
+--- configure.orig Thu Feb 21 20:10:02 2002
++++ configure Tue May 7 00:40:04 2002
+@@ -1832,8 +1832,8 @@
+ #define HAVE_DLFCN_H 1
+ EOF
+
+- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1837: checking for dlopen in -ldl" >&5
++ echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "configure:1837: checking for dlopen" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1868,7 +1868,7 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+- DYNAMIC_LINK_LIB="-ldl"
++ DYNAMIC_LINK_LIB=""
+ cat >> confdefs.h <<\EOF
+ #define HAVE_DLOPEN 1
+ EOF
+@@ -1943,7 +1943,7 @@
+
+ ELFLIB="lib\$(THIS_LIB).so"
+ ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
+-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
++ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
+
+ case "$host_os" in
+ *linux* )
+@@ -2032,6 +2036,12 @@
+ ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
+ ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
+ ;;
++ *freebsd* )
++ ELF_CC="\$(CC)"
++ ELF_CFLAGS="\$(CFLAGS) -fPIC"
++ ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
++ ELF_LINK_CMD="\$(ELF_LINK)"
++ ;;
+ * )
+ echo "Note: ELF compiler for host_os=$host_os may be wrong"
+ ELF_CC="$CC"
+@@ -2432,16 +2449,8 @@
+
+ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
+ echo "configure:2435: checking SLANG_VERSION" >&5
+-slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h |
+- awk '{ print $3 }'`
+-slang_major_version=`echo $slang_version |
+- awk '{ print int($1/10000) }'`
+-slang_minor_version=`echo $slang_version $slang_major_version |
+- awk '{ print int(($1 - $2*10000)/100) }'`
+-slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
+- awk '{ print ($1 - $2*10000 - $3*100) }'`
+-
+-slang_minor_version="$slang_minor_version.$slang_mminor_version"
++slang_major_version=2
++slang_minor_version=5
+ slang_version="$slang_major_version.$slang_minor_version"
+ echo "$ac_t""$slang_version" 1>&6
+
Copied and modified: head/japanese/libslang/files/patch-src__Makefile.in (from r367139, head/japanese/libslang/files/patch-ad)
==============================================================================
--- head/japanese/libslang/files/patch-ad Wed Sep 3 00:54:37 2014 (r367139, copy source)
+++ head/japanese/libslang/files/patch-src__Makefile.in Wed Sep 3 04:09:19 2014 (r367151)
@@ -1,11 +1,21 @@
--- src/Makefile.in.orig Tue May 7 00:20:07 2002
+++ src/Makefile.in Tue May 7 00:21:34 2002
-@@ -38,7 +38,7 @@
+@@ -38,8 +38,8 @@
exec_prefix = @exec_prefix@
install_lib_dir = @libdir@
install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang
+-DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
+install_doc_dir = $(prefix)/share/doc/slang
- DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
++DOC_FILES = ../changes.txt ../COPYING ../doc/slangdoc.html ../doc/text/*.txt
MODULE_INSTALL_DIR = @libdir@/slang/modules
#---------------------------------------------------------------------------
+ # DESTDIR is designed to facilitate making packages. Normally it is empty
+@@ -150,7 +150,6 @@
+ $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
+ $(INSTALL_DATA) $(SRCDIR)/slkanji.h $(DEST_INCDIR)
+ install_docs: $(DEST_DOCDIR)
+- $(INSTALL_DATA) $(DOC_FILES) $(install_doc_dir)/
+ @for i in $(DOC_FILES); \
+ do \
+ echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
Modified: head/japanese/libslang/pkg-plist
==============================================================================
--- head/japanese/libslang/pkg-plist Wed Sep 3 03:53:43 2014 (r367150)
+++ head/japanese/libslang/pkg-plist Wed Sep 3 04:09:19 2014 (r367151)
@@ -1,19 +1,16 @@
-lib/libslang.a
-lib/libslang.so
-lib/libslang.so.2
include/slang/slang.h
include/slang/slcurses.h
include/slang/slkanji.h
+lib/libslang.a
+lib/libslang.so
+lib/libslang.so.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/cref.txt
+%%PORTDOCS%%%%DOCSDIR%%/cslang.txt
+%%PORTDOCS%%%%DOCSDIR%%/slang.txt
+%%PORTDOCS%%%%DOCSDIR%%/slangdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/slangfun.txt
+%%PORTDOCS%%%%DOCSDIR%%/slang-j.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/slang
-share/doc/slang/COPYING
-share/doc/slang/COPYING.ART
-share/doc/slang/COPYING.GPL
-share/doc/slang/COPYRIGHT
-share/doc/slang/changes.txt
-share/doc/slang/cref.txt
-share/doc/slang/cslang.txt
-share/doc/slang/slang.txt
-share/doc/slang/slangdoc.html
-share/doc/slang/slangfun.txt
-share/doc/slang/slang-j.doc
- at dirrm share/doc/slang
More information about the svn-ports-head
mailing list