diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-07-09 20:07:44 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-07-09 20:07:44 +0000 |
| commit | a2b767bd8a378bdac277a1cf0791a3f12b1e8b19 (patch) | |
| tree | 84261547ef2225ea9af89c10946e2b41246b54fd /graphics | |
| parent | 34e6be89da9c791fd75359a4ed77cfc9279aeb80 (diff) | |
Notes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/openjpeg/Makefile | 13 | ||||
| -rw-r--r-- | graphics/openjpeg/distinfo | 6 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-Makefile | 33 |
3 files changed, 27 insertions, 25 deletions
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 41de3f870318..e38b3843af10 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openjpeg -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2 CATEGORIES= graphics MASTER_SITES= http://www.openjpeg.org/ DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/g} @@ -17,19 +16,19 @@ COMMENT= An open-source JPEG 2000 codec USE_GMAKE= yes USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/OpenJPEG +WRKSRC= ${WRKDIR}/trunk PLIST_FILES= include/openjpeg.h \ lib/libopenjpeg.a \ lib/libopenjpeg.so.${SHLIB_VER} \ lib/libopenjpeg.so -SHLIB_VER= 1 +SHLIB_VER= 2 do-install: - ${INSTALL_DATA} ${WRKSRC}/dist/openjpeg.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/dist/libopenjpeg.a ${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/dist/libopenjpeg-1.0.0.so \ + ${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/libopenjpeg.a ${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/libopenjpeg-2.1.2.0.so \ ${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER} cd ${PREFIX}/lib && \ ${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo index 11805dd1e06c..4deec532751f 100644 --- a/graphics/openjpeg/distinfo +++ b/graphics/openjpeg/distinfo @@ -1,3 +1,3 @@ -MD5 (openjpeg_v1_1_1.tar.gz) = 55ce1119efd3efb3d689ca2105afd10e -SHA256 (openjpeg_v1_1_1.tar.gz) = 6076db131bfaa966a691d718044e5b5cdbec028436be3b7a3f146d1a0e3a7ec6 -SIZE (openjpeg_v1_1_1.tar.gz) = 1406460 +MD5 (openjpeg_v1_2.tar.gz) = 4973c564c96683a921a7f6759906da4e +SHA256 (openjpeg_v1_2.tar.gz) = 20294c8aefc15b455abfc8ab73747ac5345a1cbf6f7035dd36ef690d2188e2c4 +SIZE (openjpeg_v1_2.tar.gz) = 929866 diff --git a/graphics/openjpeg/files/patch-Makefile b/graphics/openjpeg/files/patch-Makefile index 75bcc893bf6e..bbccec85f428 100644 --- a/graphics/openjpeg/files/patch-Makefile +++ b/graphics/openjpeg/files/patch-Makefile @@ -1,14 +1,15 @@ ---- Makefile.orig Tue Feb 13 09:49:00 2007 -+++ Makefile Tue Mar 20 22:14:10 2007 -@@ -8,15 +8,13 @@ +--- Makefile.orig Mon Jun 4 15:27:25 2007 ++++ Makefile Wed Jul 4 09:43:14 2007 +@@ -8,17 +8,14 @@ INCLUDE = -Ilibopenjpeg # General configuration variables: -CC = gcc -AR = ar --INSTALLDIR = /usr/lib -+INSTALLDIR = $(PREFIX)/lib +-PREFIX = /usr + INSTALL_LIBDIR = $(PREFIX)/lib + INSTALL_INCLUDE = $(PREFIX)/include # Converts cr/lf to just lf DOS2UNIX = dos2unix @@ -18,16 +19,18 @@ LIBRARIES = -lstdc++ MODULES = $(SRCS:.c=.o) -@@ -54,10 +52,9 @@ - $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) +@@ -58,11 +55,11 @@ - install: -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 -o 0 -g 0 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 -o 0 -g 0 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) -- ldconfig + install: OpenJPEG + install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' +- install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ++ install -m 644 -o 0 -g 0 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)' +- install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ++ install -m 755 -o 0 -g 0 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)' +- install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' ++ install -m 644 -o 0 -g 0 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' + -ldconfig clean: - rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) |