aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysutils/ciso/Makefile3
-rw-r--r--sysutils/ciso/files/patch-Makefile31
2 files changed, 25 insertions, 9 deletions
diff --git a/sysutils/ciso/Makefile b/sysutils/ciso/Makefile
index cb9d4db4ab80..4aa4d87987d6 100644
--- a/sysutils/ciso/Makefile
+++ b/sysutils/ciso/Makefile
@@ -3,14 +3,13 @@
PORTNAME= ciso
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF
MAINTAINER= blttll@gmail.com
COMMENT= A tool to compress ISO images to CSO format
-
USE_DOS2UNIX= yes
PLIST_FILES= bin/ciso
diff --git a/sysutils/ciso/files/patch-Makefile b/sysutils/ciso/files/patch-Makefile
index 9b84bea8e104..965e529d5996 100644
--- a/sysutils/ciso/files/patch-Makefile
+++ b/sysutils/ciso/files/patch-Makefile
@@ -1,12 +1,29 @@
---- Makefile.orig 2007-11-04 17:49:10.000000000 +0300
-+++ Makefile 2007-11-04 17:50:04.000000000 +0300
-@@ -1,6 +1,6 @@
--DESTDIR =
+--- Makefile.bak 2013-09-12 16:31:40.000000000 +0000
++++ Makefile 2013-09-12 16:33:23.000000000 +0000
+@@ -1,17 +1,19 @@
+-DESTDIR =
-prefix = /usr
-USRBINDIR = $(DESTDIR)$(prefix)/bin
+destdir = ${DESTDIR}
+prefix = ${PREFIX}
+USRBINDIR = $(destdir)$(prefix)/bin
-
- CC = $(CROSS_COMPILE)gcc
- LD = $(CROSS_COMPILE)gcc
+
+-CC = $(CROSS_COMPILE)gcc
+-LD = $(CROSS_COMPILE)gcc
+ INSTALL = install
+
++.if ${CC} == "clang"
++CFLAGS += -Wno-format -Wno-tautological-compare
++.endif
++
+ all : ciso
+ ciso : ciso.o
+- gcc -o ciso ciso.o -lz
++ ${CC} ${CFLAGS} -o ciso ciso.o -lz
+
+ ciso.o : ciso.c
+- gcc -o ciso.o -c ciso.c
++ ${CC} ${CFLAGS} -o ciso.o -c ciso.c
+
+ install :
+ $(INSTALL) -m 755 ciso $(USRBINDIR)/ciso