Attachment #117737 for bug #159864

View | Details | Raw Unified | Return to bug 159864
Collapse All | Expand All




#

PORTNAME=	trayer
PORTVERSION=	1.1.3
CATEGORIES=	x11
MASTER_SITES=	http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX=	-srg

COMMENT=	Lightweight GTK2-based systray for UNIX desktop - sargon fork

CONFLICTS_INSTALL=	trayer-1.0*
GITVERSION=	0-g2d53335
FETCH_ARGS=	-pRr
WRKSRC=		${WRKDIR}/sargon-${PORTNAME}${PKGNAMESUFFIX}-${GITVERSION:S/^0-g//}
USE_GNOME=	gtk20 glib20 pango atk


PLIST_FILES=	bin/trayer

post-patch:
	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
		${WRKSRC}/Makefile.common

post-install:
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}

Lines 1-2 Link Here

(-)trayer-srg/distinfo (-2 / +2 lines)
1	SHA256 (sargon-trayer-srg-trayer-1.1.1-0-g82d5d05.tar.gz) = 94121f2c69d18e074982c6c2b808879076d0034fa70a144adf5d5dcb2b3c60eb	1	SHA256 (sargon-trayer-srg-trayer-1.1.3-0-g2d53335.tar.gz) = 03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558
2	SIZE (sargon-trayer-srg-trayer-1.1.1-0-g82d5d05.tar.gz) = 24645	2	SIZE (sargon-trayer-srg-trayer-1.1.3-0-g2d53335.tar.gz) = 24671




--- Makefile.common.orig	2011-05-01 15:07:21.000000000 +0200
+++ Makefile.common	2011-06-21 15:50:10.302230043 +0200
@@ -15,10 +15,10 @@
 endif
 endif
 
-CC = gcc
+CC ?= gcc
 LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib  -lXmu
 INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
-CFLAGS = -O2    # overwriten by command line or env. variable
+CFLAGS ?= -O2    # overwriten by command line or env. variable
 CFLAGS += -Wall # always nice to have 
 ifneq (,$(DEVEL))
 CFLAGS := -g -Wall

Return to bug 159864

Lines 7-13 Link Here

(-)trayer-srg/Makefile (-6 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= trayer	9	PORTNAME= trayer
10	PORTVERSION= 1.1.1	10	PORTVERSION= 1.1.3
11	CATEGORIES= x11	11	CATEGORIES= x11
12	MASTER_SITES= http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/	12	MASTER_SITES= http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/
13	PKGNAMESUFFIX= -srg	13	PKGNAMESUFFIX= -srg
Lines 17-23 Link Here
17	COMMENT= Lightweight GTK2-based systray for UNIX desktop - sargon fork	17	COMMENT= Lightweight GTK2-based systray for UNIX desktop - sargon fork
18		18
19	CONFLICTS_INSTALL= trayer-1.0*	19	CONFLICTS_INSTALL= trayer-1.0*
20	GITVERSION= 0-g82d5d05	20	GITVERSION= 0-g2d53335
21	FETCH_ARGS= -pRr	21	FETCH_ARGS= -pRr
22	WRKSRC= ${WRKDIR}/sargon-${PORTNAME}${PKGNAMESUFFIX}-${GITVERSION:S/^0-g//}	22	WRKSRC= ${WRKDIR}/sargon-${PORTNAME}${PKGNAMESUFFIX}-${GITVERSION:S/^0-g//}
23	USE_GNOME= gtk20 glib20 pango atk	23	USE_GNOME= gtk20 glib20 pango atk
Lines 32-41 Link Here
32		32
33	PLIST_FILES= bin/trayer	33	PLIST_FILES= bin/trayer
34		34
35	post-patch:
36	@${REINPLACE_CMD} -e 's\|-D.*_DISABLE_DEPRECATED\|\|g' \
37	${WRKSRC}/Makefile.common
38
39	post-install:	35	post-install:
40	.if !defined(NOPORTDOCS)	36	.if !defined(NOPORTDOCS)
41	${MKDIR} ${DOCSDIR}	37	${MKDIR} ${DOCSDIR}

Lines 1-15 Link Here

(-)trayer-srg/files/patch-Makefile.common (-15 lines)
1	--- Makefile.common.orig 2011-05-01 15:07:21.000000000 +0200
2	+++ Makefile.common 2011-06-21 15:50:10.302230043 +0200
3	@@ -15,10 +15,10 @@
4	endif
5	endif
6
7	-CC = gcc
8	+CC ?= gcc
9	LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib -lXmu
10	INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
11	-CFLAGS = -O2 # overwriten by command line or env. variable
12	+CFLAGS ?= -O2 # overwriten by command line or env. variable
13	CFLAGS += -Wall # always nice to have
14	ifneq (,$(DEVEL))
15	CFLAGS := -g -Wall