Attachment #57832 for bug #87229

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

Lines 7-13 Link Here

(-)ifp-line/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= ifp-line	9	PORTNAME= ifp-line
10	PORTVERSION= 0.2.4.5	10	PORTVERSION= 0.2.4.6
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ifp-driver	13	MASTER_SITE_SUBDIR= ifp-driver

Lines 1-2 Link Here

(-)ifp-line/distinfo (-2 / +2 lines)
1	MD5 (ifp-line-0.2.4.5.tar.gz) = 53985c0f00a842026195eed8a4bdd7c5	1	MD5 (ifp-line-0.2.4.6.tar.gz) = 6c5d47ecf2380e05b19964ea04cfe584
2	SIZE (ifp-line-0.2.4.5.tar.gz) = 23960	2	SIZE (ifp-line-0.2.4.6.tar.gz) = 24699




--- Makefile.orig	Mon Oct 10 22:44:32 2005
+++ Makefile	Mon Oct 10 22:49:35 2005
@@ -1,11 +1,7 @@
 # $Id: Makefile,v 1.9 2004/11/19 07:08:02 yamajun Exp $
 
-CFLAGS	= `libusb-config --cflags` -Wall -g
-LDFLAGS	= `libusb-config --libs`
-PREFIX	?= /usr/local
-BINDIR	?= ${PREFIX}/bin
-MANDIR	?= ${PREFIX}/man/man1
-INSTALL	?= /usr/bin/install
+CFLAGS+=	`libusb-config --cflags`

 
 OBJS = ifp.o ifp_routines.o unicodehack.o
 
@@ -13,15 +9,9 @@
 ifp: $(OBJS)
 	$(CC) -o ifp $(OBJS) $(LDFLAGS)
 
-$(BINDIR):
-	mkdir -p $(BINDIR)
-
-$(MANDIR):
-	mkdir -p $(MANDIR)
-
-install: ifp $(BINDIR) $(MANDIR)
-	$(INSTALL) -c ifp $(BINDIR)
-	$(INSTALL) -c -m 644 ifp.1 $(MANDIR)
+install: ifp
+	@${BSD_INSTALL_PROGRAM} ifp $(PREFIX)/bin

Return to bug 87229

Lines 1-11 Link Here

(-)ifp-line/files/patch-Makefile (-8 / +12 lines)
1	--- Makefile.orig Sun May 30 17:05:29 2004	1	--- Makefile.orig Mon Oct 10 22:44:32 2005
2	+++ Makefile Tue Sep 21 10:48:59 2004	2	+++ Makefile Mon Oct 10 22:49:35 2005
3	@@ -1,10 +1,5 @@	3	@@ -1,11 +1,7 @@
4	-# $Id: Makefile,v 1.8 2004/05/30 15:05:29 yamajun Exp $	4	# $Id: Makefile,v 1.9 2004/11/19 07:08:02 yamajun Exp $
5	-	5
6	-CFLAGS = `libusb-config --cflags` -Wall -g	6	-CFLAGS = `libusb-config --cflags` -Wall -g
7	-LDFLAGS = `libusb-config --libs`	7	-LDFLAGS = `libusb-config --libs`
8	-PREFIX ?= /usr/local	8	-PREFIX ?= /usr/local
		9	-BINDIR ?= ${PREFIX}/bin
9	-MANDIR ?= ${PREFIX}/man/man1	10	-MANDIR ?= ${PREFIX}/man/man1
10	-INSTALL ?= /usr/bin/install	11	-INSTALL ?= /usr/bin/install
11	+CFLAGS+= `libusb-config --cflags`	12	+CFLAGS+= `libusb-config --cflags`
Lines 13-27 Link Here
13		14
14	OBJS = ifp.o ifp_routines.o unicodehack.o	15	OBJS = ifp.o ifp_routines.o unicodehack.o
15		16
16	@@ -12,12 +7,9 @@	17	@@ -13,15 +9,9 @@
17	ifp: $(OBJS)	18	ifp: $(OBJS)
18	$(CC) -o ifp $(OBJS) $(LDFLAGS)	19	$(CC) -o ifp $(OBJS) $(LDFLAGS)
19		20
		21	-$(BINDIR):
		22	- mkdir -p $(BINDIR)
		23	-
20	-$(MANDIR):	24	-$(MANDIR):
21	- mkdir -p $(MANDIR)	25	- mkdir -p $(MANDIR)
22	-	26	-
23	-install: ifp $(MANDIR)	27	-install: ifp $(BINDIR) $(MANDIR)
24	- $(INSTALL) -c ifp $(PREFIX)/bin	28	- $(INSTALL) -c ifp $(BINDIR)
25	- $(INSTALL) -c -m 644 ifp.1 $(MANDIR)	29	- $(INSTALL) -c -m 644 ifp.1 $(MANDIR)
26	+install: ifp	30	+install: ifp
27	+ @${BSD_INSTALL_PROGRAM} ifp $(PREFIX)/bin	31	+ @${BSD_INSTALL_PROGRAM} ifp $(PREFIX)/bin