Changeset 82718

Timestamp:

08/18/11 19:35:42 (4 years ago)

Author:

ryandesign@…

Message:

digger:

• use app portgroup
• ensure we're UsingTheRightCompiler and build arch
• add universal variant
• patch the existing Makefile.sdl rather than have our own separate copy

Location:

trunk/dports/games/digger

Files:

• Portfile (modified) (3 diffs)
• files/icon.png (added)
• files/patch-Makefile.sdl.diff (moved) (moved from trunk/dports/games/digger/files/Makefile.darwin) (1 diff)

trunk/dports/games/digger/Portfile

@@ -2 +2 @@
 
 PortSystem              1.0
+PortGroup               app 1.0
 
 name                    digger
 version                 20020314
-revision                1
+revision                2
 categories              games
 platforms               darwin
@@ -25 +26 @@
 depends_lib             path:lib/pkgconfig/sdl.pc:libsdl
 
-post-extract {
-    file copy ${filespath}/Makefile.darwin ${worksrcpath}/Makefile
+platform darwin {
+    patchfiles-append   patch-Makefile.sdl.diff
 }
 
 use_configure           no
+
+variant universal {}
+
+build.args              -f Makefile.sdl \
+                        CC="${configure.cc} [get_canonical_archflags]"
 
 destroot {
@@ -38 +44 @@
 }
 
-platform darwin {
-    post-destroot {
-        xinstall -d ${destroot}${applications_dir}/Digger.app/Contents/MacOS
-        xinstall -m 755 ${filespath}/Digger.darwin \
-            ${destroot}${applications_dir}/Digger.app/Contents/MacOS/Digger
-        reinplace "s|_PREFIX_|${prefix}|g" \
-            ${destroot}${applications_dir}/Digger.app/Contents/MacOS/Digger
+app.executable          ${workpath}/${name}
+app.icon                ${filespath}/icon.png
+
+platform macosx {
+    post-extract {
+        xinstall ${filespath}/Digger.darwin ${workpath}/${name}
+    }
+    post-patch {
+        reinplace "s|_PREFIX_|${prefix}|g" ${workpath}/${name}
     }
 }

trunk/dports/games/digger/files/patch-Makefile.sdl.diff

@@ -1 @@
-CC      ?= gcc
-CFLAGS  += -O -g -pipe -Wall -D_SDL
-OBJS    = main.o digger.o drawing.o sprite.o scores.o record.o sound.o \
-                        newsnd.o ini.o input.o monster.o bags.o alpha.o vgagrafx.o \
-                        title_gz.o icon.o sdl_kbd.o sdl_vid.o sdl_timer.o sdl_snd.o
-
-ARCH    = "DARWIN"
-#ARCH   = "LINUX"
-#ARCH   = "MINGW"
-#ARCH   = "FREEBSD"
-#ARCH   = "FooOS"
-
-ifeq ($(ARCH),"DARWIN")
-CC     = gcc
-OBJS   += fbsd_sup.o
-CFLAGS += -DDARWIN `sdl-config --cflags`/SDL
-LIBS   += `sdl-config --libs` -lz -lobjc
-endif
-
-ifeq ($(ARCH),"MINGW")
-CFLAGS  += -mno-cygwin -DMINGW -Dmain=SDL_main -I../zlib -I../SDL-1.1.2/include/SDL
-LIBS    += -mno-cygwin -mwindows -lmingw32 -L../SDL-1.1.2/lib -lSDLmain -lSDL -luser32 -lgdi32 -lwinmm -L../zlib -lz
-ESUFFIX =  .exe
-endif
-
-ifeq ($(ARCH),"FREEBSD")
-OBJS    += fbsd_sup.o   # strup()
-CFLAGS  += -DFREEBSD `sdl-config --cflags`
-LIBS    += `sdl-config --libs` -lz
-ESUFFIX =
-endif
-
-ifeq ($(ARCH),"LINUX")
-OBJS    += fbsd_sup.o   # strup()
-CFLAGS  += -DLINUX `sdl-config --cflags`
-LIBS    += `sdl-config --libs` -lz
-ESUFFIX =
-endif
-
-ifeq ($(ARCH),"FooOS")
-OBJS    +=              # insert here the names of the files which contains various missing functions like strup() on Linux and FreeBSD
-CFLAGS  += -DFooOS      # insert here additional compiler flags which required to find include files, trigger os-specific compiler behaviour etc.
-LIBS    +=              # insert here libs required to compile like zlib, SDL etc
-ESUFFIX =               # insert here suffix of the executable on your platform if any (like ".exe" on Win32)
-endif
-
-all: digger$(ESUFFIX)
-
-digger$(ESUFFIX): $(OBJS)
-        $(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
-
-$(OBJS): %.o: %.c
-        $(CC) -c $(CFLAGS) $< -o $@
-
-clean:
-        rm -f $(OBJS) digger$(ESUFFIX)
+--- Makefile.sdl.orig   2000-04-07 02:04:52.000000000 -0500
++++ Makefile.sdl        2011-08-18 16:58:06.000000000 -0500
+@@ -4,7 +4,8 @@
+                        newsnd.o ini.o input.o monster.o bags.o alpha.o vgagrafx.o \
+                        title_gz.o icon.o sdl_kbd.o sdl_vid.o sdl_timer.o sdl_snd.o
+ 
+-ARCH   = "LINUX"
++ARCH   = "DARWIN"
++#ARCH  = "LINUX"
+ #ARCH  = "MINGW"
+ #ARCH  = "FREEBSD"
+ #ARCH  = "FooOS"
+@@ -15,6 +16,12 @@
+ ESUFFIX        =  .exe
+ endif
+ 
++ifeq ($(ARCH),"DARWIN")
++OBJS   += fbsd_sup.o
++CFLAGS += -DDARWIN `sdl-config --cflags`
++LIBS   += `sdl-config --libs` -lz -lobjc
++endif
++
+ ifeq ($(ARCH),"FREEBSD")
+ OBJS   += fbsd_sup.o   # strup()
+ CFLAGS += -DFREEBSD `sdl-config --cflags`