summaryrefslogtreecommitdiff
path: root/archivers/libarc
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-09-27 15:11:53 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-09-27 15:11:53 +0000
commit8b651ffa5f5881a31cf11c3ff0fafe4ceff20ecb (patch)
tree92b60a1e757bdf2023a6706484c4c68742d63a61 /archivers/libarc
parentUpdate to 1.3.2 and Add Hayate X Blade. (diff)
Cleanup a bit: Move install-logic into Makefile instead of patching it into port.
Drop static lib while here.
Notes
Notes: svn path=/head/; revision=143631
Diffstat (limited to 'archivers/libarc')
-rw-r--r--archivers/libarc/Makefile14
-rw-r--r--archivers/libarc/files/patch-aa23
-rw-r--r--archivers/libarc/pkg-plist1
3 files changed, 14 insertions, 24 deletions
diff --git a/archivers/libarc/Makefile b/archivers/libarc/Makefile
index 3b7c7ee12b70..e85be38bed34 100644
--- a/archivers/libarc/Makefile
+++ b/archivers/libarc/Makefile
@@ -14,8 +14,20 @@ MASTER_SITES= http://www.onicos.com/staff/iz/release/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tiny C decompression library for several popular compression formats
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I." PREFIX="${PREFIX}" LN="${LN} -sf"
+SOLIB= libarc.so
+SOVERSION= 1
+
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I." LN="${LN} -sf" \
+ SOLIB="${SOLIB}" SOVERSION="${SOVERSION}"
INSTALLS_SHLIB= yes
+do-install:
+ $(INSTALL_PROGRAM) ${WRKSRC}/arccat $(PREFIX)/bin
+ $(INSTALL_PROGRAM) ${WRKSRC}/$(SOLIB).$(SOVERSION) $(PREFIX)/lib
+ $(LN) -sf $(PREFIX)/lib/$(SOLIB).$(SOVERSION) $(PREFIX)/lib/$(SOLIB)
+ @${MKDIR} ${PREFIX}/include/libarc
+ ${INSTALL_DATA} ${WRKSRC}/libarc/* ${PREFIX}/include/libarc
+ (cd ${WRKSRC} && $(INSTALL_DATA) unlzh.h zip.h $(PREFIX)/include/libarc)
+
.include <bsd.port.mk>
diff --git a/archivers/libarc/files/patch-aa b/archivers/libarc/files/patch-aa
index cb6a3074330c..6601419ad2df 100644
--- a/archivers/libarc/files/patch-aa
+++ b/archivers/libarc/files/patch-aa
@@ -1,6 +1,6 @@
--- Makefile Tue Jun 13 07:21:19 2000
+++ Makefile Tue Jun 20 17:44:24 2000
-@@ -14,29 +15,43 @@
+@@ -14,20 +15,30 @@
url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \
arc_mime.o
@@ -9,8 +9,6 @@
# readdir_win.o (for Windows)
LIB=libarc.a
-+SOLIB=libarc.so
-+SOVERSION?=1
-
-all:: $(LIB)
@@ -33,25 +31,6 @@
- $(RM) $(LIB) *.o arccat *~ libarc/*~
+ $(RM) $(LIB) $(SOLIB).$(SOVERSION) *.o *.so arccat *~ libarc/*~
--install::
-- test -d $(PREFIX)/lib || mkdir -p $(PREFIX)/lib
-- $(INSTALL) -m 444 $(LIB) $(PREFIX)/lib
-- $(RANLIB) $(PREFIX)/lib/$(LIB)
-+install:: all
-+ $(BSD_INSTALL_PROGRAM) arccat $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) $(SOLIB).$(SOVERSION) $(PREFIX)/lib
-+ $(LN) $(PREFIX)/lib/$(SOLIB).$(SOVERSION) $(PREFIX)/lib/$(SOLIB)
-+ $(BSD_INSTALL_DATA) $(LIB) $(PREFIX)/lib
- test -d $(PREFIX)/include/libarc || mkdir -p $(PREFIX)/include/libarc
-- $(INSTALL) -m 444 libarc/url.h $(PREFIX)/include/libarc
-- $(INSTALL) -m 444 libarc/arc.h $(PREFIX)/include/libarc
-- $(INSTALL) -m 444 libarc/mblock.h $(PREFIX)/include/libarc
-- $(INSTALL) -m 444 libarc/memb.h $(PREFIX)/include/libarc
-+ $(BSD_INSTALL_DATA) libarc/url.h $(PREFIX)/include/libarc
-+ $(BSD_INSTALL_DATA) libarc/arc.h $(PREFIX)/include/libarc
-+ $(BSD_INSTALL_DATA) libarc/mblock.h $(PREFIX)/include/libarc
-+ $(BSD_INSTALL_DATA) libarc/memb.h $(PREFIX)/include/libarc
-+ $(BSD_INSTALL_DATA) unlzh.h zip.h $(PREFIX)/include/libarc
+
+.SUFFIXES: .so .c
+
diff --git a/archivers/libarc/pkg-plist b/archivers/libarc/pkg-plist
index 75a6809d26d9..9711d8c38db5 100644
--- a/archivers/libarc/pkg-plist
+++ b/archivers/libarc/pkg-plist
@@ -5,7 +5,6 @@ include/libarc/memb.h
include/libarc/unlzh.h
include/libarc/url.h
include/libarc/zip.h
-lib/libarc.a
lib/libarc.so
lib/libarc.so.1
@dirrm include/libarc