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

Remove the -gle subpackage now that gle has a proper license.

Browse Source 
based on an original diff from Azwaw OUSADOU
This commit is contained in:
ajacoutot 2012-09-02 09:36:55 +00:00
parent f9f02c1d1a
commit e8a4601499
4 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
x11/xscreensaver/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.73 2012/01/08 15:36:26 dcoppa Exp $
# $OpenBSD: Makefile,v 1.74 2012/09/02 09:36:55 ajacoutot Exp $
COMMENT-main= screen saver and locker for the X Window System
COMMENT-data= graphical demos (savers) for screensavers
COMMENT-gle= OpenGL Extrusion library support for screensaver-data
V= 5.15
DISTNAME= xscreensaver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-data= xscreensaver-data-${V}
PKGNAME-gle= xscreensaver-gle-${V}
REVISION-main= 0
REVISION-data= 0
CATEGORIES= x11
@ -20,21 +21,21 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main -data -gle
MULTI_PACKAGES= -main -data
WANTLIB= GL GLU ICE SM X11 Xext Xmu Xpm Xt Xxf86vm c glib-2.0 \
gmodule-2.0 gobject-2.0 m pthread gthread-2.0
gmodule-2.0 gobject-2.0 m pthread
WANTLIB-main= ${WANTLIB} Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \
WANTLIB-main= ${WANTLIB} Xcomposite Xcursor Xdamage Xfixes \
Xi Xinerama Xrandr Xrender Xxf86misc atk-1.0 cairo \
expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gdk_pixbuf_xlib-2.0 gio-2.0 gtk-x11-2.0 jpeg \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
pthread-stubs xcb xml2 z xcb-render glade-2.0 \
drm xcb-shm
xcb-shm
WANTLIB-data= ${WANTLIB} jpeg util gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 \
png z
gle
MASTER_SITES= ${HOMEPAGE}
@ -54,37 +55,20 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
devel/libglade2
LIB_DEPENDS-data= ${MODGETTEXT_LIB_DEPENDS} \
graphics/gdk-pixbuf2
graphics/gdk-pixbuf2 \
graphics/gle
USE_GMAKE= Yes
USE_GROFF = Yes
USE_GROFF= Yes
NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
--with-x-app-defaults="${PREFIX}/lib/X11/app-defaults"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
# License issues with graphics/gle necessitate this
PSEUDO_FLAVORS= no_gle
FLAVOR?= no_gle
.include <bsd.port.arch.mk>
LIB_DEPENDS-gle= ${MODGETTEXT_LIB_DEPENDS} \
graphics/gle \
x11/gtk+2
RUN_DEPENDS-gle= ${BUILD_PKGPATH},-data
WANTLIB-gle= ${WANTLIB} gle gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
.if ${BUILD_PACKAGES:M-gle}
CONFIGURE_ARGS+= --with-gle
.else
CONFIGURE_ARGS+= --without-gle
.endif
post-extract:
cp ${FILESDIR}/migrate-xscreensaver-config.sh ${WRKSRC}/hacks/config
cp ${FILESDIR}/xscreensaver-config.xsl ${WRKSRC}/hacks/config

1
x11/xscreensaver/pkg/DESCR-gle
View File

@ -1 +0,0 @@
This package adds OpenGL Extrusion library support for screensaver-data.

8
x11/xscreensaver/pkg/PLIST-data
View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST-data,v 1.7 2012/01/08 15:36:26 dcoppa Exp $
@comment $OpenBSD: PLIST-data,v 1.8 2012/09/02 09:36:55 ajacoutot Exp $
@conflict xscreensaver-<5.07p3
@conflict xscreensaver-<5.07p3-no_gle
@conflict xscreensaver-gle-*
@pkgpath x11/xscreensaver,-gle
libexec/xscreensaver/
@bin libexec/xscreensaver/abstractile
@bin libexec/xscreensaver/anemone
@ -55,6 +57,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/epicycle
@bin libexec/xscreensaver/eruption
@bin libexec/xscreensaver/euler2d
@bin libexec/xscreensaver/extrusion
@bin libexec/xscreensaver/fadeplot
@bin libexec/xscreensaver/fiberlamp
@bin libexec/xscreensaver/fireworkx
@ -255,6 +258,7 @@ libexec/xscreensaver/webcollage
@man man/man6/epicycle.6
@man man/man6/eruption.6
@man man/man6/euler2d.6
@man man/man6/extrusion.6
@man man/man6/fadeplot.6
@man man/man6/fiberlamp.6
@man man/man6/fireworkx.6
@ -459,6 +463,7 @@ share/applications/screensavers/engine.desktop
share/applications/screensavers/epicycle.desktop
share/applications/screensavers/eruption.desktop
share/applications/screensavers/euler2d.desktop
share/applications/screensavers/extrusion.desktop
share/applications/screensavers/fadeplot.desktop
share/applications/screensavers/fiberlamp.desktop
share/applications/screensavers/fireworkx.desktop
@ -679,6 +684,7 @@ share/xscreensaver/config/engine.xml
share/xscreensaver/config/epicycle.xml
share/xscreensaver/config/eruption.xml
share/xscreensaver/config/euler2d.xml
share/xscreensaver/config/extrusion.xml
share/xscreensaver/config/fadeplot.xml
share/xscreensaver/config/fiberlamp.xml
share/xscreensaver/config/fireworkx.xml

5
x11/xscreensaver/pkg/PLIST-gle
View File

@ -1,5 +0,0 @@
@comment $OpenBSD: PLIST-gle,v 1.1 2008/11/29 11:29:07 ajacoutot Exp $
@bin libexec/xscreensaver/extrusion
@man man/man6/extrusion.6
share/applications/screensavers/extrusion.desktop
share/xscreensaver/config/extrusion.xml