ports/74107: [patch] multimedia/mplayer-skins: don't fetch everything!
Edwin Groothuis
edwin at mavetju.org
Fri Nov 19 07:40:33 UTC 2004
>Number: 74107
>Category: ports
>Synopsis: [patch] multimedia/mplayer-skins: don't fetch everything!
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 19 07:40:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #7: Tue Sep 21 23:13:39 EST 2004 root at k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386
>Description:
Multimedia/mplayer-skins fetches all the files, even the ones you
don't want to install.
The makefile is a a long list of repeating code.
This patch changes the DISTFILES and the repeating code.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mplayer-skins/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 16 Oct 2004 13:40:27 -0000 1.23
+++ Makefile 19 Nov 2004 07:32:02 -0000
@@ -7,60 +7,14 @@
PORTNAME= mplayer
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \
http://ftp.lug.udel.edu/MPlayer/Skin/ \
ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \
ftp://ftp.lug.udel.edu/MPlayer/Skin/
PKGNAMESUFFIX= -skins
-DISTFILES= \
- ${ABYSS_FILE} \
- ${ALIENMIND_FILE} \
- ${AVIFILE_FILE} \
- ${DEFAULT_FILE} \
- ${DEFAULT_SMALL_FILE} \
- ${BLUEHEART_FILE} \
- ${CANARY_FILE} \
- ${CORELIAN_FILE} \
- ${CORNERMP_FILE} \
- ${CORNERMP_AQUA_FILE} \
- ${CYRUS_FILE} \
- ${DISAPPEARER_FILE} \
- ${DUSHKU_FILE} \
- ${DVDPLAYER_FILE} \
- ${GNOME_FILE} \
- ${HANDHELD_FILE} \
- ${HAYRAPHON_FILE} \
- ${HWSW_FILE} \
- ${INDUSTRIAL_FILE} \
- ${JIMPLAYER_FILE} \
- ${KDE_FILE} \
- ${KRYSTAL_FILE} \
- ${MENTALIC_FILE} \
- ${MIDNIGHTLOVE_FILE} \
- ${MINI_FILE} \
- ${NEUTRON_FILE} \
- ${NEWAGE_FILE} \
- ${ORANGE_FILE} \
- ${OSXBRUSHED_FILE} \
- ${OSXMOD_FILE} \
- ${PHONY_FILE} \
- ${PLASTIC_FILE} \
- ${POWERPLAYER_FILE} \
- ${PROTON_FILE} \
- ${QPLAYER_FILE} \
- ${SLIM_FILE} \
- ${SOFTGRIP_FILE} \
- ${TERMINATOR3_FILE} \
- ${TRIUM_FILE} \
- ${TVISOR_FILE} \
- ${ULTRAFINA_FILE} \
- ${WMP6_FILE} \
- ${XANIM_FILE} \
- ${XFCE4_FILE} \
- ${XINE_LCD_FILE} \
- ${XMMPLAYER_FILE}
+DISTFILES= # filled in later after options
DIST_SUBDIR= mplayer
@@ -180,426 +134,35 @@
WITH_SKIN_ALL=yes
.endif # BATCH
+ALLSKINS= ABYSS ALIENMIND AVIFILE BLUEHEART CANARY CORELIAN \
+ CORNERMP CORNERMP_AQUA CYRUS DISAPPEARER DUSHKU \
+ DVDPLAYER GNOME HANDHELD HAYRAPHON HWSW INDUSTRIAL \
+ JIMPLAYER KDE KRYSTAL MENTALIC MIDNIGHTLOVE MINI \
+ NEUTRON NEWAGE ORANGE OSXBRUSHED OSXMOD PHONY PLASTIC \
+ POWERPLAYER PROTON QPLAYER SLIM SOFTGRIP TERMINATOR3 \
+ TRIUM TVISOR ULTRAFINA WINDOWSMEDIAPLAYER6 XANIM \
+ XFCE4 XINE_LCD XMMPLAYER \
+ DEFAULT DEFAULT_SMALL
+
# Build and install all skins (rather expensive)
.if defined(WITH_SKIN_ALL)
-WITH_SKIN_DEFAULT=yes
-WITH_SKIN_DEFAULT_SMALL=yes
-WITH_SKIN_ABYSS=yes
-WITH_SKIN_ALIENMIND=yes
-WITH_SKIN_AVIFILE=yes
-WITH_SKIN_BLUEHEART=yes
-WITH_SKIN_CANARY=yes
-WITH_SKIN_CORELIAN=yes
-WITH_SKIN_CORNERMP=yes
-WITH_SKIN_CORNERMP_AQUA=yes
-WITH_SKIN_CYRUS=yes
-WITH_SKIN_DISAPPEARER=yes
-WITH_SKIN_DUSHKU=yes
-WITH_SKIN_DVDPLAYER=yes
-WITH_SKIN_GNOME=yes
-WITH_SKIN_HANDHELD=yes
-WITH_SKIN_HAYRAPHON=yes
-WITH_SKIN_HWSW=yes
-WITH_SKIN_INDUSTRIAL=yes
-WITH_SKIN_JIMPLAYER=yes
-WITH_SKIN_KDE=yes
-WITH_SKIN_KRYSTAL=yes
-WITH_SKIN_MENTALIC=yes
-WITH_SKIN_MIDNIGHTLOVE=yes
-WITH_SKIN_MINI=yes
-WITH_SKIN_NEUTRON=yes
-WITH_SKIN_NEWAGE=yes
-WITH_SKIN_ORANGE=yes
-WITH_SKIN_OSXBRUSHED=yes
-WITH_SKIN_OSXMOD=yes
-WITH_SKIN_PHONY=yes
-WITH_SKIN_PLASTIC=yes
-WITH_SKIN_POWERPLAYER=yes
-WITH_SKIN_PROTON=yes
-WITH_SKIN_QPLAYER=yes
-WITH_SKIN_SLIM=yes
-WITH_SKIN_SOFTGRIP=yes
-WITH_SKIN_TERMINATOR3=yes
-WITH_SKIN_TRIUM=yes
-WITH_SKIN_TVISOR=yes
-WITH_SKIN_ULTRAFINA=yes
-WITH_SKIN_WINDOWSMEDIAPLAYER6=yes
-WITH_SKIN_XANIM=yes
-WITH_SKIN_XFCE4=yes
-WITH_SKIN_XINE_LCD=yes
-WITH_SKIN_XMMPLAYER=yes
+.for f in ${ALLSKINS}
+WITH_SKIN_${f}= yes
+.endfor
.endif # WITH_SKIN_ALL
#
# files to extract
#
-.ifdef(WITH_SKIN_DEFAULT)
-EXTRACT_ONLY+= ${DEFAULT_FILE}
-PLIST_SUB+= DEFAULT=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= DEFAULT="@comment "
-.endif
-
-.ifdef(WITH_SKIN_DEFAULT_SMALL)
-EXTRACT_ONLY+= ${DEFAULT_SMALL_FILE}
-PLIST_SUB+= DEFAULT_SMALL=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= DEFAULT_SMALL="@comment "
-.endif
-
-.ifdef(WITH_SKIN_ABYSS)
-EXTRACT_ONLY+= ${ABYSS_FILE}
-PLIST_SUB+= ABYSS=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= ABYSS="@comment "
-.endif
-
-.ifdef(WITH_SKIN_ALIENMIND)
-EXTRACT_ONLY+= ${ALIENMIND_FILE}
-PLIST_SUB+= ALIENMIND=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= ALIENMIND="@comment "
-.endif
-
-.ifdef(WITH_SKIN_AVIFILE)
-EXTRACT_ONLY+= ${AVIFILE_FILE}
-PLIST_SUB+= AVIFILE=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= AVIFILE="@comment "
-.endif
-
-.ifdef(WITH_SKIN_BLUEHEART)
-EXTRACT_ONLY+= ${BLUEHEART_FILE}
-PLIST_SUB+= BLUEHEART=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= BLUEHEART="@comment "
-.endif
-
-.ifdef(WITH_SKIN_CANARY)
-EXTRACT_ONLY+= ${CANARY_FILE}
-PLIST_SUB+= CANARY=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= CANARY="@comment "
-.endif
-
-.ifdef(WITH_SKIN_CORELIAN)
-EXTRACT_ONLY+= ${CORELIAN_FILE}
-PLIST_SUB+= CORELIAN=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= CORELIAN="@comment "
-.endif
-
-.ifdef(WITH_SKIN_CORNERMP)
-EXTRACT_ONLY+= ${CORNERMP_FILE}
-PLIST_SUB+= CORNERMP=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= CORNERMP="@comment "
-.endif
-
-.ifdef(WITH_SKIN_CORNERMP_AQUA)
-EXTRACT_ONLY+= ${CORNERMP_AQUA_FILE}
-PLIST_SUB+= CORNERMP_AQUA=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= CORNERMP_AQUA="@comment "
-.endif
-
-.ifdef(WITH_SKIN_CYRUS)
-EXTRACT_ONLY+= ${CYRUS_FILE}
-PLIST_SUB+= CYRUS=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= CYRUS="@comment "
-.endif
-
-.ifdef(WITH_SKIN_DISAPPEARER)
-EXTRACT_ONLY+= ${DISAPPEARER_FILE}
-PLIST_SUB+= DISAPPEARER=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= DISAPPEARER="@comment "
-.endif
-
-.ifdef(WITH_SKIN_DUSHKU)
-EXTRACT_ONLY+= ${DUSHKU_FILE}
-PLIST_SUB+= DUSHKU=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= DUSHKU="@comment "
-.endif
-
-.ifdef(WITH_SKIN_DVDPLAYER)
-EXTRACT_ONLY+= ${DVDPLAYER_FILE}
-PLIST_SUB+= DVDPLAYER=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= DVDPLAYER="@comment "
-.endif
-
-.ifdef(WITH_SKIN_GNOME)
-EXTRACT_ONLY+= ${GNOME_FILE}
-PLIST_SUB+= GNOME=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
-.ifdef(WITH_SKIN_HANDHELD)
-EXTRACT_ONLY+= ${HANDHELD_FILE}
-PLIST_SUB+= HANDHELD=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= HANDHELD="@comment "
-.endif
-
-.ifdef(WITH_SKIN_HAYRAPHON)
-EXTRACT_ONLY+= ${HAYRAPHON_FILE}
-PLIST_SUB+= HAYRAPHON=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= HAYRAPHON="@comment "
-.endif
-
-.ifdef(WITH_SKIN_HWSW)
-EXTRACT_ONLY+= ${HWSW_FILE}
-PLIST_SUB+= HWSW=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= HWSW="@comment "
-.endif
-
-.ifdef(WITH_SKIN_INDUSTRIAL)
-EXTRACT_ONLY+= ${INDUSTRIAL_FILE}
-PLIST_SUB+= INDUSTRIAL=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= INDUSTRIAL="@comment "
-.endif
-
-.ifdef(WITH_SKIN_JIMPLAYER)
-EXTRACT_ONLY+= ${JIMPLAYER_FILE}
-PLIST_SUB+= JIMPLAYER=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= JIMPLAYER="@comment "
-.endif
-
-.ifdef(WITH_SKIN_KDE)
-EXTRACT_ONLY+= ${KDE_FILE}
-PLIST_SUB+= KDE=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= KDE="@comment "
-.endif
-
-.ifdef(WITH_SKIN_KRYSTAL)
-EXTRACT_ONLY+= ${KRYSTAL_FILE}
-PLIST_SUB+= KRYSTAL=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= KRYSTAL="@comment "
-.endif
-
-.ifdef(WITH_SKIN_MENTALIC)
-EXTRACT_ONLY+= ${MENTALIC_FILE}
-PLIST_SUB+= MENTALIC=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= MENTALIC="@comment "
-.endif
-
-.ifdef(WITH_SKIN_MIDNIGHTLOVE)
-EXTRACT_ONLY+= ${MIDNIGHTLOVE_FILE}
-PLIST_SUB+= MIDNIGHTLOVE=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= MIDNIGHTLOVE="@comment "
-.endif
-
-.ifdef(WITH_SKIN_MINI)
-EXTRACT_ONLY+= ${MINI_FILE}
-PLIST_SUB+= MINI=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= MINI="@comment "
-.endif
-
-.ifdef(WITH_SKIN_NEUTRON)
-EXTRACT_ONLY+= ${NEUTRON_FILE}
-PLIST_SUB+= NEUTRON=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= NEUTRON="@comment "
-.endif
-
-.ifdef(WITH_SKIN_NEWAGE)
-EXTRACT_ONLY+= ${NEWAGE_FILE}
-PLIST_SUB+= NEWAGE=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= NEWAGE="@comment "
-.endif
-
-.ifdef(WITH_SKIN_ORANGE)
-EXTRACT_ONLY+= ${ORANGE_FILE}
-PLIST_SUB+= ORANGE=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= ORANGE="@comment "
-.endif
-
-.ifdef(WITH_SKIN_OSXBRUSHED)
-EXTRACT_ONLY+= ${OSXBRUSHED_FILE}
-PLIST_SUB+= OSXBRUSHED=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= OSXBRUSHED="@comment "
-.endif
-
-.ifdef(WITH_SKIN_OSXMOD)
-EXTRACT_ONLY+= ${OSXMOD_FILE}
-PLIST_SUB+= OSXMOD=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= OSXMOD="@comment "
-.endif
-
-.ifdef(WITH_SKIN_PHONY)
-EXTRACT_ONLY+= ${PHONY_FILE}
-PLIST_SUB+= PHONY=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= PHONY="@comment "
-.endif
-
-.ifdef(WITH_SKIN_PLASTIC)
-EXTRACT_ONLY+= ${PLASTIC_FILE}
-PLIST_SUB+= PLASTIC=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= PLASTIC="@comment "
-.endif
-
-.ifdef(WITH_SKIN_POWERPLAYER)
-EXTRACT_ONLY+= ${POWERPLAYER_FILE}
-PLIST_SUB+= POWERPLAYER=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= POWERPLAYER="@comment "
-.endif
-
-.ifdef(WITH_SKIN_PROTON)
-EXTRACT_ONLY+= ${PROTON_FILE}
-PLIST_SUB+= PROTON=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= PROTON="@comment "
-.endif
-
-.ifdef(WITH_SKIN_QPLAYER)
-EXTRACT_ONLY+= ${QPLAYER_FILE}
-PLIST_SUB+= QPLAYER=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= QPLAYER="@comment "
-.endif
-
-.ifdef(WITH_SKIN_SLIM)
-EXTRACT_ONLY+= ${SLIM_FILE}
-PLIST_SUB+= SLIM=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= SLIM="@comment "
-.endif
-
-.ifdef(WITH_SKIN_SOFTGRIP)
-EXTRACT_ONLY+= ${SOFTGRIP_FILE}
-PLIST_SUB+= SOFTGRIP=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= SOFTGRIP="@comment "
-.endif
-
-.ifdef(WITH_SKIN_TERMINATOR3)
-EXTRACT_ONLY+= ${TERMINATOR3_FILE}
-PLIST_SUB+= TERMINATOR3=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= TERMINATOR3="@comment "
-.endif
-
-.ifdef(WITH_SKIN_TRIUM)
-EXTRACT_ONLY+= ${TRIUM_FILE}
-PLIST_SUB+= TRIUM=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= TRIUM="@comment "
-.endif
-
-.ifdef(WITH_SKIN_TVISOR)
-EXTRACT_ONLY+= ${TVISOR_FILE}
-PLIST_SUB+= TVISOR=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= TVISOR="@comment "
-.endif
-
-.ifdef(WITH_SKIN_ULTRAFINA)
-EXTRACT_ONLY+= ${ULTRAFINA_FILE}
-PLIST_SUB+= ULTRAFINA=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= ULTRAFINA="@comment "
-.endif
-
-.ifdef(WITH_SKIN_WINDOWSMEDIAPLAYER6)
-EXTRACT_ONLY+= ${WMP6}
-PLIST_SUB+= WINDOWSMEDIAPLAYER6=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= WINDOWSMEDIAPLAYER6="@comment "
-.endif
-
-.ifdef(WITH_SKIN_XANIM)
-EXTRACT_ONLY+= ${XANIM_FILE}
-PLIST_SUB+= XANIM=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= XANIM="@comment "
-.endif
-
-.ifdef(WITH_SKIN_XFCE4)
-EXTRACT_ONLY+= ${XFCE4_FILE}
-PLIST_SUB+= XFCE4=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= XFCE4="@comment "
-.endif
-
-.ifdef(WITH_SKIN_XINE_LCD)
-EXTRACT_ONLY+= ${XINE_LCD_FILE}
-PLIST_SUB+= XINE_LCD=""
-HAVE_SKIN= true
-.else
-PLIST_SUB+= XINE_LCD="@comment "
-.endif
-
-.ifdef(WITH_SKIN_XMMPLAYER)
-EXTRACT_ONLY+= ${XMMPLAYER_FILE}
-PLIST_SUB+= XMMPLAYER=""
+.for f in ${ALLSKINS}
+.ifdef(WITH_SKIN_${f})
+PLIST_SUB+= ${f}=""
HAVE_SKIN= true
+DISTFILES+= ${${f}_FILE}
.else
-PLIST_SUB+= XMMPLAYER="@comment "
+PLIST_SUB+= ${f}="@comment "
.endif
+.endfor
do-build:
.if defined(HAVE_SKIN)
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list