diff options
Diffstat (limited to 'graphics/libraw')
-rw-r--r-- | graphics/libraw/Makefile | 7 | ||||
-rw-r--r-- | graphics/libraw/files/extra-patch-Makefile.in | 31 | ||||
-rw-r--r-- | graphics/libraw/pkg-plist | 2 |
3 files changed, 7 insertions, 33 deletions
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 1be81a38e38c..2d53a65163ca 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -7,6 +7,7 @@ PORTNAME= libraw PORTVERSION= 0.13.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libraw.su/data/ DISTNAME= LibRaw-${PORTVERSION} @@ -82,14 +83,16 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/lib/${f} ${PREFIX}/lib .endfor -.if defined(WITH_SHARED_LIBS) .for f in libraw.so.2 libraw_r.so.2 @${INSTALL_DATA} ${WRKSRC}/lib/.libs/${f} ${PREFIX}/lib .endfor .for f in libraw libraw_r @ cd ${PREFIX}/lib ; ${LN} -sf ${f}.so.0 ${f}.so .endfor -.endif + +.for f in libraw.pc libraw_r.pc + @${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig +.endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/graphics/libraw/files/extra-patch-Makefile.in b/graphics/libraw/files/extra-patch-Makefile.in deleted file mode 100644 index 16594e4783ae..000000000000 --- a/graphics/libraw/files/extra-patch-Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.in.orig 2011-01-08 21:10:58.000000000 +0300 -+++ Makefile.in 2011-01-08 21:17:49.000000000 +0300 -@@ -297,7 +297,7 @@ - pkgconfig_DATA = libraw.pc libraw_r.pc - - # Libraries --lib_LIBRARIES = lib/libraw.a lib/libraw_r.a -+lib_LIBRARIES = lib/libraw.a lib/libraw_r.a lib/libraw.so.0 lib/libraw_r.so.0 - lib_libraw_a_CPPFLAGS = -DLIBRAW_NOTHREADS -w - lib_libraw_a_SOURCES = internal/dcraw_common.cpp \ - internal/dcraw_fileio.cpp \ -@@ -435,6 +435,9 @@ - -rm -f lib/libraw.a - $(lib_libraw_a_AR) lib/libraw.a $(lib_libraw_a_OBJECTS) $(lib_libraw_a_LIBADD) - $(RANLIB) lib/libraw.a -+lib/libraw.so.0: $(lib_libraw_a_OBJECTS) $(lib_libraw_a_DEPENDENCIES) lib/$(am__dirstamp) -+ -rm -f lib/libraw.so.0 -+ $(CC) $(CFLAGS) -shared -Wl,-soname,libraw.so.0 -o lib/libraw.so.0 $(lib_libraw_r_a_OBJECTS) - internal/lib_libraw_r_a-dcraw_common.$(OBJEXT): \ - internal/$(am__dirstamp) internal/$(DEPDIR)/$(am__dirstamp) - internal/lib_libraw_r_a-dcraw_fileio.$(OBJEXT): \ -@@ -449,6 +452,9 @@ - -rm -f lib/libraw_r.a - $(lib_libraw_r_a_AR) lib/libraw_r.a $(lib_libraw_r_a_OBJECTS) $(lib_libraw_r_a_LIBADD) - $(RANLIB) lib/libraw_r.a -+lib/libraw_r.so.0: $(lib_libraw_r_a_OBJECTS) $(lib_libraw_r_a_DEPENDENCIES) lib/$(am__dirstamp) -+ -rm -f lib/libraw_r.so.0 -+ $(CC) $(CFLAGS) -shared -Wl,-soname,libraw_r.so.0 -o lib/libraw_r.so.0 $(lib_libraw_r_a_OBJECTS) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" diff --git a/graphics/libraw/pkg-plist b/graphics/libraw/pkg-plist index 9b009a447a34..2916f123ecef 100644 --- a/graphics/libraw/pkg-plist +++ b/graphics/libraw/pkg-plist @@ -11,4 +11,6 @@ lib/libraw.so.2 lib/libraw_r.a lib/libraw_r.so lib/libraw_r.so.2 +libdata/pkgconfig/libraw.pc +libdata/pkgconfig/libraw_r.pc @dirrm include/libraw |