From bfe7fad3f4d1c4c0e36c5e5506c5cd12076b0ae6 Mon Sep 17 00:00:00 2001 From: "Carlos J. Puga Medina" Date: Sat, 9 Dec 2017 17:35:51 +0000 Subject: - Update to 0.8.0 - Switch to USE_GITHUB - Switch to USES=cmake - Drop unneeded patches - Add DOCS option - Update comment and WWW in pkg-descr - Take maintainership Changelog: https://github.com/arabeyes-org/ITL/releases/tag/v0.8.0 PR: 221766 Submitted by: cpm --- arabic/libitl/Makefile | 30 +++++++++++++++------------ arabic/libitl/distinfo | 5 +++-- arabic/libitl/files/patch-CMakeLists.txt | 24 +++++++++++++++++++++ arabic/libitl/files/patch-Makefile.in | 24 --------------------- arabic/libitl/files/patch-hijri_Makefile | 16 -------------- arabic/libitl/files/patch-prayertime_Makefile | 16 -------------- arabic/libitl/pkg-descr | 15 +++++++++----- arabic/libitl/pkg-plist | 4 +++- 8 files changed, 57 insertions(+), 77 deletions(-) create mode 100644 arabic/libitl/files/patch-CMakeLists.txt delete mode 100644 arabic/libitl/files/patch-Makefile.in delete mode 100644 arabic/libitl/files/patch-hijri_Makefile delete mode 100644 arabic/libitl/files/patch-prayertime_Makefile (limited to 'arabic') diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile index a49d3b9ecb6e..5ce34db75ce8 100644 --- a/arabic/libitl/Makefile +++ b/arabic/libitl/Makefile @@ -2,26 +2,30 @@ # $FreeBSD$ PORTNAME= libitl -PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTVERSION= 0.8.0 +DISTVERSIONPREFIX= v CATEGORIES= arabic -MASTER_SITES= SF/arabeyes/ITL%20Library%20%28${PORTNAME}%29/${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cpm@FreeBSD.org COMMENT= API abstraction to common Islamic calculations LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/lib/itl -MAKE_JOBS_UNSAFE= yes +USES= cmake pkgconfig +USE_LDCONFIG= yes -post-install: -.for f in libitl.so libitl.so.0 - ${RM} ${STAGEDIR}${PREFIX}/lib/itl/$f - ${LN} -s libitl.so.0.0.7 ${STAGEDIR}${PREFIX}/lib/itl/$f -.endfor - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/itl/libitl.so +USE_GITHUB= yes +GH_ACCOUNT= arabeyes-org +GH_PROJECT= ITL +GH_TAGNAME= f8f41cc + +PORTDOCS= * + +OPTIONS_DEFINE= DOCS + +post-install-DOCS-on: + (cd ${WRKSRC}/new_method/references && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/arabic/libitl/distinfo b/arabic/libitl/distinfo index 9fd16278a1da..d80007db6bc3 100644 --- a/arabic/libitl/distinfo +++ b/arabic/libitl/distinfo @@ -1,2 +1,3 @@ -SHA256 (libitl-0.7.0.tar.gz) = 351a280bebe69b0aa4681c32288a48574407ac3e3a8f273c2be330ac20edce00 -SIZE (libitl-0.7.0.tar.gz) = 135700 +TIMESTAMP = 1509667607 +SHA256 (arabeyes-org-ITL-v0.8.0-f8f41cc_GH0.tar.gz) = cf113a7b963469e2cf56d3b9e9d7cae18c79ac55ab1faa8b4464aad3dc1a4234 +SIZE (arabeyes-org-ITL-v0.8.0-f8f41cc_GH0.tar.gz) = 1233648 diff --git a/arabic/libitl/files/patch-CMakeLists.txt b/arabic/libitl/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d29157f0faa3 --- /dev/null +++ b/arabic/libitl/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2017-10-31 20:26:09 UTC ++++ CMakeLists.txt +@@ -12,7 +12,7 @@ set(LIBRARY_VERSION_FULL "${LIBRARY_VERS + message( "Installation target directory is: " ${CMAKE_INSTALL_PREFIX} ) + message( "To override this value, use 'make -DCMAKE_INSTALL_PREFIX=$DIR'" ) + +-set( COMPILE_FLAGS "-ansi -pedantic -Wall -O2" ) ++set( COMPILE_FLAGS "-pedantic -Wall -O2" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_FLAGS}" ) + + # Specify header files +@@ -43,9 +43,9 @@ set(VERSION "${LIBRARY_VERSION_FULL}") + configure_file("libitl.pc.in" "libitl.pc" @ONLY) + + install( FILES ${HEADER_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/itl" ) +-install( TARGETS itl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +-install( TARGETS itlShared DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +-install(FILES "libitl.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) ++install( TARGETS itl DESTINATION ${CMAKE_INSTALL_LIBDIR}/itl ) ++install( TARGETS itlShared DESTINATION ${CMAKE_INSTALL_LIBDIR}/itl ) ++install(FILES "libitl.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/) + + # Specify executables + add_executable( demo_hijri hijri/demo_hijri.c ) diff --git a/arabic/libitl/files/patch-Makefile.in b/arabic/libitl/files/patch-Makefile.in deleted file mode 100644 index 511fc45c615a..000000000000 --- a/arabic/libitl/files/patch-Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.in.orig 2009-03-17 16:26:28 UTC -+++ Makefile.in -@@ -83,15 +83,15 @@ debinstall: components - - install: build/libitl.so build/libitl.a - @echo "==> Installing libitl library..." -- test -d $(PREFIX)/lib/itl \ -- || install -d $(PREFIX)/lib/itl \ -+ test -d $(DESTDIR)$(PREFIX)/lib/itl \ -+ || install -d $(DESTDIR)$(PREFIX)/lib/itl \ - || exit 1; -- install build/$(FULLNAME) $(PREFIX)/lib/itl -- install build/libitl.a $(PREFIX)/lib/itl -+ install build/$(FULLNAME) $(DESTDIR)$(PREFIX)/lib/itl -+ install build/libitl.a $(DESTDIR)$(PREFIX)/lib/itl - # Using cp -P as cp --no-dereference is not POSIX - # or use --preserve=link instead. -- cp -P build/$(SONAME) $(PREFIX)/lib/itl -- cp -P build/libitl.so $(PREFIX)/lib/itl -+ cp -P build/$(SONAME) $(DESTDIR)$(PREFIX)/lib/itl -+ cp -P build/libitl.so $(DESTDIR)$(PREFIX)/lib/itl - @echo "==> Installing ITL components..." - for i in $(COMPONENTS); do \ - $(MAKE) -C $$i install || exit 1; \ diff --git a/arabic/libitl/files/patch-hijri_Makefile b/arabic/libitl/files/patch-hijri_Makefile deleted file mode 100644 index 4a41aa88c035..000000000000 --- a/arabic/libitl/files/patch-hijri_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- hijri/Makefile.orig 2006-09-21 16:34:31 UTC -+++ hijri/Makefile -@@ -10,10 +10,10 @@ demo_hijri: - - install: all - @echo "==> Installing hijri component..." -- test -d $(PREFIX)/include/itl \ -- || install -d $(PREFIX)/include/itl \ -+ test -d $(DESTDIR)$(PREFIX)/include/itl \ -+ || install -d $(DESTDIR)$(PREFIX)/include/itl \ - || exit 1; -- install src/hijri.h $(PREFIX)/include/itl -+ install src/hijri.h $(DESTDIR)$(PREFIX)/include/itl - - uninstall: - @echo "==> Uninstalling hijri component..." diff --git a/arabic/libitl/files/patch-prayertime_Makefile b/arabic/libitl/files/patch-prayertime_Makefile deleted file mode 100644 index 632f656f50fb..000000000000 --- a/arabic/libitl/files/patch-prayertime_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- prayertime/Makefile.orig 2006-09-21 16:37:51 UTC -+++ prayertime/Makefile -@@ -10,10 +10,10 @@ demo_prayer: - - install: all - @echo "==> Installing prayertime component..." -- test -d $(PREFIX)/include/itl \ -- || install $(PREFIX)/include/itl \ -+ test -d $(DESTDIR)$(PREFIX)/include/itl \ -+ || install $(DESTDIR)$(PREFIX)/include/itl \ - || exit 1; -- install src/prayer.h $(PREFIX)/include/itl -+ install src/prayer.h $(DESTDIR)$(PREFIX)/include/itl - - uninstall: - @echo "==> Uninstalling prayertime component..." diff --git a/arabic/libitl/pkg-descr b/arabic/libitl/pkg-descr index e57cd3eaebf4..3c03777922ed 100644 --- a/arabic/libitl/pkg-descr +++ b/arabic/libitl/pkg-descr @@ -1,5 +1,10 @@ -The Islamic Tools and Libraries (ITL) is a project to provide a -plethora of useful Islamic tools and applications as well as a -comprehensive feature-full Islam-centric library. The ITL -project currently includes full lunar-centric time measurement -routines. +The Islamic Tools and Libraries (ITL) project provides a fully +featured library for performing common Islamic calculations. + +ITL is currently composed of two library-modules: + +* prayertime: Geographically-aware prayer time and Qibla calculation + routines. +* hijri: Hijri date generation/calculation and conversion routines. + +WWW: https://github.com/arabeyes-org/ITL diff --git a/arabic/libitl/pkg-plist b/arabic/libitl/pkg-plist index c5c6ba39fc7e..7ce6426336c8 100644 --- a/arabic/libitl/pkg-plist +++ b/arabic/libitl/pkg-plist @@ -1,6 +1,8 @@ +include/itl/astro.h include/itl/hijri.h include/itl/prayer.h lib/itl/libitl.a lib/itl/libitl.so lib/itl/libitl.so.0 -lib/itl/libitl.so.0.0.7 +lib/itl/libitl.so.0.1.8 +libdata/pkgconfig/libitl.pc -- cgit v1.2.3