5 files changed, 61 insertions, 6 deletions

diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile
index c7276476766a..631704812c3e 100644
--- a/arabic/libitl/Makefile
+++ b/arabic/libitl/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	SF/arabeyes/ITL%20Library%20%28${PORTNAME}%29/${PORTNAME}-${PORTVE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API abstraction to common Islamic calculations
 
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/itl
 MAKE_JOBS_UNSAFE=	yes
diff --git a/arabic/libitl/files/patch-Makefile.in b/arabic/libitl/files/patch-Makefile.in
new file mode 100644
index 000000000000..4a9c37310bfa
--- /dev/null
+++ b/arabic/libitl/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	2013-09-25 23:27:38.000000000 +0800
++++ Makefile.in	2013-09-25 23:28:25.000000000 +0800
+@@ -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
new file mode 100644
index 000000000000..60fba829a8af
--- /dev/null
+++ b/arabic/libitl/files/patch-hijri__Makefile
@@ -0,0 +1,16 @@
+--- hijri/Makefile.orig	2013-09-25 23:36:27.000000000 +0800
++++ hijri/Makefile	2013-09-25 23:36:43.000000000 +0800
+@@ -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
new file mode 100644
index 000000000000..d1bb99d170fe
--- /dev/null
+++ b/arabic/libitl/files/patch-prayertime__Makefile
@@ -0,0 +1,16 @@
+--- prayertime/Makefile.orig	2013-09-25 23:35:59.000000000 +0800
++++ prayertime/Makefile	2013-09-25 23:36:20.000000000 +0800
+@@ -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-plist b/arabic/libitl/pkg-plist
index 556739eac686..f5c7313be43b 100644
--- a/arabic/libitl/pkg-plist
+++ b/arabic/libitl/pkg-plist
@@ -1,8 +1,8 @@
-lib/itl/libitl.so.0.0.7
-lib/itl/libitl.so.0
-lib/itl/libitl.so
-lib/itl/libitl.a
-include/itl/prayer.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
 @dirrm lib/itl
 @dirrm include/itl