cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Mark SHARED_ONLY as Gimp uses plugins and merge PFRAG.shared into the PLIST

Browse Source 
- Sync WANTLIB
- Remove use of CONFIGURE_SHARED since this is SHARED_ONLY anyway
- Remove unnecessary patching for the autoconf script and pkg-config files

From giovanni@

- Enable the PostScript plugin
- Update distinfo

ok giovanni@
This commit is contained in:
brad 2012-09-27 00:17:51 +00:00
parent 29619e6f6d
commit 2d97f3865e
7 changed files with 40 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
graphics/gimp/stable/Makefile
View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.81 2012/07/16 09:42:24 giovanni Exp $
# $OpenBSD: Makefile,v 1.82 2012/09/27 00:17:51 brad Exp $
COMMENT= GNU Image Manipulation Program
SHARED_ONLY= Yes
DISTNAME= gimp-2.8.0
REVISION= 1
REVISION= 2
SHARED_LIBS+= gimp-2.0 272.0 # 800.0
SHARED_LIBS+= gimpbase-2.0 272.0 # 800.0
@ -39,6 +41,7 @@ LIB_DEPENDS= x11/gtk+2 \
graphics/libmng \
graphics/tiff \
graphics/libwmf \
print/ghostscript/gnu \
print/poppler \
graphics/gegl>=0.2 \
graphics/openjpeg \
@ -53,7 +56,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xmu Xpm Xrender Xt atk-1.0 c \
Xcomposite Xdamage pcre crypto idn ssl \
fontconfig freetype glib-2.0 gmodule-2.0 \
gobject-2.0 jpeg>=62 lcms>=1 m pango-1.0 \
gobject-2.0 jpeg>=62 lcms lcms2 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1 png>=4 \
pthread ncurses xml2 z cairo dbus-1 \
Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr \
@ -64,7 +67,8 @@ WANTLIB= ICE SM X11 Xext Xmu Xpm Xrender Xt atk-1.0 c \
gtk-x11-2.0 tiff>=35 aa>=1.3 dbus-glib-1 \
exif mng poppler>=3 wmf-0.2 wmflite-0.2 \
poppler-glib>=3 gegl-0.2 openjpeg>=4 curl \
GL Xxf86vm drm xcb-shm ffi stdc++
GL Xxf86vm drm xcb-shm ffi stdc++ harfbuzz \
icudata icule icuuc
MODULES= devel/gettext \
textproc/intltool \
@ -73,11 +77,15 @@ MODULES= devel/gettext \
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+=--without-gvfs \
CONFIGURE_ARGS+=--enable-gimp-console \
--with-libcurl \
--without-webkit --enable-gimp-console
--without-gvfs \
--without-webkit
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
post-install:
@rm ${PREFIX}/lib/gimp/2.0/modules/*.{a,la}
@rm ${PREFIX}/lib/gimp/2.0/python/*.{a,la}
.include <bsd.port.mk>

3
graphics/gimp/stable/distinfo
View File

@ -1,5 +1,2 @@
MD5 (gimp-2.8.0.tar.bz2) = KJl9FAVfFdsGPrkuHIp+uw==
RMD160 (gimp-2.8.0.tar.bz2) = rv+SdUYdAXHiKyKBquKMpPtLxj8=
SHA1 (gimp-2.8.0.tar.bz2) = OyDT3RDZcay7yTRetcuTN4w5jrw=
SHA256 (gimp-2.8.0.tar.bz2) = 3WzuCA0Y+u+gELpII+YO58SaTRV0p4xt+1kFkqCfLcw=
SIZE (gimp-2.8.0.tar.bz2) = 20142440

21
graphics/gimp/stable/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2012/06/06 08:06:32 giovanni Exp $
--- configure.orig Wed May 2 10:56:45 2012
+++ configure Wed May 9 15:38:15 2012
@@ -20081,7 +20081,7 @@ if ${ac_cv_lib_mng_mng_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmng -lz -lm $LIBS"
+LIBS="-lmng -lz -lm -ljpeg -llcms $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20124,7 +20124,7 @@ fi
if test "$mng_ok" = yes; then
have_libmng=yes
- FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"; MNG_CFLAGS="$PNG_CFLAGS"
+ FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng -llcms $JPEG_LIBS $PNG_LIBS"; MNG_CFLAGS="$PNG_CFLAGS"
else
have_libmng="no (MNG header file not found)"
fi

11
graphics/gimp/stable/patches/patch-gimp_pc_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-gimp_pc_in,v 1.2 2012/06/06 08:06:32 giovanni Exp $
--- gimp.pc.in.orig Mon Mar 12 20:18:08 2012
+++ gimp.pc.in Wed May 9 09:40:52 2012
@@ -12,6 +12,6 @@ gimplocaledir=@gimplocaledir@
Name: GIMP
Description: GIMP Library
Version: @GIMP_REAL_VERSION@
-Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@
+Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@, gthread-2.0, gobject-2.0
Libs: -L${libdir} -lgimp-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpconfig-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ @RT_LIBS@
Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@

11
graphics/gimp/stable/patches/patch-gimpthumb_pc_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-gimpthumb_pc_in,v 1.2 2008/10/20 21:38:18 kili Exp $
--- gimpthumb.pc.in.orig Thu Aug 21 13:35:29 2008
+++ gimpthumb.pc.in Thu Oct 2 19:38:17 2008
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: GIMP Thumb
Description: GIMP Thumbnail Library
Version: @GIMP_REAL_VERSION@
-Requires: gdk-pixbuf-2.0
+Requires: gdk-pixbuf-2.0, gthread-2.0
Libs: -L${libdir} -lgimpthumb-@GIMP_API_VERSION@
Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@

24
graphics/gimp/stable/pkg/PFRAG.shared
View File

@ -1,24 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.9 2008/11/16 21:19:23 kili Exp $
lib/gimp/2.0/modules/libcolor-selector-cmyk.so
lib/gimp/2.0/modules/libcolor-selector-water.so
lib/gimp/2.0/modules/libcolor-selector-wheel.so
lib/gimp/2.0/modules/libcontroller-midi.so
lib/gimp/2.0/modules/libdisplay-filter-color-blind.so
lib/gimp/2.0/modules/libdisplay-filter-gamma.so
lib/gimp/2.0/modules/libdisplay-filter-high-contrast.so
lib/gimp/2.0/modules/libdisplay-filter-lcms.so
lib/gimp/2.0/modules/libdisplay-filter-proof.so
lib/gimp/2.0/python/_gimpenums.so
lib/gimp/2.0/python/_gimpui.so
lib/gimp/2.0/python/gimp.so
lib/gimp/2.0/python/gimpcolor.so
lib/gimp/2.0/python/gimpthumb.so
@lib lib/libgimp-2.0.so.${LIBgimp-2.0_VERSION}
@lib lib/libgimpbase-2.0.so.${LIBgimpbase-2.0_VERSION}
@lib lib/libgimpcolor-2.0.so.${LIBgimpcolor-2.0_VERSION}
@lib lib/libgimpconfig-2.0.so.${LIBgimpconfig-2.0_VERSION}
@lib lib/libgimpmath-2.0.so.${LIBgimpmath-2.0_VERSION}
@lib lib/libgimpmodule-2.0.so.${LIBgimpmodule-2.0_VERSION}
@lib lib/libgimpthumb-2.0.so.${LIBgimpthumb-2.0_VERSION}
@lib lib/libgimpui-2.0.so.${LIBgimpui-2.0_VERSION}
@lib lib/libgimpwidgets-2.0.so.${LIBgimpwidgets-2.0_VERSION}

57
graphics/gimp/stable/pkg/PLIST
View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.32 2012/07/16 09:42:24 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.33 2012/09/27 00:17:51 brad Exp $
@pkgpath ${BASE_PKGPATH},altivec
%%SHARED%%
bin/gimp
@bin bin/gimp-2.8
bin/gimp-console
@ -240,24 +239,15 @@ lib/gimp/2.0/interpreters/
lib/gimp/2.0/interpreters/default.interp
lib/gimp/2.0/interpreters/pygimp.interp
lib/gimp/2.0/modules/
lib/gimp/2.0/modules/libcolor-selector-cmyk.a
lib/gimp/2.0/modules/libcolor-selector-cmyk.la
lib/gimp/2.0/modules/libcolor-selector-water.a
lib/gimp/2.0/modules/libcolor-selector-water.la
lib/gimp/2.0/modules/libcolor-selector-wheel.a
lib/gimp/2.0/modules/libcolor-selector-wheel.la
lib/gimp/2.0/modules/libcontroller-midi.a
lib/gimp/2.0/modules/libcontroller-midi.la
lib/gimp/2.0/modules/libdisplay-filter-color-blind.a
lib/gimp/2.0/modules/libdisplay-filter-color-blind.la
lib/gimp/2.0/modules/libdisplay-filter-gamma.a
lib/gimp/2.0/modules/libdisplay-filter-gamma.la
lib/gimp/2.0/modules/libdisplay-filter-high-contrast.a
lib/gimp/2.0/modules/libdisplay-filter-high-contrast.la
lib/gimp/2.0/modules/libdisplay-filter-lcms.a
lib/gimp/2.0/modules/libdisplay-filter-lcms.la
lib/gimp/2.0/modules/libdisplay-filter-proof.a
lib/gimp/2.0/modules/libdisplay-filter-proof.la
lib/gimp/2.0/modules/libcolor-selector-cmyk.so
lib/gimp/2.0/modules/libcolor-selector-water.so
lib/gimp/2.0/modules/libcolor-selector-wheel.so
lib/gimp/2.0/modules/libcontroller-midi.so
lib/gimp/2.0/modules/libdisplay-filter-color-blind.so
lib/gimp/2.0/modules/libdisplay-filter-gamma.so
lib/gimp/2.0/modules/libdisplay-filter-high-contrast.so
lib/gimp/2.0/modules/libdisplay-filter-lcms.so
lib/gimp/2.0/modules/libdisplay-filter-proof.so
lib/gimp/2.0/plug-ins/
@bin lib/gimp/2.0/plug-ins/alien-map
@bin lib/gimp/2.0/plug-ins/align-layers
@ -337,6 +327,7 @@ lib/gimp/2.0/plug-ins/file-openraster.py
@bin lib/gimp/2.0/plug-ins/file-pix
@bin lib/gimp/2.0/plug-ins/file-png
@bin lib/gimp/2.0/plug-ins/file-pnm
@bin lib/gimp/2.0/plug-ins/file-ps
@bin lib/gimp/2.0/plug-ins/file-psd-load
@bin lib/gimp/2.0/plug-ins/file-psd-save
@bin lib/gimp/2.0/plug-ins/file-psp
@ -444,14 +435,10 @@ lib/gimp/2.0/plug-ins/text-brush.py
@bin lib/gimp/2.0/plug-ins/whirl-pinch
@bin lib/gimp/2.0/plug-ins/wind
lib/gimp/2.0/python/
lib/gimp/2.0/python/_gimpenums.a
lib/gimp/2.0/python/_gimpenums.la
lib/gimp/2.0/python/_gimpui.a
lib/gimp/2.0/python/_gimpui.la
lib/gimp/2.0/python/gimp.a
lib/gimp/2.0/python/gimp.la
lib/gimp/2.0/python/gimpcolor.a
lib/gimp/2.0/python/gimpcolor.la
lib/gimp/2.0/python/_gimpenums.so
lib/gimp/2.0/python/_gimpui.so
lib/gimp/2.0/python/gimp.so
lib/gimp/2.0/python/gimpcolor.so
lib/gimp/2.0/python/gimpenums.py
lib/gimp/2.0/python/gimpenums.pyc
lib/gimp/2.0/python/gimpenums.pyo
@ -464,30 +451,38 @@ lib/gimp/2.0/python/gimpplugin.pyo
lib/gimp/2.0/python/gimpshelf.py
lib/gimp/2.0/python/gimpshelf.pyc
lib/gimp/2.0/python/gimpshelf.pyo
lib/gimp/2.0/python/gimpthumb.a
lib/gimp/2.0/python/gimpthumb.la
lib/gimp/2.0/python/gimpthumb.so
lib/gimp/2.0/python/gimpui.py
lib/gimp/2.0/python/gimpui.pyc
lib/gimp/2.0/python/gimpui.pyo
lib/gimp/2.0/python/pygimp-logo.png
lib/libgimp-2.0.a
lib/libgimp-2.0.la
@lib lib/libgimp-2.0.so.${LIBgimp-2.0_VERSION}
lib/libgimpbase-2.0.a
lib/libgimpbase-2.0.la
@lib lib/libgimpbase-2.0.so.${LIBgimpbase-2.0_VERSION}
lib/libgimpcolor-2.0.a
lib/libgimpcolor-2.0.la
@lib lib/libgimpcolor-2.0.so.${LIBgimpcolor-2.0_VERSION}
lib/libgimpconfig-2.0.a
lib/libgimpconfig-2.0.la
@lib lib/libgimpconfig-2.0.so.${LIBgimpconfig-2.0_VERSION}
lib/libgimpmath-2.0.a
lib/libgimpmath-2.0.la
@lib lib/libgimpmath-2.0.so.${LIBgimpmath-2.0_VERSION}
lib/libgimpmodule-2.0.a
lib/libgimpmodule-2.0.la
@lib lib/libgimpmodule-2.0.so.${LIBgimpmodule-2.0_VERSION}
lib/libgimpthumb-2.0.a
lib/libgimpthumb-2.0.la
@lib lib/libgimpthumb-2.0.so.${LIBgimpthumb-2.0_VERSION}
lib/libgimpui-2.0.a
lib/libgimpui-2.0.la
@lib lib/libgimpui-2.0.so.${LIBgimpui-2.0_VERSION}
lib/libgimpwidgets-2.0.a
lib/libgimpwidgets-2.0.la
@lib lib/libgimpwidgets-2.0.so.${LIBgimpwidgets-2.0_VERSION}
lib/pkgconfig/gimp-2.0.pc
lib/pkgconfig/gimpthumb-2.0.pc
lib/pkgconfig/gimpui-2.0.pc
@ -1950,8 +1945,6 @@ share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/cs/LC_MESSAGES/gimp20-tips.mo
share/locale/cs/LC_MESSAGES/gimp20.mo
share/locale/csb/
share/locale/csb/LC_MESSAGES/
share/locale/csb/LC_MESSAGES/gimp20.mo
share/locale/da/LC_MESSAGES/gimp20-libgimp.mo
share/locale/da/LC_MESSAGES/gimp20-python.mo